diff options
author | Brandon Labuschagne <blabuschagne@gitlab.com> | 2019-04-29 18:17:14 +0000 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2019-04-29 18:17:14 +0000 |
commit | 2d5b7a4b7b5644e93e7a016f26882076a918cf09 (patch) | |
tree | 05fa256dabbf000bd029a0663940cb88286998bb | |
parent | 94e94295c78e026b725dc5fb1cb961fa06220340 (diff) | |
download | gitlab-ce-2d5b7a4b7b5644e93e7a016f26882076a918cf09.tar.gz |
Internationalisation of javascript/m* directories
This is one of many MRs opened in order to improve the overall
internationalisation of the GitLab codebase.
i18n documentation
https://docs.gitlab.com/ee/development/i18n/externalization.html
-rw-r--r-- | app/assets/javascripts/mirrors/ssh_mirror.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/monitoring/services/monitoring_service.js | 4 | ||||
-rw-r--r-- | app/assets/javascripts/mr_popover/constants.js | 8 | ||||
-rw-r--r-- | locale/gitlab.pot | 6 |
4 files changed, 14 insertions, 6 deletions
diff --git a/app/assets/javascripts/mirrors/ssh_mirror.js b/app/assets/javascripts/mirrors/ssh_mirror.js index 547c078ec55..f7e80950803 100644 --- a/app/assets/javascripts/mirrors/ssh_mirror.js +++ b/app/assets/javascripts/mirrors/ssh_mirror.js @@ -290,7 +290,7 @@ export default class SSHMirror { this.setSSHPublicKey(data.import_data_attributes.ssh_public_key); }) .catch(() => { - Flash(_('Unable to regenerate public ssh key.')); + Flash(__('Unable to regenerate public ssh key.')); }); } diff --git a/app/assets/javascripts/monitoring/services/monitoring_service.js b/app/assets/javascripts/monitoring/services/monitoring_service.js index 5fcc2c8cfac..1efa5189996 100644 --- a/app/assets/javascripts/monitoring/services/monitoring_service.js +++ b/app/assets/javascripts/monitoring/services/monitoring_service.js @@ -1,7 +1,7 @@ import axios from '../../lib/utils/axios_utils'; import statusCodes from '../../lib/utils/http_status'; import { backOff } from '../../lib/utils/common_utils'; -import { s__ } from '../../locale'; +import { s__, __ } from '../../locale'; const MAX_REQUESTS = 3; @@ -15,7 +15,7 @@ function backOffRequest(makeRequestCallback) { if (requestCounter < MAX_REQUESTS) { next(); } else { - stop(new Error('Failed to connect to the prometheus server')); + stop(new Error(__('Failed to connect to the prometheus server'))); } } else { stop(resp); diff --git a/app/assets/javascripts/mr_popover/constants.js b/app/assets/javascripts/mr_popover/constants.js index 433df844c80..c13c417cc18 100644 --- a/app/assets/javascripts/mr_popover/constants.js +++ b/app/assets/javascripts/mr_popover/constants.js @@ -1,10 +1,12 @@ +import { __ } from '~/locale'; + export const mrStates = { merged: 'merged', closed: 'closed', }; export const humanMRStates = { - merged: 'Merged', - closed: 'Closed', - open: 'Open', + merged: __('Merged'), + closed: __('Closed'), + open: __('Open'), }; diff --git a/locale/gitlab.pot b/locale/gitlab.pot index ada9229553c..c8b583575c8 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -3958,6 +3958,9 @@ msgstr "" msgid "Failed to check related branches." msgstr "" +msgid "Failed to connect to the prometheus server" +msgstr "" + msgid "Failed to create repository via gitlab-shell" msgstr "" @@ -9805,6 +9808,9 @@ msgstr "" msgid "Unable to load the diff. %{button_try_again}" msgstr "" +msgid "Unable to regenerate public ssh key." +msgstr "" + msgid "Unable to schedule a pipeline to run immediately" msgstr "" |