diff --git a/locales/index.d.ts b/locales/index.d.ts index ebc96ab652..db41865f66 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -543,6 +543,8 @@ export interface Locale { "deleteAll": string; "showFixedPostForm": string; "showFixedPostFormInChannel": string; + "FeaturedOrNote": string; + "FeaturedOrNoteInfo": string; "newNoteRecived": string; "sounds": string; "sound": string; diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index f9afdb54a0..0c0179eaca 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -540,6 +540,8 @@ serverLogs: "サーバーログ" deleteAll: "全て削除" showFixedPostForm: "タイムライン上部に投稿フォームを表示する" showFixedPostFormInChannel: "タイムライン上部に投稿フォームを表示する(チャンネル)" +FeaturedOrNote: "ユーザーのページで最新のノートを表示する" +FeaturedOrNoteInfo: "ユーザーのページに行ったときにハイライトか最新のノートを表示するかを選択することができます。 オフでハイライト オンで最新のノート です" newNoteRecived: "新しいノートがあります" sounds: "サウンド" sound: "サウンド" diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue index d9279d8bb8..ba2e226f17 100644 --- a/packages/frontend/src/pages/settings/general.vue +++ b/packages/frontend/src/pages/settings/general.vue @@ -30,6 +30,7 @@ SPDX-License-Identifier: AGPL-3.0-only {{ i18n.ts.showFixedPostForm }} {{ i18n.ts.showFixedPostFormInChannel }} {{ i18n.ts.showMediaTimeline}} + {{ i18n.ts.FeaturedOrNote}} @@ -286,6 +287,7 @@ const enableGamingMode = computed(defaultStore.makeGetterSetter('gamingMode')); const enableonlyAndWithSave = computed(defaultStore.makeGetterSetter('onlyAndWithSave')); const showMediaTimeline = computed(defaultStore.makeGetterSetter('showMediaTimeline')); const showVisibilityColor = computed(defaultStore.makeGetterSetter('showVisibilityColor')) +const FeaturedOrNote = computed(defaultStore.makeGetterSetter('FeaturedOrNote')) watch(lang, () => { miLocalStorage.setItem('lang', lang.value as string); miLocalStorage.removeItem('locale'); @@ -347,6 +349,7 @@ watch([ showMediaTimeline, showVisibilityColor, enableonlyAndWithSave, + FeaturedOrNote, ], async () => { await reloadAsk(); }); diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue index 6a3687c85d..d9986ebd43 100644 --- a/packages/frontend/src/pages/user/home.vue +++ b/packages/frontend/src/pages/user/home.vue @@ -4,150 +4,168 @@ SPDX-License-Identifier: AGPL-3.0-only -->