Commit 5f25dab6 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'js-i18n-n' into 'master'

i18n JS files starting with n

See merge request gitlab-org/gitlab-ce!28132
parents 3b211391 965100a3
...@@ -4,6 +4,7 @@ import $ from 'jquery'; ...@@ -4,6 +4,7 @@ import $ from 'jquery';
import Api from './api'; import Api from './api';
import { mergeUrlParams } from './lib/utils/url_utility'; import { mergeUrlParams } from './lib/utils/url_utility';
import { parseBoolean } from '~/lib/utils/common_utils'; import { parseBoolean } from '~/lib/utils/common_utils';
import { __ } from './locale';
export default class NamespaceSelect { export default class NamespaceSelect {
constructor(opts) { constructor(opts) {
...@@ -29,7 +30,7 @@ export default class NamespaceSelect { ...@@ -29,7 +30,7 @@ export default class NamespaceSelect {
return Api.namespaces(term, function(namespaces) { return Api.namespaces(term, function(namespaces) {
if (isFilter) { if (isFilter) {
const anyNamespace = { const anyNamespace = {
text: 'Any namespace', text: __('Any namespace'),
id: null, id: null,
}; };
namespaces.unshift(anyNamespace); namespaces.unshift(anyNamespace);
......
...@@ -35,6 +35,7 @@ import { ...@@ -35,6 +35,7 @@ import {
} from './lib/utils/common_utils'; } from './lib/utils/common_utils';
import imageDiffHelper from './image_diff/helpers/index'; import imageDiffHelper from './image_diff/helpers/index';
import { localTimeAgo } from './lib/utils/datetime_utility'; import { localTimeAgo } from './lib/utils/datetime_utility';
import { sprintf, s__, __ } from './locale';
window.autosize = Autosize; window.autosize = Autosize;
...@@ -253,7 +254,7 @@ export default class Notes { ...@@ -253,7 +254,7 @@ export default class Notes {
discussionNoteForm = $textarea.closest('.js-discussion-note-form'); discussionNoteForm = $textarea.closest('.js-discussion-note-form');
if (discussionNoteForm.length) { if (discussionNoteForm.length) {
if ($textarea.val() !== '') { if ($textarea.val() !== '') {
if (!window.confirm('Are you sure you want to cancel creating this comment?')) { if (!window.confirm(__('Are you sure you want to cancel creating this comment?'))) {
return; return;
} }
} }
...@@ -265,7 +266,7 @@ export default class Notes { ...@@ -265,7 +266,7 @@ export default class Notes {
originalText = $textarea.closest('form').data('originalNote'); originalText = $textarea.closest('form').data('originalNote');
newText = $textarea.val(); newText = $textarea.val();
if (originalText !== newText) { if (originalText !== newText) {
if (!window.confirm('Are you sure you want to cancel editing this comment?')) { if (!window.confirm(__('Are you sure you want to cancel editing this comment?'))) {
return; return;
} }
} }
...@@ -636,7 +637,7 @@ export default class Notes { ...@@ -636,7 +637,7 @@ export default class Notes {
this.glForm = new GLForm(form, enableGFM); this.glForm = new GLForm(form, enableGFM);
textarea = form.find('.js-note-text'); textarea = form.find('.js-note-text');
key = [ key = [
'Note', s__('NoteForm|Note'),
form.find('#note_noteable_type').val(), form.find('#note_noteable_type').val(),
form.find('#note_noteable_id').val(), form.find('#note_noteable_id').val(),
form.find('#note_commit_id').val(), form.find('#note_commit_id').val(),
...@@ -670,7 +671,9 @@ export default class Notes { ...@@ -670,7 +671,9 @@ export default class Notes {
formParentTimeline = $form.closest('.discussion-notes').find('.notes'); formParentTimeline = $form.closest('.discussion-notes').find('.notes');
} }
return this.addFlash( return this.addFlash(
'Your comment could not be submitted! Please check your network connection and try again.', __(
'Your comment could not be submitted! Please check your network connection and try again.',
),
'alert', 'alert',
formParentTimeline.get(0), formParentTimeline.get(0),
); );
...@@ -679,7 +682,7 @@ export default class Notes { ...@@ -679,7 +682,7 @@ export default class Notes {
updateNoteError($parentTimeline) { updateNoteError($parentTimeline) {
// eslint-disable-next-line no-new // eslint-disable-next-line no-new
new Flash( new Flash(
'Your comment could not be updated! Please check your network connection and try again.', __('Your comment could not be updated! Please check your network connection and try again.'),
); );
} }
...@@ -1258,12 +1261,19 @@ export default class Notes { ...@@ -1258,12 +1261,19 @@ export default class Notes {
putConflictEditWarningInPlace(noteEntity, $note) { putConflictEditWarningInPlace(noteEntity, $note) {
if ($note.find('.js-conflict-edit-warning').length === 0) { 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"> const $alert = $(`<div class="js-conflict-edit-warning alert alert-danger">
This comment has changed since you started editing, please review the ${sprintf(
<a href="#note_${noteEntity.id}" target="_blank" rel="noopener noreferrer"> s__(
updated comment 'Notes|This comment has changed since you started editing, please review the %{open_link}updated comment%{close_link} to ensure information is not lost',
</a> ),
to ensure information is not lost {
open_link,
close_link: '</a>',
},
)}
</div>`); </div>`);
$alert.insertAfter($note.find('.note-text')); $alert.insertAfter($note.find('.note-text'));
} }
...@@ -1491,13 +1501,15 @@ export default class Notes { ...@@ -1491,13 +1501,15 @@ export default class Notes {
if (executedCommands && executedCommands.length) { if (executedCommands && executedCommands.length) {
if (executedCommands.length > 1) { if (executedCommands.length > 1) {
tempFormContent = 'Applying multiple commands'; tempFormContent = __('Applying multiple commands');
} else { } else {
const commandDescription = executedCommands[0].description.toLowerCase(); const commandDescription = executedCommands[0].description.toLowerCase();
tempFormContent = `Applying command to ${commandDescription}`; tempFormContent = sprintf(__('Applying command to %{commandDescription}'), {
commandDescription,
});
} }
} else { } else {
tempFormContent = 'Applying command'; tempFormContent = __('Applying command');
} }
return tempFormContent; return tempFormContent;
...@@ -1817,7 +1829,9 @@ export default class Notes { ...@@ -1817,7 +1829,9 @@ export default class Notes {
$editingNote $editingNote
.find('.note-headline-meta a') .find('.note-headline-meta a')
.html( .html(
'<i class="fa fa-spinner fa-spin" aria-label="Comment is being updated" aria-hidden="true"></i>', `<i class="fa fa-spinner fa-spin" aria-label="${__(
'Comment is being updated',
)}" aria-hidden="true"></i>`,
); );
// Make request to update comment on server // Make request to update comment on server
......
...@@ -982,6 +982,9 @@ msgstr "" ...@@ -982,6 +982,9 @@ msgstr ""
msgid "Any encrypted tokens" msgid "Any encrypted tokens"
msgstr "" msgstr ""
msgid "Any namespace"
msgstr ""
msgid "Appearance" msgid "Appearance"
msgstr "" msgstr ""
...@@ -1069,6 +1072,12 @@ msgstr "" ...@@ -1069,6 +1072,12 @@ msgstr ""
msgid "Are you sure that you want to unarchive this project?" msgid "Are you sure that you want to unarchive this project?"
msgstr "" msgstr ""
msgid "Are you sure you want to cancel creating this comment?"
msgstr ""
msgid "Are you sure you want to cancel editing this comment?"
msgstr ""
msgid "Are you sure you want to delete this list?" msgid "Are you sure you want to delete this list?"
msgstr "" msgstr ""
...@@ -2587,6 +2596,9 @@ msgstr "" ...@@ -2587,6 +2596,9 @@ msgstr ""
msgid "Comment form position" msgid "Comment form position"
msgstr "" msgstr ""
msgid "Comment is being updated"
msgstr ""
msgid "Comments" msgid "Comments"
msgstr "" msgstr ""
...@@ -6399,6 +6411,9 @@ msgstr "" ...@@ -6399,6 +6411,9 @@ msgstr ""
msgid "Note: Consider asking your GitLab administrator to configure %{github_integration_link}, which will allow login via GitHub and allow importing repositories without generating a Personal Access Token." msgid "Note: Consider asking your GitLab administrator to configure %{github_integration_link}, which will allow login via GitHub and allow importing repositories without generating a Personal Access Token."
msgstr "" msgstr ""
msgid "NoteForm|Note"
msgstr ""
msgid "Notes|Are you sure you want to cancel creating this comment?" msgid "Notes|Are you sure you want to cancel creating this comment?"
msgstr "" msgstr ""
...@@ -6414,6 +6429,9 @@ msgstr "" ...@@ -6414,6 +6429,9 @@ msgstr ""
msgid "Notes|Show history only" msgid "Notes|Show history only"
msgstr "" 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." msgid "Nothing to preview."
msgstr "" msgstr ""
...@@ -11290,6 +11308,12 @@ msgstr "" ...@@ -11290,6 +11308,12 @@ msgstr ""
msgid "Your changes have been successfully committed." msgid "Your changes have been successfully committed."
msgstr "" msgstr ""
msgid "Your comment could not be submitted! Please check your network connection and try again."
msgstr ""
msgid "Your comment could not be updated! Please check your network connection and try again."
msgstr ""
msgid "Your comment will not be visible to the public." msgid "Your comment will not be visible to the public."
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