From 34852089293925a53a8c0902dc95321db439185c 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: Thu, 1 Dec 2022 21:59:28 +0800
Subject: [PATCH] i18n: improve

---
 components/conversation/ConversationCard.vue   |  2 +-
 components/status/StatusNotFound.vue           |  6 +++---
 components/status/edit/StatusEditHistory.vue   |  5 +++--
 components/status/edit/StatusEditIndicator.vue |  2 +-
 locales/en-US.json                             | 14 ++++++++++++--
 locales/ja-JP.json                             | 16 ++++++++--------
 locales/zh-CN.json                             | 14 ++++++++++++--
 7 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/components/conversation/ConversationCard.vue b/components/conversation/ConversationCard.vue
index e79a4f4f..d274fa63 100644
--- a/components/conversation/ConversationCard.vue
+++ b/components/conversation/ConversationCard.vue
@@ -9,7 +9,7 @@ const props = defineProps<{
 <template>
   <article flex flex-col gap-2>
     <div flex gap-2 flex-wrap text-sm px-2>
-      with
+      {{ $t('conversation.with') }}
       <AccountInlineInfo v-for="account in conversation.accounts" :key="account.id" :account="account" />
     </div>
     <StatusCard v-if="conversation.lastStatus" :status="conversation.lastStatus" :actions="false" />
diff --git a/components/status/StatusNotFound.vue b/components/status/StatusNotFound.vue
index 905cd1ae..ea722c30 100644
--- a/components/status/StatusNotFound.vue
+++ b/components/status/StatusNotFound.vue
@@ -17,12 +17,12 @@ const originalUrl = computed(() => {
 <template>
   <CommonNotFound>
     <div flex="~ col center gap2">
-      <div>Status not found</div>
+      <div>{{ $t('error.status_not_found') }}</div>
 
       <NuxtLink v-if="originalUrl" :to="originalUrl" target="_blank">
-        <button btn-solid flex="~ center gap-2" px2 py1>
+        <button btn-solid flex="~ center gap-2" text-sm px2 py1>
           <div i-ri:arrow-right-up-line />
-          Try original site
+          {{ $t('status.try_original_site') }}
         </button>
       </NuxtLink>
     </div>
diff --git a/components/status/edit/StatusEditHistory.vue b/components/status/edit/StatusEditHistory.vue
index 2b05eb2c..e2fdbfaa 100644
--- a/components/status/edit/StatusEditHistory.vue
+++ b/components/status/edit/StatusEditHistory.vue
@@ -21,8 +21,9 @@ const showHistory = (edit: StatusEdit) => {
       @click="showHistory(edit)"
     >
       {{ getDisplayName(edit.account) }}
-      {{ idx === statusEdits.length - 1 ? 'created' : 'edited' }}
-      {{ useTimeAgo(edit.createdAt, { showSecond: true }).value }}
+      <i18n-t :keypath="`status_history.${idx === statusEdits.length - 1 ? 'created' : 'edited'}`">
+        {{ useTimeAgo(edit.createdAt, { showSecond: true }).value }}
+      </i18n-t>
     </CommonDropdownItem>
   </template>
   <template v-else>
diff --git a/components/status/edit/StatusEditIndicator.vue b/components/status/edit/StatusEditIndicator.vue
index fd7154ea..737d0795 100644
--- a/components/status/edit/StatusEditIndicator.vue
+++ b/components/status/edit/StatusEditIndicator.vue
@@ -27,7 +27,7 @@ const formatted = useFormattedDateTime(editedAt)
       <template #popper>
         <div text-sm p2>
           <div text-center mb1>
-            Edited {{ formatted }}
+            {{ $t('status.edited', [formatted]) }}
           </div>
           <StatusEditHistory :status="status" />
         </div>
diff --git a/locales/en-US.json b/locales/en-US.json
index aac754b9..500597c8 100644
--- a/locales/en-US.json
+++ b/locales/en-US.json
@@ -43,8 +43,12 @@
     "not_found": "404 Not Found",
     "offline_desc": "Seems like you are offline. Please check your network connection."
   },
+  "conversation": {
+    "with": "with"
+  },
   "error": {
-    "account_not_found": "Account {0} not found"
+    "account_not_found": "Account {0} not found",
+    "status_not_found": "Status not found"
   },
   "feature_flag": {
     "virtual_scroll": "Virtual Scrolling"
@@ -113,9 +117,15 @@
     "uploading": "Uploading..."
   },
   "status": {
+    "edited": "Edited {0}",
     "reblogged": "{0} reblogged",
     "spoiler_show_less": "Show less",
-    "spoiler_show_more": "Show more"
+    "spoiler_show_more": "Show more",
+    "try_original_site": "Try original site"
+  },
+  "status_history": {
+    "created": "created {0}",
+    "edited": "edited {0}"
   },
   "tab": {
     "media": "Media",
diff --git a/locales/ja-JP.json b/locales/ja-JP.json
index 17739dec..bc869117 100644
--- a/locales/ja-JP.json
+++ b/locales/ja-JP.json
@@ -1,7 +1,7 @@
 {
   "account": {
-    "blocked_users": "ブロックしたユーザー",
     "blocked_domains": "ブロックしたドメイン",
+    "blocked_users": "ブロックしたユーザー",
     "favourites": "お気に入り",
     "follow": "フォローする",
     "follow_back": "フォローバックする",
@@ -10,8 +10,8 @@
     "following_count": "{0} フォロー中",
     "follows_you": "フォローされています",
     "muted_users": "ミュート済み",
-    "posts_count": "{0} 投稿",
     "pinned": "固定された投稿",
+    "posts_count": "{0} 投稿",
     "unfollow": "フォロー解除"
   },
   "action": {
@@ -22,9 +22,9 @@
     "sign_in": "サインイン"
   },
   "common": {
-    "not_found": "404 Not Found",
     "end_of_list": "他にはありません",
-    "error": "ERROR"
+    "error": "ERROR",
+    "not_found": "404 Not Found"
   },
   "feature_flag": {
     "virtual_scroll": "仮想スクロール"
@@ -61,12 +61,12 @@
     "sign_in_desc": "サインインすると、アカウントやハッシュタグをフォローしたり、お気に入りしたり、投稿を共有したり返信するほか、異なるサーバー上のあなたのアカウントから交流できます。"
   },
   "notification": {
-    "followed_you": "さんがあなたをフォローしました",
-    "request_to_follow": "さんがあなたへフォローをリクエストしました",
     "favourited_post": "さんがあなたの投稿お気に入り登録しました",
+    "followed_you": "さんがあなたをフォローしました",
+    "missing_type": "MISSING notification.type:",
     "reblogged_post": "さんがあなたの投稿をブーストしました",
-    "update_status": "さんが投稿を更新しました",
-    "missing_type": "MISSING notification.type:"
+    "request_to_follow": "さんがあなたへフォローをリクエストしました",
+    "update_status": "さんが投稿を更新しました"
   },
   "state": {
     "editing": "編集中",
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
index 3fb21eec..1628c65f 100644
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@@ -43,8 +43,12 @@
     "not_found": "无法找到相关内容",
     "offline_desc": "您目前已离线，请检查网络连接。"
   },
+  "conversation": {
+    "with": "与"
+  },
   "error": {
-    "account_not_found": "未找到用户 {0}"
+    "account_not_found": "未找到用户 {0}",
+    "status_not_found": "未找到帖文"
   },
   "feature_flag": {
     "virtual_scroll": "虚拟滚动"
@@ -112,9 +116,15 @@
     "uploading": "上传中..."
   },
   "status": {
+    "edited": "在 {0} 编辑了",
     "reblogged": "{0} 转发了",
     "spoiler_show_less": "隐藏",
-    "spoiler_show_more": "显示更多"
+    "spoiler_show_more": "显示更多",
+    "try_original_site": "尝试从源站打开"
+  },
+  "status_history": {
+    "created": "在 {0} 发布了",
+    "edited": "在 {0} 编辑了"
   },
   "tab": {
     "media": "媒体",