From 9f810d701d69cf0c8e25515415633b9cfc202174 Mon Sep 17 00:00:00 2001 From: kami8 <55905116+kamiya-s-max@users.noreply.github.com> Date: Wed, 19 Nov 2025 19:17:43 +0900 Subject: [PATCH] =?UTF-8?q?enhance(frontend):=20=E3=83=AA=E3=82=A2?= =?UTF-8?q?=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AE=E5=8F=97=E3=81=91?= =?UTF-8?q?=E5=85=A5=E3=82=8C=E8=A8=AD=E5=AE=9A=E3=81=AB=E3=82=AD=E3=83=A3?= =?UTF-8?q?=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=20(#16807)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * enhance(frontend): リアクションの受け入れ設定にキャプションを追加 * Update Changelog * CHANGELOG.mdを修正 * CHANGELOG.mdのコンフリクトを解消し、再度変更内容を記載 * 条件分岐をswitch文に変更 * chore: trigger CI re-run --- CHANGELOG.md | 3 +- .../frontend/src/components/MkPostForm.vue | 28 ++++++++++++++++--- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d6b3f428d..03c09904ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,12 +4,11 @@ - ### Client -- +- Enhance: リアクションの受け入れ設定にキャプションを追加 #15921 ### Server - - ## 2025.11.0 ### General diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index 50340b21c2..84b0d12bb9 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -608,11 +608,30 @@ async function toggleReactionAcceptance() { //#region その他の設定メニューpopup function showOtherSettings() { let reactionAcceptanceIcon = 'ti ti-icons'; + let reactionAcceptanceCaption = ''; - if (reactionAcceptance.value === 'likeOnly') { - reactionAcceptanceIcon = 'ti ti-heart _love'; - } else if (reactionAcceptance.value === 'likeOnlyForRemote') { - reactionAcceptanceIcon = 'ti ti-heart-plus'; + switch (reactionAcceptance.value) { + case 'likeOnly': + reactionAcceptanceIcon = 'ti ti-heart _love'; + reactionAcceptanceCaption = i18n.ts.likeOnly; + break; + + case 'likeOnlyForRemote': + reactionAcceptanceIcon = 'ti ti-heart-plus'; + reactionAcceptanceCaption = i18n.ts.likeOnlyForRemote; + break; + + case 'nonSensitiveOnly': + reactionAcceptanceCaption = i18n.ts.nonSensitiveOnly; + break; + + case 'nonSensitiveOnlyForLocalLikeOnlyForRemote': + reactionAcceptanceCaption = i18n.ts.nonSensitiveOnlyForLocalLikeOnlyForRemote; + break; + + default: + reactionAcceptanceCaption = i18n.ts.all; + break; } const menuItems = [{ @@ -624,6 +643,7 @@ function showOtherSettings() { }, { type: 'divider' }, { icon: reactionAcceptanceIcon, text: i18n.ts.reactionAcceptance, + caption: reactionAcceptanceCaption, action: () => { toggleReactionAcceptance(); },