summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkami8 <55905116+kamiya-s-max@users.noreply.github.com>2025-11-19 19:17:43 +0900
committerGitHub <noreply@github.com>2025-11-19 19:17:43 +0900
commit9f810d701d69cf0c8e25515415633b9cfc202174 (patch)
tree483631badccf65977d4ea351ac4490435a1ee574
parentfix(devcontainer): devcontainerのバージョンアップ+Renovateでbump... (diff)
downloadmisskey-9f810d701d69cf0c8e25515415633b9cfc202174.tar.gz
misskey-9f810d701d69cf0c8e25515415633b9cfc202174.tar.bz2
misskey-9f810d701d69cf0c8e25515415633b9cfc202174.zip
enhance(frontend): リアクションの受け入れ設定にキャプションを追加 (#16807)
* enhance(frontend): リアクションの受け入れ設定にキャプションを追加 * Update Changelog * CHANGELOG.mdを修正 * CHANGELOG.mdのコンフリクトを解消し、再度変更内容を記載 * 条件分岐をswitch文に変更 * chore: trigger CI re-run
-rw-r--r--CHANGELOG.md3
-rw-r--r--packages/frontend/src/components/MkPostForm.vue28
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();
},