diff options
author | Phil Hughes <me@iamphill.com> | 2019-04-29 15:33:01 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-04-29 15:33:01 +0000 |
commit | 7ee276eafa67ceba8c8f2942aa7ae986f771153d (patch) | |
tree | c1a450632d9b565f4a95348181bbfe8c3b0a7795 | |
parent | 43c7dae9aa3b59252fe78bdf81ef011ff874aef2 (diff) | |
parent | c7569a4942230b31e5d5163a1869858c0e7b1a61 (diff) | |
download | gitlab-ce-7ee276eafa67ceba8c8f2942aa7ae986f771153d.tar.gz |
Merge branch 'js-i18n-cycle_analytics' into 'master'
Internationalisation of cycle_analytics directory
See merge request gitlab-org/gitlab-ce!27674
-rw-r--r-- | app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js | 3 | ||||
-rw-r--r-- | locale/gitlab.pot | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js b/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js index 4de425b48e7..3f0a9f2602c 100644 --- a/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js +++ b/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js @@ -12,6 +12,7 @@ import stageStagingComponent from './components/stage_staging_component.vue'; import stageTestComponent from './components/stage_test_component.vue'; import CycleAnalyticsService from './cycle_analytics_service'; import CycleAnalyticsStore from './cycle_analytics_store'; +import { __ } from '~/locale'; Vue.use(Translate); @@ -61,7 +62,7 @@ export default () => { methods: { handleError() { this.store.setErrorState(true); - return new Flash('There was an error while fetching cycle analytics data.'); + return new Flash(__('There was an error while fetching cycle analytics data.')); }, initDropdown() { const $dropdown = $('.js-ca-dropdown'); diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 0a5cd6730e6..78d50c74eac 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -9156,6 +9156,9 @@ msgstr "" msgid "There was an error when unsubscribing from this label." msgstr "" +msgid "There was an error while fetching cycle analytics data." +msgstr "" + msgid "There was an error with the reCAPTCHA. Please solve the reCAPTCHA again." msgstr "" |