Commit f00b7a42 authored by Constance Okoghenun's avatar Constance Okoghenun

Added i18n to discussion note commit SHA

parent 27afa945
...@@ -4,6 +4,7 @@ import { mapGetters, mapActions } from 'vuex'; ...@@ -4,6 +4,7 @@ import { mapGetters, mapActions } from 'vuex';
import { escape } from 'underscore'; import { escape } from 'underscore';
import { truncateSha } from '~/lib/utils/text_utility'; import { truncateSha } from '~/lib/utils/text_utility';
import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue'; import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue';
import { s__, sprintf } from '../../locale';
import Flash from '../../flash'; import Flash from '../../flash';
import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue'; import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
import noteHeader from './note_header.vue'; import noteHeader from './note_header.vue';
...@@ -81,10 +82,10 @@ export default { ...@@ -81,10 +82,10 @@ export default {
}, },
truncatedHash() { truncatedHash() {
if (!this.commit) { if (!this.commit) {
return null; return '';
} }
return truncateSha(this.commit.id); return sprintf(s__('MergeRequests|%{commitSha}'), { commitSha: truncateSha(this.commit.id) });
}, },
}, },
......
...@@ -5614,6 +5614,9 @@ msgstr "" ...@@ -5614,6 +5614,9 @@ msgstr ""
msgid "Merge requests are a place to propose changes you've made to a project and discuss those changes with others" msgid "Merge requests are a place to propose changes you've made to a project and discuss those changes with others"
msgstr "" msgstr ""
msgid "MergeRequests|%{commitSha}"
msgstr ""
msgid "MergeRequests|An error occurred while saving the draft comment." msgid "MergeRequests|An error occurred while saving the draft comment."
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment