Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
993616a6
Commit
993616a6
authored
Jan 22, 2019
by
Constance Okoghenun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added i18n to discussion note commit SHA
parent
7067c6bc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
app/assets/javascripts/notes/components/noteable_note.vue
app/assets/javascripts/notes/components/noteable_note.vue
+3
-2
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
app/assets/javascripts/notes/components/noteable_note.vue
View file @
993616a6
...
...
@@ -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
)
}
);
},
},
...
...
locale/gitlab.pot
View file @
993616a6
...
...
@@ -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 ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment