From d7d9304a4992c356e24f0be2310cf39c47194191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8A=E3=81=95=E3=82=80=E3=81=AE=E3=81=B2=E3=81=A8?=
<46447427+samunohito@users.noreply.github.com>
Date: Sat, 16 Dec 2023 13:23:54 +0900
Subject: [PATCH] =?UTF-8?q?fix(frontend):=20=E7=B5=B5=E6=96=87=E5=AD=97?=
=?UTF-8?q?=E3=83=94=E3=83=83=E3=82=AB=E3=83=BC=E8=A8=AD=E5=AE=9A=E3=83=9A?=
=?UTF-8?q?=E3=83=BC=E3=82=B8=E3=81=AE=E3=83=9C=E3=82=BF=E3=83=B3=E6=96=87?=
=?UTF-8?q?=E8=A8=80=E4=BF=AE=E6=AD=A3=20(#12676)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* fix(frontend): 絵文字ピッカー設定ページのボタン文言修正
* fix
---
locales/index.d.ts | 4 ++--
locales/ja-JP.yml | 4 ++--
packages/frontend/src/pages/settings/emoji-picker.vue | 8 ++++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 48c3daf05a..ae89f883fb 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -128,8 +128,8 @@ export interface Locale {
"pinnedEmojisForReactionSettingDescription": string;
"pinnedEmojisSettingDescription": string;
"emojiPickerDisplay": string;
- "copyFromPinnedEmojisForReaction": string;
- "copyFromPinnedEmojis": string;
+ "overwriteFromPinnedEmojisForReaction": string;
+ "overwriteFromPinnedEmojis": string;
"reactionSettingDescription2": string;
"rememberNoteVisibility": string;
"attachCancel": string;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index daa6a32032..922ce4fe31 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -125,8 +125,8 @@ emojiPicker: "絵文字ピッカー"
pinnedEmojisForReactionSettingDescription: "リアクション時にピン留め表示する絵文字を設定できます"
pinnedEmojisSettingDescription: "絵文字入力時にピン留め表示する絵文字を設定できます"
emojiPickerDisplay: "ピッカーの表示"
-copyFromPinnedEmojisForReaction: "リアクション設定からコピーする"
-copyFromPinnedEmojis: "絵文字設定からコピーする"
+overwriteFromPinnedEmojisForReaction: "リアクション設定から上書きする"
+overwriteFromPinnedEmojis: "全般設定から上書きする"
reactionSettingDescription2: "ドラッグして並び替え、クリックして削除、＋を押して追加します。"
rememberNoteVisibility: "公開範囲を記憶する"
attachCancel: "添付取り消し"
diff --git a/packages/frontend/src/pages/settings/emoji-picker.vue b/packages/frontend/src/pages/settings/emoji-picker.vue
index 7e7bf9bd1f..61f3332122 100644
--- a/packages/frontend/src/pages/settings/emoji-picker.vue
+++ b/packages/frontend/src/pages/settings/emoji-picker.vue
@@ -40,7 +40,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div class="_buttons">
<MkButton inline @click="previewReaction"><i class="ti ti-eye"></i> {{ i18n.ts.preview }}</MkButton>
<MkButton inline danger @click="setDefaultReaction"><i class="ti ti-reload"></i> {{ i18n.ts.default }}</MkButton>
- <MkButton inline danger @click="copyFromPinnedEmojis"><i class="ti ti-copy"></i> {{ i18n.ts.copyFromPinnedEmojis }}</MkButton>
+ <MkButton inline danger @click="overwriteFromPinnedEmojis"><i class="ti ti-copy"></i> {{ i18n.ts.overwriteFromPinnedEmojis }}</MkButton>
</div>
</div>
</MkFolder>
@@ -80,7 +80,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div class="_buttons">
<MkButton inline @click="previewEmoji"><i class="ti ti-eye"></i> {{ i18n.ts.preview }}</MkButton>
<MkButton inline danger @click="setDefaultEmoji"><i class="ti ti-reload"></i> {{ i18n.ts.default }}</MkButton>
- <MkButton inline danger @click="copyFromPinnedEmojisForReaction"><i class="ti ti-copy"></i> {{ i18n.ts.copyFromPinnedEmojisForReaction }}</MkButton>
+ <MkButton inline danger @click="overwriteFromPinnedEmojisForReaction"><i class="ti ti-copy"></i> {{ i18n.ts.overwriteFromPinnedEmojisForReaction }}</MkButton>
</div>
</div>
</MkFolder>
@@ -164,7 +164,7 @@ function previewEmoji(ev: MouseEvent) {
emojiPicker.show(getHTMLElement(ev));
}
-async function copyFromPinnedEmojis() {
+async function overwriteFromPinnedEmojis() {
const { canceled } = await os.confirm({
type: 'warning',
text: i18n.ts.overwriteContentConfirm,
@@ -177,7 +177,7 @@ async function copyFromPinnedEmojis() {
pinnedEmojisForReaction.value = [...pinnedEmojis.value];
}
-async function copyFromPinnedEmojisForReaction() {
+async function overwriteFromPinnedEmojisForReaction() {
const { canceled } = await os.confirm({
type: 'warning',
text: i18n.ts.overwriteContentConfirm,