From 772718c3ade569086a0cd6258dd6890da14dd56a Mon Sep 17 00:00:00 2001 From: Nathan Friend Date: Mon, 7 Jan 2019 14:29:00 -0400 Subject: [PATCH] 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 --- app/assets/javascripts/jobs/components/commit_block.vue | 2 +- .../56036-fix-translation-of-in-in-job-details-sidebar.yml | 4 ++++ locale/gitlab.pot | 3 --- 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 changelogs/unreleased/56036-fix-translation-of-in-in-job-details-sidebar.yml 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 { /> - {{ __('in') }} + in !{{ mergeRequest.iid }} 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 ""