Commit 9938bed3 authored by Kushal Pandya's avatar Kushal Pandya

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

Internationalisation of ide directory

See merge request gitlab-org/gitlab-ce!27680
parents 4e207432 a2663300
......@@ -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,
......
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',
},
];
......
......@@ -3784,6 +3784,9 @@ msgstr ""
msgid "Error while loading the merge request. Please try again."
msgstr ""
msgid "Error while loading the project data. Please try again."
msgstr ""
msgid "Error while migrating %{upload_id}: %{error_message}"
msgstr ""
......@@ -5216,6 +5219,9 @@ msgstr ""
msgid "LFSStatus|Enabled"
msgstr ""
msgid "LICENSE"
msgstr ""
msgid "Label"
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