root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Added i18n to discussion note commit SHA

This commit is contained in:
Constance Okoghenun 2019-01-22 13:05:23 +01:00
parent 7067c6bc41
commit 993616a6c4
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/notes/components/noteable_note.vue
View File

@ -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) });
},
},

3
locale/gitlab.pot
View File

@ -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 ""