summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConstance Okoghenun <constanceokoghenun@gmail.com>2019-01-22 13:05:23 +0100
committerConstance Okoghenun <constanceokoghenun@gmail.com>2019-01-22 13:14:08 +0100
commit993616a6c47c4e3066072c27f87625ce9eb0cb06 (patch)
treeb85ce13d95a715ce0b2fb5602ca4f571034b9078
parent7067c6bc4191ea80a91ddf2bca9c1f0c37f870a5 (diff)
downloadgitlab-ce-993616a6c47c4e3066072c27f87625ce9eb0cb06.tar.gz
Added i18n to discussion note commit SHA
-rw-r--r--app/assets/javascripts/notes/components/noteable_note.vue5
-rw-r--r--locale/gitlab.pot3
2 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue
index ba2c967de4a..30d8f2c091e 100644
--- a/app/assets/javascripts/notes/components/noteable_note.vue
+++ b/app/assets/javascripts/notes/components/noteable_note.vue
@@ -4,6 +4,7 @@ import { mapGetters, mapActions } from 'vuex';
import { escape } from 'underscore';
import { truncateSha } from '~/lib/utils/text_utility';
import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue';
+import { s__, sprintf } from '../../locale';
import Flash from '../../flash';
import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
import noteHeader from './note_header.vue';
@@ -81,10 +82,10 @@ export default {
},
truncatedHash() {
if (!this.commit) {
- return null;
+ return '';
}
- return truncateSha(this.commit.id);
+ return sprintf(s__('MergeRequests|%{commitSha}'), { commitSha: truncateSha(this.commit.id) });
},
},
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 137050e1a36..a8d8890d033 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -4279,6 +4279,9 @@ msgstr ""
msgid "Merge requests are a place to propose changes you've made to a project and discuss those changes with others"
msgstr ""
+msgid "MergeRequests|%{commitSha}"
+msgstr ""
+
msgid "MergeRequests|Resolve this discussion in a new issue"
msgstr ""