diff --git a/lms/nladmin-ui/src/i18n/index.js b/lms/nladmin-ui/src/i18n/index.js index 1254bf8..22a7fe8 100644 --- a/lms/nladmin-ui/src/i18n/index.js +++ b/lms/nladmin-ui/src/i18n/index.js @@ -1,10 +1,9 @@ import Vue from 'vue' import VueI18n from 'vue-i18n' import locale from 'element-ui/lib/locale' -import zh from './langs/zh-CN' -import en from './langs/en' -import id from './langs/id' -import indonesian from './langs/in' +import zh from './langs/chinese' +import en from './langs/english' +import indonesian from './langs/indonesian' Vue.use(VueI18n) const messages = { en: { @@ -13,9 +12,6 @@ const messages = { zh: { ...zh }, - id: { - ...id - }, in: { ...indonesian } @@ -25,7 +21,7 @@ const i18n = new VueI18n({ messages, silentTranslationWarn: true, // 解决vue-i18n黄色警告"value of key 'xxx' is not a string"和"cannot translate the value of keypath 'xxx'.use the value of keypath as default",可忽略 globalInjection: true, // 全局注入 - fallbackLocale: 'en' + fallbackLocale: 'zh' }) locale.i18n((key, value) => i18n.t(key, value)) export default i18n diff --git a/lms/nladmin-ui/src/i18n/langs/chinese.js b/lms/nladmin-ui/src/i18n/langs/chinese.js new file mode 100644 index 0000000..baa9849 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/chinese.js @@ -0,0 +1,7 @@ +import zhLocale from 'element-ui/lib/locale/lang/zh-CN' +import zh from './zh-CN' + +export default { + ...zhLocale, + ...zh +} diff --git a/lms/nladmin-ui/src/i18n/langs/en.js b/lms/nladmin-ui/src/i18n/langs/en.js index 4cd019d..e72480c 100644 --- a/lms/nladmin-ui/src/i18n/langs/en.js +++ b/lms/nladmin-ui/src/i18n/langs/en.js @@ -1,4 +1,3 @@ -import enLocale from 'element-ui/lib/locale/lang/en' export default { 'lang': 'English', 'common': { @@ -116,6 +115,5 @@ export default { 'disk': 'Disk Utilization', 'cpu_monitoring': 'Cpu Utilization Monitoring', 'memory_monitoring': 'Memory Utilization Monitoring' - }, - ...enLocale + } } diff --git a/lms/nladmin-ui/src/i18n/langs/english.js b/lms/nladmin-ui/src/i18n/langs/english.js new file mode 100644 index 0000000..203b44c --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/english.js @@ -0,0 +1,7 @@ +import enLocale from 'element-ui/lib/locale/lang/en' +import en from './en' + +export default { + ...enLocale, + ...en +} diff --git a/lms/nladmin-ui/src/i18n/langs/id.js b/lms/nladmin-ui/src/i18n/langs/id.js deleted file mode 100644 index e69de29..0000000 diff --git a/lms/nladmin-ui/src/i18n/langs/in.js b/lms/nladmin-ui/src/i18n/langs/in.js index da77217..8c8ede7 100644 --- a/lms/nladmin-ui/src/i18n/langs/in.js +++ b/lms/nladmin-ui/src/i18n/langs/in.js @@ -1,4 +1,3 @@ -import idLocale from 'element-ui/lib/locale/lang/id' export default { 'lang': 'in', 'common': { @@ -116,6 +115,5 @@ export default { 'disk': 'Kadar penggunaan disk', 'cpu_monitoring': 'Monitor penggunaan CPU', 'memory_monitoring': 'Monitor penggunaan memori' - }, - ...idLocale + } } diff --git a/lms/nladmin-ui/src/i18n/langs/indonesian.js b/lms/nladmin-ui/src/i18n/langs/indonesian.js new file mode 100644 index 0000000..b5d3e4d --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/indonesian.js @@ -0,0 +1,7 @@ +import idLocale from 'element-ui/lib/locale/lang/id' +import id from './in' + +export default { + ...idLocale, + ...id +} diff --git a/lms/nladmin-ui/src/i18n/langs/zh-CN.js b/lms/nladmin-ui/src/i18n/langs/zh-CN.js index 8aca774..64e411c 100644 --- a/lms/nladmin-ui/src/i18n/langs/zh-CN.js +++ b/lms/nladmin-ui/src/i18n/langs/zh-CN.js @@ -1,4 +1,3 @@ -import zhLocale from 'element-ui/lib/locale/lang/zh-CN' export default { 'lang': 'zh', 'common': { @@ -123,6 +122,5 @@ export default { 'disk': '磁盘使用率', 'cpu_monitoring': 'CPU使用率监控', 'memory_monitoring': '内存使用率监控' - }, - ...zhLocale + } }