feat(setting): display localized lang title

Voxelum · Sep 4, 2019 · d690580 · d690580
1 parent 84c35a4
commit d690580
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/renderer/windows/main/SettingPage.vue b/src/renderer/windows/main/SettingPage.vue
@@ -170,6 +170,8 @@
 </template>
 
 <script>
+import langIndex from 'static/locales/index.json';
+
 export default {
   data() {
     return {
@@ -188,7 +190,7 @@ export default {
   computed: {
     selectedLang: {
       get() {
-        return this.langs.find(l => l === this.$repo.state.setting.locale) || 'en';
+        return this.langs.find(l => l.value === this.$repo.state.setting.locale) || 'en';
       },
       set(v) { this.$repo.commit('locale', v); },
     },
@@ -212,7 +214,12 @@ export default {
     downloadingUpdate() { return this.$repo.state.setting.downloadingUpdate; },
     checkingUpdate() { return this.$repo.state.setting.checkingUpdate; },
     updateInfo() { return this.$repo.state.setting.updateInfo || {}; },
-    langs() { return this.$repo.state.setting.locales; },
+    langs() {
+      return this.$repo.state.setting.locales.map(l => ({
+        value: l,
+        text: langIndex[l],
+      })); 
+    },
   },
   methods: {
     checkUpdate() {

diff --git a/static/locales/index.js b/static/locales/index.js
@@ -5,6 +5,7 @@ const files = require.context('.', false, /\.json$/);
 const locales = {};
 
 files.keys().forEach((key) => {
+    if (key.endsWith('index.json')) return; 
     locales[key.replace(/(\.\/|\.json)/g, '')] = files(key);
 });
 

diff --git a/static/locales/index.json b/static/locales/index.json
@@ -0,0 +1,4 @@
+{
+    "en": "English",
+    "zh-CN": "中文（简体）"
+}