Commit 964ad5dd authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'ee-js-i18n-ide' into 'master'

Internationalisation of ide directory - EE

See merge request gitlab-org/gitlab-ee!11730
parents ad47c5ae d2adcca2
...@@ -3,6 +3,7 @@ import VueRouter from 'vue-router'; ...@@ -3,6 +3,7 @@ import VueRouter from 'vue-router';
import { joinPaths } from '~/lib/utils/url_utility'; import { joinPaths } from '~/lib/utils/url_utility';
import flash from '~/flash'; import flash from '~/flash';
import store from './stores'; import store from './stores';
import { __ } from '~/locale';
Vue.use(VueRouter); Vue.use(VueRouter);
...@@ -94,7 +95,7 @@ router.beforeEach((to, from, next) => { ...@@ -94,7 +95,7 @@ router.beforeEach((to, from, next) => {
}) })
.catch(e => { .catch(e => {
flash( flash(
'Error while loading the project data. Please try again.', __('Error while loading the project data. Please try again.'),
'alert', 'alert',
document, document,
null, null,
......
import { activityBarViews } from '../../../constants'; import { activityBarViews } from '../../../constants';
import { __ } from '~/locale';
export const templateTypes = () => [ export const templateTypes = () => [
{ {
...@@ -10,11 +11,11 @@ export const templateTypes = () => [ ...@@ -10,11 +11,11 @@ export const templateTypes = () => [
key: 'gitignores', key: 'gitignores',
}, },
{ {
name: 'LICENSE', name: __('LICENSE'),
key: 'licenses', key: 'licenses',
}, },
{ {
name: 'Dockerfile', name: __('Dockerfile'),
key: 'dockerfiles', key: 'dockerfiles',
}, },
]; ];
......
...@@ -4618,6 +4618,9 @@ msgstr "" ...@@ -4618,6 +4618,9 @@ msgstr ""
msgid "Error while loading the merge request. Please try again." msgid "Error while loading the merge request. Please try again."
msgstr "" msgstr ""
msgid "Error while loading the project data. Please try again."
msgstr ""
msgid "Error while migrating %{upload_id}: %{error_message}" msgid "Error while migrating %{upload_id}: %{error_message}"
msgstr "" msgstr ""
...@@ -6868,6 +6871,9 @@ msgstr "" ...@@ -6868,6 +6871,9 @@ msgstr ""
msgid "LFSStatus|Enabled" msgid "LFSStatus|Enabled"
msgstr "" msgstr ""
msgid "LICENSE"
msgstr ""
msgid "Label" msgid "Label"
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