summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/ide
diff options
context:
space:
mode:
authorKushal Pandya <kushalspandya@gmail.com>2019-04-30 17:24:16 +0000
committerKushal Pandya <kushalspandya@gmail.com>2019-04-30 17:24:16 +0000
commit9938bed313ae85017a71153267d8651f6f0e12fb (patch)
tree2ea4cf1ea837ec75389c13abaaa335cf023e3dc9 /app/assets/javascripts/ide
parent4e207432324b4ed4c81a45d110a7965cd58e9328 (diff)
parenta26633003c89cc4e79aeb31d0f95452227cee7bb (diff)
downloadgitlab-ce-9938bed313ae85017a71153267d8651f6f0e12fb.tar.gz
Merge branch 'js-i18n-ide' into 'master'
Internationalisation of ide directory See merge request gitlab-org/gitlab-ce!27680
Diffstat (limited to 'app/assets/javascripts/ide')
-rw-r--r--app/assets/javascripts/ide/ide_router.js3
-rw-r--r--app/assets/javascripts/ide/stores/modules/file_templates/getters.js5
2 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/javascripts/ide/ide_router.js b/app/assets/javascripts/ide/ide_router.js
index 518a9cf7a0f..8c84b98a108 100644
--- a/app/assets/javascripts/ide/ide_router.js
+++ b/app/assets/javascripts/ide/ide_router.js
@@ -3,6 +3,7 @@ import VueRouter from 'vue-router';
import { joinPaths } from '~/lib/utils/url_utility';
import flash from '~/flash';
import store from './stores';
+import { __ } from '~/locale';
Vue.use(VueRouter);
@@ -94,7 +95,7 @@ router.beforeEach((to, from, next) => {
})
.catch(e => {
flash(
- 'Error while loading the project data. Please try again.',
+ __('Error while loading the project data. Please try again.'),
'alert',
document,
null,
diff --git a/app/assets/javascripts/ide/stores/modules/file_templates/getters.js b/app/assets/javascripts/ide/stores/modules/file_templates/getters.js
index 628babe6a01..f10891a8e5b 100644
--- a/app/assets/javascripts/ide/stores/modules/file_templates/getters.js
+++ b/app/assets/javascripts/ide/stores/modules/file_templates/getters.js
@@ -1,4 +1,5 @@
import { activityBarViews } from '../../../constants';
+import { __ } from '~/locale';
export const templateTypes = () => [
{
@@ -10,11 +11,11 @@ export const templateTypes = () => [
key: 'gitignores',
},
{
- name: 'LICENSE',
+ name: __('LICENSE'),
key: 'licenses',
},
{
- name: 'Dockerfile',
+ name: __('Dockerfile'),
key: 'dockerfiles',
},
];