merge: fix: use i18n in settings/general.vue (!626)

View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/626

Closes #541

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>

4 files changed, 21 insertions, 3 deletions

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 58712657e8..6d24bb5b41 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -776,6 +776,7 @@ noCrawleDescription: "Ask search engines to not index your profile page, notes,
 lockedAccountInfo: "Unless you set your note visiblity to \"Followers only\", your notes will be visible to anyone, even if you require followers to be manually approved."
 alwaysMarkSensitive: "Mark as sensitive by default"
 loadRawImages: "Load original images instead of showing thumbnails"
+showTickerOnReplies: "Show instance ticker on replies"
 searchEngine: "Search Engine For Search MFM"
 searchEngineOther: "Other"
 searchEngineCustomURIDescription: "The custom URI must be input in the format like \"https://www.google.com/search?q=\\{query}\" or \"https://www.google.com/search?q=%s\"."
@@ -1089,6 +1090,8 @@ collapseRenotes: "Collapse boosts you've already seen"
 collapseRenotesDescription: "Collapse boosts that you have boosted or reacted to"
 collapseNotesRepliedTo: "Collapse notes replied to"
 collapseFiles: "Collapse files"
+uncollapseCW: "Uncollapse CWs on notes"
+expandLongNote: "Always expand long notes"
 autoloadConversation: "Load conversation on replies"
 internalServerError: "Internal Server Error"
 internalServerErrorDescription: "The server has run into an unexpected error."
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 55a95f8fd9..177a3c8160 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -3121,6 +3121,10 @@ export interface Locale extends ILocale {
      */
     "loadRawImages": string;
     /**
+     * 返信にサーバー情報を表示する
+     */
+    "showTickerOnReplies": string;
+    /**
      * 検索MFMの検索エンジン
      */
     "searchEngine": string;
@@ -4374,6 +4378,14 @@ export interface Locale extends ILocale {
      */
     "collapseFiles": string;
     /**
+     * CWを展開する
+     */
+    "uncollapseCW": string;
+    /**
+     * 長い投稿を常に展開する
+     */
+    "expandLongNote": string;
+    /**
      * 会話スレッドを自動で読み込む
      */
     "autoloadConversation": string;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index da208147a1..b4d47a449c 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -776,6 +776,7 @@ noCrawleDescription: "外部の検索エンジンにあなたのユーザーペ�
 lockedAccountInfo: "フォローを承認制にしても、ノートの公開範囲を「フォロワー」にしない限り、誰でもあなたのノートを見ることができます。"
 alwaysMarkSensitive: "デフォルトでメディアをセンシティブ設定にする"
 loadRawImages: "添付画像のサムネイルをオリジナル画質にする"
+showTickerOnReplies: "返信にサーバー情報を表示する"
 searchEngine: "検索MFMの検索エンジン"
 searchEngineOther: "カスタム"
 searchEngineCustomURIDescription: "カスタム検索エンジンのURIは、\"https://www.google.com/search?q=\\{query}\" や \"https://www.google.com/search?q=%s\" のような形式で入力する必要があります。"
@@ -1089,6 +1090,8 @@ collapseRenotes: "ブーストのスマート省略"
 collapseRenotesDescription: "リアクションやブーストをしたことがあるノートをたたんで表示します。"
 collapseNotesRepliedTo: "返信元のノートを折りたたむ"
 collapseFiles: "ファイルを折りたたむ"
+uncollapseCW: "CWを展開する"
+expandLongNote: "長い投稿を常に展開する"
 autoloadConversation: "会話スレッドを自動で読み込む"
 internalServerError: "サーバー内部エラー"
 internalServerErrorDescription: "サーバー内部で予期しないエラーが発生しました。"
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 75afe67be7..637c1b24b9 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -56,8 +56,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</MkSwitch>
 				<MkSwitch v-model="collapseNotesRepliedTo">{{ i18n.ts.collapseNotesRepliedTo }}</MkSwitch>
 				<MkSwitch v-model="collapseFiles">{{ i18n.ts.collapseFiles }}</MkSwitch>
-				<MkSwitch v-model="uncollapseCW">Uncollapse CWs on notes</MkSwitch>
-				<MkSwitch v-model="expandLongNote">Always expand long notes</MkSwitch>
+				<MkSwitch v-model="uncollapseCW">{{ i18n.ts.uncollapseCW }}</MkSwitch>
+				<MkSwitch v-model="expandLongNote">{{ i18n.ts.expandLongNote }}</MkSwitch>
 				<MkSwitch v-model="showNoteActionsOnlyHover">{{ i18n.ts.showNoteActionsOnlyHover }}</MkSwitch>
 				<MkSwitch v-model="showClipButtonInNoteFooter">{{ i18n.ts.showClipButtonInNoteFooter }}</MkSwitch>
 				<MkSwitch v-model="autoloadConversation">{{ i18n.ts.autoloadConversation }}</MkSwitch>
@@ -67,7 +67,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkSwitch v-model="showReactionsCount">{{ i18n.ts.showReactionsCount }}</MkSwitch>
 				<MkSwitch v-model="showGapBetweenNotesInTimeline">{{ i18n.ts.showGapBetweenNotesInTimeline }}</MkSwitch>
 				<MkSwitch v-model="loadRawImages">{{ i18n.ts.loadRawImages }}</MkSwitch>
-				<MkSwitch v-model="showTickerOnReplies">Show instance ticker on replies</MkSwitch>
+				<MkSwitch v-model="showTickerOnReplies">{{ i18n.ts.showTickerOnReplies }}</MkSwitch>
 				<MkSelect v-model="searchEngine" placeholder="Other">
 					<template #label>{{ i18n.ts.searchEngine }}</template>
 					<option