Refactor split link after i18n
This commit is contained in:
parent
3d0b6823ab
commit
2d612aaa43
|
@ -35,7 +35,7 @@ import {
|
|||
} from './lib/utils/common_utils';
|
||||
import imageDiffHelper from './image_diff/helpers/index';
|
||||
import { localTimeAgo } from './lib/utils/datetime_utility';
|
||||
import { s__, __ } from './locale';
|
||||
import { sprintf, s__, __ } from './locale';
|
||||
|
||||
window.autosize = Autosize;
|
||||
|
||||
|
@ -1261,12 +1261,19 @@ export default class Notes {
|
|||
|
||||
putConflictEditWarningInPlace(noteEntity, $note) {
|
||||
if ($note.find('.js-conflict-edit-warning').length === 0) {
|
||||
const open_link = `<a href="#note_${
|
||||
noteEntity.id
|
||||
}" target="_blank" rel="noopener noreferrer">`;
|
||||
const $alert = $(`<div class="js-conflict-edit-warning alert alert-danger">
|
||||
${__('This comment has changed since you started editing, please review the')}
|
||||
<a href="#note_${noteEntity.id}" target="_blank" rel="noopener noreferrer">
|
||||
${__('updated comment')}
|
||||
</a>
|
||||
${__('to ensure information is not lost')}
|
||||
${sprintf(
|
||||
s__(
|
||||
'Notes|This comment has changed since you started editing, please review the %{open_link}updated comment%{close_link} to ensure information is not lost',
|
||||
),
|
||||
{
|
||||
open_link,
|
||||
close_link: '</a>',
|
||||
},
|
||||
)}
|
||||
</div>`);
|
||||
$alert.insertAfter($note.find('.note-text'));
|
||||
}
|
||||
|
|
|
@ -6450,6 +6450,9 @@ msgstr ""
|
|||
msgid "Notes|Show history only"
|
||||
msgstr ""
|
||||
|
||||
msgid "Notes|This comment has changed since you started editing, please review the %{open_link}updated comment%{close_link} to ensure information is not lost"
|
||||
msgstr ""
|
||||
|
||||
msgid "Nothing to preview."
|
||||
msgstr ""
|
||||
|
||||
|
@ -9733,9 +9736,6 @@ msgstr ""
|
|||
msgid "This branch has changed since you started editing. Would you like to create a new branch?"
|
||||
msgstr ""
|
||||
|
||||
msgid "This comment has changed since you started editing, please review the"
|
||||
msgstr ""
|
||||
|
||||
msgid "This commit is part of merge request %{link_to_merge_request}. Comments created here will be created in the context of that merge request."
|
||||
msgstr ""
|
||||
|
||||
|
@ -11923,18 +11923,12 @@ msgstr ""
|
|||
msgid "this document"
|
||||
msgstr ""
|
||||
|
||||
msgid "to ensure information is not lost"
|
||||
msgstr ""
|
||||
|
||||
msgid "triggered"
|
||||
msgstr ""
|
||||
|
||||
msgid "updated"
|
||||
msgstr ""
|
||||
|
||||
msgid "updated comment"
|
||||
msgstr ""
|
||||
|
||||
msgid "username"
|
||||
msgstr ""
|
||||
|
||||
|
|
Loading…
Reference in New Issue