From ed0b78857cbc869de50bf72f76f55ac46498cab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Tue, 29 Nov 2022 00:55:05 +0800
Subject: [PATCH] refactor(i18n): tidy fields

---
 components/nav/SelectLanguage.vue | 2 +-
 locales/de-DE.json                | 8 +++++---
 locales/en-US.json                | 8 +++++---
 locales/zh-CN.json                | 8 +++++---
 nuxt.config.ts                    | 2 +-
 pages/public/index.vue            | 2 +-
 pages/public/local.vue            | 2 +-
 7 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/components/nav/SelectLanguage.vue b/components/nav/SelectLanguage.vue
index accf9c6d..817880c0 100644
--- a/components/nav/SelectLanguage.vue
+++ b/components/nav/SelectLanguage.vue
@@ -10,7 +10,7 @@ const { locales } = useI18n() as { locales: ComputedRef<LocaleObject[]> }
 </script>
 
 <template>
-  <CommonTooltip placement="bottom" :content="t('selectLanguage')">
+  <CommonTooltip placement="bottom" :content="t('nav_footer.select_language')">
     <CommonDropdown>
       <button flex>
         <div i-ri:earth-line text-lg />
diff --git a/locales/de-DE.json b/locales/de-DE.json
index b7a27680..2cb5e71d 100644
--- a/locales/de-DE.json
+++ b/locales/de-DE.json
@@ -1,5 +1,4 @@
 {
-  "selectLanguage": "Sprache auswählen",
   "nav_side": {
     "home": "Startseite",
     "notifications": "Mitteilungen",
@@ -11,10 +10,13 @@
     "bookmarks": "Lesezeichen",
     "profile": "Profil"
   },
+  "nav_footer": {
+    "select_language": "Sprache auswählen"
+  },
   "timeline": "Timeline",
   "title": {
-    "local-timeline": "@:nav_side.local @:timeline",
-    "federated-timeline": "@:nav_side.federated @:timeline"
+    "local_timeline": "@:nav_side.local @:timeline",
+    "federated_timeline": "@:nav_side.federated @:timeline"
   },
   "account": {
     "posts": "{0} Beiträge",
diff --git a/locales/en-US.json b/locales/en-US.json
index abc61f98..7368febd 100644
--- a/locales/en-US.json
+++ b/locales/en-US.json
@@ -1,5 +1,4 @@
 {
-  "selectLanguage": "Select Language",
   "nav_side": {
     "home": "Home",
     "notifications": "Notifications",
@@ -11,10 +10,13 @@
     "bookmarks": "Bookmarks",
     "profile": "Profile"
   },
+  "nav_footer": {
+    "select_language": "Select Language"
+  },
   "timeline": "Timeline",
   "title": {
-    "local-timeline": "@:nav_side.local @:timeline",
-    "federated-timeline": "@:nav_side.federated @:timeline"
+    "local_timeline": "@:nav_side.local @:timeline",
+    "federated_timeline": "@:nav_side.federated @:timeline"
   },
   "account": {
     "posts": "{0} Posts",
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
index 1d183ea0..f7eaef46 100644
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@@ -1,5 +1,4 @@
 {
-  "selectLanguage": "选择语言",
   "nav_side": {
     "bookmarks": "书签",
     "conversations": "私信",
@@ -11,10 +10,13 @@
     "notifications": "通知",
     "profile": "个人资料"
   },
+  "nav_footer": {
+    "select_language": "选择语言"
+  },
   "timeline": "时间轴",
   "title": {
-    "local-timeline": "@:nav_side.local@:timeline",
-    "federated-timeline": "@:nav_side.federated@:timeline"
+    "local_timeline": "@:nav_side.local@:timeline",
+    "federated_timeline": "@:nav_side.federated@:timeline"
   },
   "account": {
     "followers": "被 {0} 人关注",
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 4ca45521..ce95feef 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -82,7 +82,7 @@ export default defineNuxtConfig({
         file: 'zh-CN.json',
         name: '简体中文',
       },
-    ],
+    ].sort((a, b) => a.code.localeCompare(b.code)),
     strategy: 'no_prefix',
     detectBrowserLanguage: false,
     // TODO:
diff --git a/pages/public/index.vue b/pages/public/index.vue
index daeb822e..cbb0c987 100644
--- a/pages/public/index.vue
+++ b/pages/public/index.vue
@@ -13,7 +13,7 @@ useHead({
 <template>
   <MainContent>
     <template #title>
-      <span text-lg font-bold>{{ t('title.federated-timeline') }}</span>
+      <span text-lg font-bold>{{ t('title.federated_timeline') }}</span>
     </template>
 
     <slot>
diff --git a/pages/public/local.vue b/pages/public/local.vue
index b5e2da64..12fd584b 100644
--- a/pages/public/local.vue
+++ b/pages/public/local.vue
@@ -13,7 +13,7 @@ useHead({
 <template>
   <MainContent>
     <template #title>
-      <span text-lg font-bold>{{ t('title.local-timeline') }}</span>
+      <span text-lg font-bold>{{ t('title.local_timeline') }}</span>
     </template>
 
     <slot>