Merge branch 'js-i18n-ide' into 'master'
Internationalisation of ide directory See merge request gitlab-org/gitlab-ce!27680
This commit is contained in:
commit
9938bed313
3 changed files with 11 additions and 3 deletions
|
@ -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,
|
||||
|
|
|
@ -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',
|
||||
},
|
||||
];
|
||||
|
|
|
@ -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 ""
|
||||
|
||||
|
|
Loading…
Reference in a new issue