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
a8dcc181
Commit
a8dcc181
authored
Jan 24, 2019
by
Constance Okoghenun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated i18n format for note header commit link
Unified commit link in note header action text
parent
83224950
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
12 deletions
+5
-12
app/assets/javascripts/notes/components/noteable_note.vue
app/assets/javascripts/notes/components/noteable_note.vue
+4
-11
locale/gitlab.pot
locale/gitlab.pot
+1
-1
No files found.
app/assets/javascripts/notes/components/noteable_note.vue
View file @
a8dcc181
...
@@ -90,17 +90,10 @@ export default {
...
@@ -90,17 +90,10 @@ export default {
// language to the next. See:
// language to the next. See:
// https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24427#note_133713771
// https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24427#note_133713771
const
{
id
,
url
}
=
this
.
commit
;
const
{
id
,
url
}
=
this
.
commit
;
const
linkStart
=
`<a class="commit-sha monospace" href="
${
escape
(
url
)}
">`
;
const
commitLink
=
`<a class="commit-sha monospace" href="
${
escape
(
url
)}
">
${
truncateSha
(
const
linkEnd
=
'
</a>
'
;
id
,
return
sprintf
(
)}
</a>`
;
s__
(
'
MergeRequests|commented on commit %{linkStart}%{commitId}%{linkEnd}
'
),
return
sprintf
(
s__
(
'
MergeRequests|commented on commit %{commitLink}
'
),
{
commitLink
},
false
);
{
commitId
:
truncateSha
(
id
),
linkStart
,
linkEnd
,
},
false
,
);
},
},
},
},
...
...
locale/gitlab.pot
View file @
a8dcc181
...
@@ -4294,7 +4294,7 @@ msgstr ""
...
@@ -4294,7 +4294,7 @@ msgstr ""
msgid "MergeRequests|View replaced file @ %{commitId}"
msgid "MergeRequests|View replaced file @ %{commitId}"
msgstr ""
msgstr ""
msgid "MergeRequests|commented on commit %{
linkStart}%{commitId}%{linkEnd
}"
msgid "MergeRequests|commented on commit %{
commitLink
}"
msgstr ""
msgstr ""
msgid "MergeRequests|started a discussion"
msgid "MergeRequests|started a discussion"
...
...
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