diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 15:09:52 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 15:09:52 +0300 |
commit | 546ddc3f6ac96fdf09934390a938bb391d07dc94 (patch) | |
tree | d0c92fca27ee76b5a20b7bfb56bda6f057424127 /doc/development/i18n | |
parent | 04baa85554ff13bdd4d6f4e6bb24119d17608fee (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/i18n')
-rw-r--r-- | doc/development/i18n/externalization.md | 8 | ||||
-rw-r--r-- | doc/development/i18n/proofreader.md | 4 | ||||
-rw-r--r-- | doc/development/i18n/translation.md | 4 |
3 files changed, 4 insertions, 12 deletions
diff --git a/doc/development/i18n/externalization.md b/doc/development/i18n/externalization.md index 5c6e31d0a37..a550d977916 100644 --- a/doc/development/i18n/externalization.md +++ b/doc/development/i18n/externalization.md @@ -292,9 +292,7 @@ const dateFormat = createDateTimeFormat({ year: 'numeric', month: 'long', day: ' console.log(dateFormat.format(new Date('2063-04-05'))) // April 5, 2063 ``` -This makes use of [`Intl.DateTimeFormat`]. - -[`Intl.DateTimeFormat`]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DateTimeFormat +This makes use of [`Intl.DateTimeFormat`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DateTimeFormat). - In Ruby/HAML, we have two ways of adding format to dates and times: @@ -404,9 +402,7 @@ This also applies when using links in between translated sentences, otherwise th The reasoning behind this is that in some languages words change depending on context. For example in Japanese は is added to the subject of a sentence and を to the object. This is impossible to translate correctly if we extract individual words from the sentence. When in doubt, try to follow the best practices described in this [Mozilla -Developer documentation][mdn]. - -[mdn]: https://developer.mozilla.org/en-US/docs/Mozilla/Localization/Localization_content_best_practices#Splitting +Developer documentation](https://developer.mozilla.org/en-US/docs/Mozilla/Localization/Localization_content_best_practices#Splitting). ##### Vue components interpolation diff --git a/doc/development/i18n/proofreader.md b/doc/development/i18n/proofreader.md index 5535011d8c1..0e631a41de8 100644 --- a/doc/development/i18n/proofreader.md +++ b/doc/development/i18n/proofreader.md @@ -121,7 +121,7 @@ are very appreciative of the work done by translators and proofreaders! 1. Request proofreader permissions by opening a merge request to add yourself to the list of proofreaders. - Open the [proofreader.md source file][proofreader-src] and click **Edit**. + Open the [proofreader.md source file](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/development/i18n/proofreader.md) and click **Edit**. Add your language in alphabetical order, and add yourself to the list including: @@ -138,5 +138,3 @@ are very appreciative of the work done by translators and proofreaders! the language or current proofreaders. - When a request is made for the first proofreader for a language and there are no [GitLab team members](https://about.gitlab.com/company/team/) or [Core team members](https://about.gitlab.com/community/core-team/) who speak the language, we will request links to previous translation work in other communities or projects. - -[proofreader-src]: https://gitlab.com/gitlab-org/gitlab/blob/master/doc/development/i18n/proofreader.md diff --git a/doc/development/i18n/translation.md b/doc/development/i18n/translation.md index 50a417e9996..683dae6ce3d 100644 --- a/doc/development/i18n/translation.md +++ b/doc/development/i18n/translation.md @@ -69,7 +69,7 @@ determining a suitable level of formality. ### Inclusive language -[Diversity] is one of GitLab's values. +[Diversity](https://about.gitlab.com/handbook/values/#diversity) is one of GitLab's values. We ask you to avoid translations which exclude people based on their gender or ethnicity. In languages which distinguish between a male and female form, use both or @@ -78,8 +78,6 @@ choose a neutral formulation. For example in German, the word "user" can be translated into "Benutzer" (male) or "Benutzerin" (female). Therefore "create a new user" would translate into "Benutzer(in) anlegen". -[Diversity]: https://about.gitlab.com/handbook/values/#diversity - ### Updating the glossary To propose additions to the glossary please |