From 4723a02a4baeb3d0b26a686510a182dcaa87b5c2 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Mon, 6 Nov 2017 13:46:29 +0800
Subject: [PATCH] refine: refine i18n

---
 src/lang/en.js                           | 68 ++++++++++++------------
 src/lang/zh.js                           |  2 +-
 src/router/index.js                      |  2 +-
 src/views/layout/components/Levelbar.vue |  9 ++--
 src/views/layout/components/TabsView.vue |  5 +-
 5 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/src/lang/en.js b/src/lang/en.js
index e6e5a9e9..7d5386a7 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -1,49 +1,49 @@
 export default {
   route: {
-    dashboard: 'dashboard',
-    introduction: 'introduction',
-    permission: 'permission',
-    icons: 'icons',
-    components: 'components:',
-    componentIndex: 'introduction',
-    tinymce: 'tinymce',
+    dashboard: 'Dashboard',
+    introduction: 'Introduction',
+    permission: 'Permission',
+    icons: 'Icons',
+    components: 'Components',
+    componentIndex: 'Introduction',
+    tinymce: 'Tinymce',
     markdown: 'Markdown',
     jsonEditor: 'JSON Editor',
-    dndList: 'dnd list',
-    splitPane: 'Splitpane',
-    avatarUpload: 'avatar upload',
+    dndList: 'Dnd List',
+    splitPane: 'SplitPane',
+    avatarUpload: 'Avatar Upload',
     dropzone: 'Dropzone',
     sticky: 'Sticky',
     countTo: 'CountTo',
     componentMixin: 'Mixin',
-    backToTop: 'backToTop',
-    charts: 'charts',
-    chartsIndex: 'introduction',
-    keyboardChart: 'keyboard chart',
-    keyboardChart2: 'keyboard chart2',
-    lineChart: 'line chart',
-    mixChart: 'mix chart',
-    example: 'example',
+    backToTop: 'BackToTop',
+    charts: 'Charts',
+    chartsIndex: 'Introduction',
+    keyboardChart: 'Keyboard Chart',
+    keyboardChart2: 'Keyboard Chart2',
+    lineChart: 'Line chart',
+    mixChart: 'Mix Chart',
+    example: 'Example',
     Table: 'Table',
-    dynamicTable: '动态table',
-    dragTable: '拖拽table',
-    inlineEditTable: 'table内编辑',
-    complexTabl: '综合table',
+    dynamicTable: 'Dynamic Table',
+    dragTable: 'Drag Table',
+    inlineEditTable: 'Inline Edit',
+    complexTable: 'Complex Table',
     tab: 'Tab',
     form: 'Form',
-    createForm: 'create form',
-    editForm: 'edit form',
-    errorPages: 'error pages',
+    createForm: 'Create Form',
+    editForm: 'Edit Form',
+    errorPages: 'Error Pages',
     page401: '401',
     page404: '404',
-    errorLog: 'error log',
-    excel: 'excel',
-    exportExcel: 'export excel',
-    selectExcel: 'export selected',
-    uploadExcel: 'upload excel',
-    exportZip: 'zip',
-    theme: 'theme',
-    clipboardDemo: 'clipboard',
-    i18n: 'i18n'
+    errorLog: 'Error Log',
+    excel: 'Excel',
+    exportExcel: 'Export Excel',
+    selectExcel: 'Export Selected',
+    uploadExcel: 'Upload Excel',
+    exportZip: 'Zip',
+    theme: 'Theme',
+    clipboardDemo: 'Clipboard',
+    i18n: 'I18n'
   }
 }
diff --git a/src/lang/zh.js b/src/lang/zh.js
index ce6edbb1..37e5d65d 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -28,7 +28,7 @@ export default {
     dynamicTable: '动态table',
     dragTable: '拖拽table',
     inlineEditTable: 'table内编辑',
-    complexTabl: '综合table',
+    complexTable: '综合table',
     tab: 'Tab',
     form: '表单',
     createForm: '创建表单',
diff --git a/src/router/index.js b/src/router/index.js
index cd116f34..67a87197 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -151,7 +151,7 @@ export const asyncRouterMap = [
           { path: 'dynamic-table', component: _import('example/table/dynamicTable/index'), name: 'dynamicTable', meta: { title: 'dynamicTable' }},
           { path: 'drag-table', component: _import('example/table/dragTable'), name: 'dragTable', meta: { title: 'dragTable' }},
           { path: 'inline-edit-table', component: _import('example/table/inlineEditTable'), name: 'inlineEditTable', meta: { title: 'inlineEditTable' }},
-          { path: 'complex-table', component: _import('example/table/complexTable'), name: 'complexTable', meta: { title: 'complexTabl' }}
+          { path: 'complex-table', component: _import('example/table/complexTable'), name: 'complexTable', meta: { title: 'complexTable' }}
         ]
       },
       { path: 'tab/index', icon: 'tab', component: _import('example/tab/index'), name: 'tab', meta: { title: 'tab' }}
diff --git a/src/views/layout/components/Levelbar.vue b/src/views/layout/components/Levelbar.vue
index 39f2da8e..d452ca63 100644
--- a/src/views/layout/components/Levelbar.vue
+++ b/src/views/layout/components/Levelbar.vue
@@ -1,8 +1,8 @@
 <template>
   <el-breadcrumb class="app-levelbar" separator="/">
     <el-breadcrumb-item v-for="(item,index)  in levelList" :key="item.path" v-if='item.meta.title'>
-      <span v-if='item.redirect==="noredirect"||index==levelList.length-1' class="no-redirect">{{item.meta.title}}</span>
-      <router-link v-else :to="item.redirect||item.path">{{item.meta.title}}</router-link>
+      <span v-if='item.redirect==="noredirect"||index==levelList.length-1' class="no-redirect">{{generateTitle(item.meta.title)}}</span>
+      <router-link v-else :to="item.redirect||item.path">{{generateTitle(item.meta.title)}}</router-link>
     </el-breadcrumb-item>
   </el-breadcrumb>
 </template>
@@ -26,9 +26,12 @@ export default {
       }
       const first = matched[0]
       if (first && first.name !== 'dashboard') {
-        matched = [{ path: '/', meta: { title: '首页' }}].concat(matched)
+        matched = [{ path: '/', meta: { title: 'dashboard' }}].concat(matched)
       }
       this.levelList = matched
+    },
+    generateTitle(title) {
+      return this.$t('route.' + title)
     }
   },
   watch: {
diff --git a/src/views/layout/components/TabsView.vue b/src/views/layout/components/TabsView.vue
index 28c1bcf4..04acca3e 100644
--- a/src/views/layout/components/TabsView.vue
+++ b/src/views/layout/components/TabsView.vue
@@ -1,13 +1,12 @@
 <template>
   <scroll-pane class='tabs-view-container'>
-    <router-link class="tabs-view-item" :class="isActive(tag)?'active':''" v-for="tag in Array.from(visitedViews)" :to="tag.path" :key="tag.path">
-      {{tag.title}}
+    <router-link class="tabs-view-item" :class="isActive(tag)?'active':''" v-for="tag in Array.from(visitedViews)" :to="tag.path":key="tag.path">
+      {{$t('route.'+tag.title)}}
       <span class='el-icon-close' @click='closeViewTabs(tag,$event)'></span>
     </router-link>
   </scroll-pane>
 </template>
 
-
 <script>
 import ScrollPane from '@/components/ScrollPane'