mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-01 00:08:31 +09:00
Code

fix(frontend): 絵文字ピッカー設定ページのボタン文言修正 (#12676)

Browse Source 
* fix(frontend): 絵文字ピッカー設定ページのボタン文言修正

* fix
This commit is contained in:
おさむのひと 2023-12-16 13:23:54 +09:00 committed by GitHub
parent fda5147d06
commit d7d9304a49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
locales/index.d.ts vendored
View File

@ -128,8 +128,8 @@ export interface Locale {
"pinnedEmojisForReactionSettingDescription": string; "pinnedEmojisForReactionSettingDescription": string;
"pinnedEmojisSettingDescription": string; "pinnedEmojisSettingDescription": string;
"emojiPickerDisplay": string; "emojiPickerDisplay": string;
"copyFromPinnedEmojisForReaction": string; "overwriteFromPinnedEmojisForReaction": string;
"copyFromPinnedEmojis": string; "overwriteFromPinnedEmojis": string;
"reactionSettingDescription2": string; "reactionSettingDescription2": string;
"rememberNoteVisibility": string; "rememberNoteVisibility": string;
"attachCancel": string; "attachCancel": string;

4
locales/ja-JP.yml
View File

@ -125,8 +125,8 @@ emojiPicker: "絵文字ピッカー"
pinnedEmojisForReactionSettingDescription: "リアクション時にピン留め表示する絵文字を設定できます" pinnedEmojisForReactionSettingDescription: "リアクション時にピン留め表示する絵文字を設定できます"
pinnedEmojisSettingDescription: "絵文字入力時にピン留め表示する絵文字を設定できます" pinnedEmojisSettingDescription: "絵文字入力時にピン留め表示する絵文字を設定できます"
emojiPickerDisplay: "ピッカーの表示" emojiPickerDisplay: "ピッカーの表示"
copyFromPinnedEmojisForReaction: "リアクション設定からコピーする" overwriteFromPinnedEmojisForReaction: "リアクション設定から上書きする"
copyFromPinnedEmojis: "絵文字設定からコピーする" overwriteFromPinnedEmojis: "全般設定から上書きする"
reactionSettingDescription2: "ドラッグして並び替え、クリックして削除、＋を押して追加します。" reactionSettingDescription2: "ドラッグして並び替え、クリックして削除、＋を押して追加します。"
rememberNoteVisibility: "公開範囲を記憶する" rememberNoteVisibility: "公開範囲を記憶する"
attachCancel: "添付取り消し" attachCancel: "添付取り消し"

8
packages/frontend/src/pages/settings/emoji-picker.vue
View File

@ -40,7 +40,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div class="_buttons"> <div class="_buttons">
<MkButton inline @click="previewReaction"><i class="ti ti-eye"></i> {{ i18n.ts.preview }}</MkButton> <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="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>
</div> </div>
</MkFolder> </MkFolder>
@ -80,7 +80,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div class="_buttons"> <div class="_buttons">
<MkButton inline @click="previewEmoji"><i class="ti ti-eye"></i> {{ i18n.ts.preview }}</MkButton> <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="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>
</div> </div>
</MkFolder> </MkFolder>
@ -164,7 +164,7 @@ function previewEmoji(ev: MouseEvent) {
emojiPicker.show(getHTMLElement(ev)); emojiPicker.show(getHTMLElement(ev));
} }
async function copyFromPinnedEmojis() { async function overwriteFromPinnedEmojis() {
const { canceled } = await os.confirm({ const { canceled } = await os.confirm({
type: 'warning', type: 'warning',
text: i18n.ts.overwriteContentConfirm, text: i18n.ts.overwriteContentConfirm,
@ -177,7 +177,7 @@ async function copyFromPinnedEmojis() {
pinnedEmojisForReaction.value = [...pinnedEmojis.value]; pinnedEmojisForReaction.value = [...pinnedEmojis.value];
} }
async function copyFromPinnedEmojisForReaction() { async function overwriteFromPinnedEmojisForReaction() {
const { canceled } = await os.confirm({ const { canceled } = await os.confirm({
type: 'warning', type: 'warning',
text: i18n.ts.overwriteContentConfirm, text: i18n.ts.overwriteContentConfirm,