diff options
author | Brandon Labuschagne <blabuschagne@gitlab.com> | 2019-05-06 17:19:34 +0300 |
---|---|---|
committer | Brandon Labuschagne <blabuschagne@gitlab.com> | 2019-05-15 16:02:42 +0300 |
commit | 3d0b6823ab63652acf9703560f6ad4b267b88034 (patch) | |
tree | 6ee5f384aefd1ced0d2e1827781341a84dfaf4c4 | |
parent | e5d2e7e677455ed620652e3a641718f6984a0b37 (diff) |
I18N JS files starting with n
This is one of many MRs opened in order to improve the overall
internationalisation of the GitLab codebase.
This commit only targets Vanilla JS files.
i18n documentation
https://docs.gitlab.com/ee/development/i18n/externalization.html
-rw-r--r-- | app/assets/javascripts/namespace_select.js | 3 | ||||
-rw-r--r-- | app/assets/javascripts/new_branch_form.js | 19 | ||||
-rw-r--r-- | app/assets/javascripts/notes.js | 29 | ||||
-rw-r--r-- | locale/gitlab.pot | 51 |
4 files changed, 80 insertions, 22 deletions
diff --git a/app/assets/javascripts/namespace_select.js b/app/assets/javascripts/namespace_select.js index ee1a5274ff7..03d349ac714 100644 --- a/app/assets/javascripts/namespace_select.js +++ b/app/assets/javascripts/namespace_select.js @@ -4,6 +4,7 @@ import $ from 'jquery'; import Api from './api'; import { mergeUrlParams } from './lib/utils/url_utility'; import { parseBoolean } from '~/lib/utils/common_utils'; +import { __ } from './locale'; export default class NamespaceSelect { constructor(opts) { @@ -29,7 +30,7 @@ export default class NamespaceSelect { return Api.namespaces(term, function(namespaces) { if (isFilter) { const anyNamespace = { - text: 'Any namespace', + text: __('Any namespace'), id: null, }; namespaces.unshift(anyNamespace); diff --git a/app/assets/javascripts/new_branch_form.js b/app/assets/javascripts/new_branch_form.js index f338dbbb0a6..80115e75b58 100644 --- a/app/assets/javascripts/new_branch_form.js +++ b/app/assets/javascripts/new_branch_form.js @@ -2,6 +2,7 @@ import $ from 'jquery'; import RefSelectDropdown from './ref_select_dropdown'; +import { s__ } from './locale'; export default class NewBranchForm { constructor(form, availableRefs) { @@ -29,23 +30,23 @@ export default class NewBranchForm { var endsWith, invalid, single, startsWith; startsWith = { pattern: /^(\/|\.)/g, - prefix: "can't start with", - conjunction: 'or', + prefix: s__("BranchValidation|can't start with"), + conjunction: s__('BranchValidation|or'), }; endsWith = { pattern: /(\/|\.|\.lock)$/g, - prefix: "can't end in", - conjunction: 'or', + prefix: s__("BranchValidation|can't end in"), + conjunction: s__('BranchValidation|or'), }; invalid = { pattern: /(\s|~|\^|:|\?|\*|\[|\\|\.\.|@\{|\/{2,}){1}/g, - prefix: "can't contain", + prefix: s__("BranchValidation|can't contain"), conjunction: ', ', }; single = { pattern: /^@+$/g, - prefix: "can't be", - conjunction: 'or', + prefix: s__("BranchValidation|can't be"), + conjunction: s__('BranchValidation|or'), }; return (this.restrictions = [startsWith, invalid, endsWith, single]); } @@ -66,9 +67,9 @@ export default class NewBranchForm { formatted = values.map(function(value) { switch (false) { case !/\s/.test(value): - return 'spaces'; + return s__('BranchValidation|spaces'); case !/\/{2,}/g.test(value): - return 'consecutive slashes'; + return s__('BranchValidation|consecutive slashes'); default: return "'" + value + "'"; } diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 36725e22365..bc5c7d9f16b 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -35,6 +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'; window.autosize = Autosize; @@ -253,7 +254,7 @@ export default class Notes { discussionNoteForm = $textarea.closest('.js-discussion-note-form'); if (discussionNoteForm.length) { 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; } } @@ -265,7 +266,7 @@ export default class Notes { originalText = $textarea.closest('form').data('originalNote'); newText = $textarea.val(); 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; } } @@ -636,7 +637,7 @@ export default class Notes { this.glForm = new GLForm(form, enableGFM); textarea = form.find('.js-note-text'); key = [ - 'Note', + s__('NoteForm|Note'), form.find('#note_noteable_type').val(), form.find('#note_noteable_id').val(), form.find('#note_commit_id').val(), @@ -670,7 +671,9 @@ export default class Notes { formParentTimeline = $form.closest('.discussion-notes').find('.notes'); } 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', formParentTimeline.get(0), ); @@ -679,7 +682,7 @@ export default class Notes { updateNoteError($parentTimeline) { // eslint-disable-next-line no-new 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.'), ); } @@ -1259,11 +1262,11 @@ export default class Notes { putConflictEditWarningInPlace(noteEntity, $note) { if ($note.find('.js-conflict-edit-warning').length === 0) { const $alert = $(`<div class="js-conflict-edit-warning alert alert-danger"> - This comment has changed since you started editing, please review the + ${__('This comment has changed since you started editing, please review the')} <a href="#note_${noteEntity.id}" target="_blank" rel="noopener noreferrer"> - updated comment + ${__('updated comment')} </a> - to ensure information is not lost + ${__('to ensure information is not lost')} </div>`); $alert.insertAfter($note.find('.note-text')); } @@ -1491,13 +1494,13 @@ export default class Notes { if (executedCommands && executedCommands.length) { if (executedCommands.length > 1) { - tempFormContent = 'Applying multiple commands'; + tempFormContent = __('Applying multiple commands'); } else { const commandDescription = executedCommands[0].description.toLowerCase(); - tempFormContent = `Applying command to ${commandDescription}`; + tempFormContent = __(`Applying command to ${commandDescription}`); } } else { - tempFormContent = 'Applying command'; + tempFormContent = __('Applying command'); } return tempFormContent; @@ -1817,7 +1820,9 @@ export default class Notes { $editingNote .find('.note-headline-meta a') .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 diff --git a/locale/gitlab.pot b/locale/gitlab.pot index fdb6adfbd51..172da881387 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -982,6 +982,9 @@ msgstr "" msgid "Any encrypted tokens" msgstr "" +msgid "Any namespace" +msgstr "" + msgid "Appearance" msgstr "" @@ -1069,6 +1072,12 @@ msgstr "" msgid "Are you sure that you want to unarchive this project?" 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?" msgstr "" @@ -1453,6 +1462,27 @@ msgstr "" msgid "BranchSwitcherTitle|Switch branch" msgstr "" +msgid "BranchValidation|can't be" +msgstr "" + +msgid "BranchValidation|can't contain" +msgstr "" + +msgid "BranchValidation|can't end in" +msgstr "" + +msgid "BranchValidation|can't start with" +msgstr "" + +msgid "BranchValidation|consecutive slashes" +msgstr "" + +msgid "BranchValidation|or" +msgstr "" + +msgid "BranchValidation|spaces" +msgstr "" + msgid "Branches" msgstr "" @@ -2587,6 +2617,9 @@ msgstr "" msgid "Comment form position" msgstr "" +msgid "Comment is being updated" +msgstr "" + msgid "Comments" msgstr "" @@ -6399,6 +6432,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." msgstr "" +msgid "NoteForm|Note" +msgstr "" + msgid "Notes|Are you sure you want to cancel creating this comment?" msgstr "" @@ -9697,6 +9733,9 @@ 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 "" @@ -11290,6 +11329,12 @@ msgstr "" msgid "Your changes have been successfully committed." 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." msgstr "" @@ -11878,12 +11923,18 @@ 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 "" |