From 29179726229e75a078d3badaa97e1c7766670fa6 Mon Sep 17 00:00:00 2001
From: winkidney <winkidney@gmail.com>
Date: Fri, 22 Apr 2022 10:35:51 -0700
Subject: [PATCH] feature: add locale name for language

---
 pinry-spa/src/components/PHeader.vue            |  5 +++--
 pinry-spa/src/components/utils/i18n/index.js    | 17 +++++++++++++++++
 .../utils/i18n}/locales/en.json                 |  0
 .../utils/i18n}/locales/zh.json                 |  0
 pinry-spa/src/main.js                           |  9 ++-------
 5 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 pinry-spa/src/components/utils/i18n/index.js
 rename pinry-spa/src/{assets => components/utils/i18n}/locales/en.json (100%)
 rename pinry-spa/src/{assets => components/utils/i18n}/locales/zh.json (100%)

diff --git a/pinry-spa/src/components/PHeader.vue b/pinry-spa/src/components/PHeader.vue
index c6383a1..20415f3 100644
--- a/pinry-spa/src/components/PHeader.vue
+++ b/pinry-spa/src/components/PHeader.vue
@@ -102,7 +102,7 @@
                   :key="`locale-${locale}`"
                   @click="setLocale(locale)"
                   class="navbar-item">
-                  {{ locale }}
+                  {{ langs[locale] }}
                 </a>
               </div>
             </div>
@@ -136,6 +136,7 @@
 </template>
 
 <script>
+import localeUtils from '@/components/utils/i18n';
 import api from './api';
 import modals from './modals';
 
@@ -148,7 +149,7 @@ export default {
         loggedIn: false,
         meta: {},
       },
-      langs: ['en'],
+      langs: localeUtils.langCode2Name,
     };
   },
   computed: {
diff --git a/pinry-spa/src/components/utils/i18n/index.js b/pinry-spa/src/components/utils/i18n/index.js
new file mode 100644
index 0000000..c909596
--- /dev/null
+++ b/pinry-spa/src/components/utils/i18n/index.js
@@ -0,0 +1,17 @@
+import en from './locales/en.json';
+import zh from './locales/zh.json';
+
+const messages = {
+  en,
+  zh,
+};
+
+const langCode2Name = {
+  en: 'English',
+  zh: '简体中文',
+};
+
+export default {
+  messages,
+  langCode2Name,
+};
diff --git a/pinry-spa/src/assets/locales/en.json b/pinry-spa/src/components/utils/i18n/locales/en.json
similarity index 100%
rename from pinry-spa/src/assets/locales/en.json
rename to pinry-spa/src/components/utils/i18n/locales/en.json
diff --git a/pinry-spa/src/assets/locales/zh.json b/pinry-spa/src/components/utils/i18n/locales/zh.json
similarity index 100%
rename from pinry-spa/src/assets/locales/zh.json
rename to pinry-spa/src/components/utils/i18n/locales/zh.json
diff --git a/pinry-spa/src/main.js b/pinry-spa/src/main.js
index 20fa611..7efea88 100644
--- a/pinry-spa/src/main.js
+++ b/pinry-spa/src/main.js
@@ -2,17 +2,12 @@ import Buefy from 'buefy';
 import Vue from 'vue';
 import { VueMasonryPlugin } from 'vue-masonry';
 import VueI18n from 'vue-i18n';
+import localeUtils from './components/utils/i18n';
 import App from './App.vue';
 import router from './router';
 import setUpAxiosCsrfConfig from './components/utils/csrf';
 import './registerServiceWorker';
-import en from './assets/locales/en.json';
-import zh from './assets/locales/zh.json';
 
-const messages = {
-  en,
-  zh,
-};
 
 Vue.config.productionTip = false;
 Vue.use(Buefy);
@@ -23,7 +18,7 @@ setUpAxiosCsrfConfig();
 const i18n = new VueI18n({
   locale: localStorage.getItem('localeCode') || navigator.language.split('-')[0],
   fallbackLocale: 'en',
-  messages,
+  messages: localeUtils.messages,
 });
 
 new Vue({