diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2019-01-09 18:24:14 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2019-01-09 18:24:14 +0300 |
commit | e28e48eb6d41102ca4c72694d264cc8aa0448e0f (patch) | |
tree | 082f13fc78e744415750ac5b7ac21ffc801845ea | |
parent | b07ac850efbe5df536d413bbd6c42191910242df (diff) | |
parent | 772718c3ade569086a0cd6258dd6890da14dd56a (diff) |
Merge branch '56036-fix-translation-of-in-in-job-details-sidebar' into 'master'
Resolve "Fix translation of "in" in job details sidebar"
Closes #56036
See merge request gitlab-org/gitlab-ce!24192
-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 59e9dd67774..08331f4e630 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -8047,9 +8047,6 @@ msgstr "" msgid "importing" msgstr "" -msgid "in" -msgstr "" - msgid "issue boards" msgstr "" |