diff options
| author | Nathan Friend <nfriend@gitlab.com> | 2019-01-07 14:29:00 -0400 |
|---|---|---|
| committer | Nathan Friend <nfriend@gitlab.com> | 2019-01-07 14:29:00 -0400 |
| commit | 772718c3ade569086a0cd6258dd6890da14dd56a (patch) | |
| tree | fe200507a45a1269488372f6dbb83a3035b59e54 | |
| parent | 2205f5ad8c8d6229a4d867b4fddb8e502c918864 (diff) | |
| download | gitlab-ce-772718c3ade569086a0cd6258dd6890da14dd56a.tar.gz | |
Remove translation from "in"
We don't currently have the ability to translate sentences that are
broken up by Vue components. In lieu of this, we simply don't translate
any words that can't be directly translated into all languages.
More context on this fix here:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23816#note_126442986
| -rw-r--r-- | app/assets/javascripts/jobs/components/commit_block.vue | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/56036-fix-translation-of-in-in-job-details-sidebar.yml | 4 | ||||
| -rw-r--r-- | locale/gitlab.pot | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/javascripts/jobs/components/commit_block.vue b/app/assets/javascripts/jobs/components/commit_block.vue index e0f55518eef..7076a79dd5d 100644 --- a/app/assets/javascripts/jobs/components/commit_block.vue +++ b/app/assets/javascripts/jobs/components/commit_block.vue @@ -45,7 +45,7 @@ export default { /> <span v-if="mergeRequest"> - {{ __('in') }} + in <gl-link :href="mergeRequest.path" class="js-link-commit link-commit" >!{{ mergeRequest.iid }}</gl-link > diff --git a/changelogs/unreleased/56036-fix-translation-of-in-in-job-details-sidebar.yml b/changelogs/unreleased/56036-fix-translation-of-in-in-job-details-sidebar.yml new file mode 100644 index 00000000000..ff9d4f2c175 --- /dev/null +++ b/changelogs/unreleased/56036-fix-translation-of-in-in-job-details-sidebar.yml @@ -0,0 +1,4 @@ +title: Remove multilingual translation from the word "in" in the job details sidebar. +merge_request: 24192 +author: Nathan Friend +type: changed diff --git a/locale/gitlab.pot b/locale/gitlab.pot index d4dbe2ef1a0..7d81ed3dc19 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -7924,9 +7924,6 @@ msgstr "" msgid "importing" msgstr "" -msgid "in" -msgstr "" - msgid "issue boards" msgstr "" |