SWREI/switched
0
0
Fork 0
Code

refactor(frontend): 非推奨の表現を改める (#14517)

Browse Source
This commit is contained in:
かっこかり 2024-09-15 12:31:17 +09:00 committed by GitHub
parent be0906a6c7
commit 1544ba9153
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/frontend/src/components/MkPostFormAttaches.vue
View File

@ -63,7 +63,7 @@ async function detachAndDeleteMedia(file: Misskey.entities.DriveFile) {
const { canceled } = await os.confirm({ const { canceled } = await os.confirm({
type: 'warning', type: 'warning',
text: i18n.t('driveFileDeleteConfirm', { name: file.name }), text: i18n.tsx.driveFileDeleteConfirm({ name: file.name }),
}); });
if (canceled) return; if (canceled) return;

61
packages/frontend/src/pages/settings/preferences-backups.vue
View File

@ -6,12 +6,12 @@ SPDX-License-Identifier: AGPL-3.0-only
<template> <template>
<div class="_gaps_m"> <div class="_gaps_m">
<div :class="$style.buttons"> <div :class="$style.buttons">
<MkButton inline primary @click="saveNew">{{ ts._preferencesBackups.saveNew }}</MkButton> <MkButton inline primary @click="saveNew">{{ i18n.ts._preferencesBackups.saveNew }}</MkButton>
<MkButton inline @click="loadFile">{{ ts._preferencesBackups.loadFile }}</MkButton> <MkButton inline @click="loadFile">{{ i18n.ts._preferencesBackups.loadFile }}</MkButton>
</div> </div>
<FormSection> <FormSection>
<template #label>{{ ts._preferencesBackups.list }}</template> <template #label>{{ i18n.ts._preferencesBackups.list }}</template>
<template v-if="profiles && Object.keys(profiles).length > 0"> <template v-if="profiles && Object.keys(profiles).length > 0">
<div class="_gaps_s"> <div class="_gaps_s">
<div <div
@ -23,13 +23,13 @@ SPDX-License-Identifier: AGPL-3.0-only
@contextmenu.prevent.stop="$event => menu($event, id)" @contextmenu.prevent.stop="$event => menu($event, id)"
> >
<div :class="$style.profileName">{{ profile.name }}</div> <div :class="$style.profileName">{{ profile.name }}</div>
<div :class="$style.profileTime">{{ t('_preferencesBackups.createdAt', { date: (new Date(profile.createdAt)).toLocaleDateString(), time: (new Date(profile.createdAt)).toLocaleTimeString() }) }}</div> <div :class="$style.profileTime">{{ i18n.tsx._preferencesBackups.createdAt({ date: (new Date(profile.createdAt)).toLocaleDateString(), time: (new Date(profile.createdAt)).toLocaleTimeString() }) }}</div>
<div v-if="profile.updatedAt" :class="$style.profileTime">{{ t('_preferencesBackups.updatedAt', { date: (new Date(profile.updatedAt)).toLocaleDateString(), time: (new Date(profile.updatedAt)).toLocaleTimeString() }) }}</div> <div v-if="profile.updatedAt" :class="$style.profileTime">{{ i18n.tsx._preferencesBackups.updatedAt({ date: (new Date(profile.updatedAt)).toLocaleDateString(), time: (new Date(profile.updatedAt)).toLocaleTimeString() }) }}</div>
</div> </div>
</div> </div>
</template> </template>
<div v-else-if="profiles"> <div v-else-if="profiles">
<MkInfo>{{ ts._preferencesBackups.noBackups }}</MkInfo> <MkInfo>{{ i18n.ts._preferencesBackups.noBackups }}</MkInfo>
</div> </div>
<MkLoading v-else/> <MkLoading v-else/>
</FormSection> </FormSection>
@ -52,7 +52,6 @@ import { i18n } from '@/i18n.js';
import { version, host } from '@@/js/config.js'; import { version, host } from '@@/js/config.js';
import { definePageMetadata } from '@/scripts/page-metadata.js'; import { definePageMetadata } from '@/scripts/page-metadata.js';
import { miLocalStorage } from '@/local-storage.js'; import { miLocalStorage } from '@/local-storage.js';
const { t, ts } = i18n;
const defaultStoreSaveKeys: (keyof typeof defaultStore['state'])[] = [ const defaultStoreSaveKeys: (keyof typeof defaultStore['state'])[] = [
'collapseRenotes', 'collapseRenotes',
@ -201,15 +200,15 @@ async function saveNew(): Promise<void> {
if (!profiles.value) return; if (!profiles.value) return;
const { canceled, result: name } = await os.inputText({ const { canceled, result: name } = await os.inputText({
title: ts._preferencesBackups.inputName, title: i18n.ts._preferencesBackups.inputName,
default: '', default: '',
}); });
if (canceled) return; if (canceled) return;
if (Object.values(profiles.value).some(x => x.name === name)) { if (Object.values(profiles.value).some(x => x.name === name)) {
return os.alert({ return os.alert({
title: ts._preferencesBackups.cannotSave, title: i18n.ts._preferencesBackups.cannotSave,
text: t('_preferencesBackups.nameAlreadyExists', { name }), text: i18n.tsx._preferencesBackups.nameAlreadyExists({ name }),
}); });
} }
@ -238,8 +237,8 @@ function loadFile(): void {
if (file.type !== 'application/json') { if (file.type !== 'application/json') {
return os.alert({ return os.alert({
type: 'error', type: 'error',
title: ts._preferencesBackups.cannotLoad, title: i18n.ts._preferencesBackups.cannotLoad,
text: ts._preferencesBackups.invalidFile, text: i18n.ts._preferencesBackups.invalidFile,
}); });
} }
@ -250,7 +249,7 @@ function loadFile(): void {
} catch (err) { } catch (err) {
return os.alert({ return os.alert({
type: 'error', type: 'error',
title: ts._preferencesBackups.cannotLoad, title: i18n.ts._preferencesBackups.cannotLoad,
text: (err as any)?.message ?? '', text: (err as any)?.message ?? '',
}); });
} }
@ -276,8 +275,8 @@ async function applyProfile(id: string): Promise<void> {
const { canceled: cancel1 } = await os.confirm({ const { canceled: cancel1 } = await os.confirm({
type: 'warning', type: 'warning',
title: ts._preferencesBackups.apply, title: i18n.ts._preferencesBackups.apply,
text: t('_preferencesBackups.applyConfirm', { name: profile.name }), text: i18n.tsx._preferencesBackups.applyConfirm({ name: profile.name }),
}); });
if (cancel1) return; if (cancel1) return;
@ -322,7 +321,7 @@ async function applyProfile(id: string): Promise<void> {
const { canceled: cancel2 } = await os.confirm({ const { canceled: cancel2 } = await os.confirm({
type: 'info', type: 'info',
text: ts.reloadToApplySetting, text: i18n.ts.reloadToApplySetting,
}); });
if (cancel2) return; if (cancel2) return;
@ -334,8 +333,8 @@ async function deleteProfile(id: string): Promise<void> {
const { canceled } = await os.confirm({ const { canceled } = await os.confirm({
type: 'info', type: 'info',
title: ts.delete, title: i18n.ts.delete,
text: t('deleteAreYouSure', { x: profiles.value[id].name }), text: i18n.tsx.deleteAreYouSure({ x: profiles.value[id].name }),
}); });
if (canceled) return; if (canceled) return;
@ -350,8 +349,8 @@ async function save(id: string): Promise<void> {
const { canceled } = await os.confirm({ const { canceled } = await os.confirm({
type: 'info', type: 'info',
title: ts._preferencesBackups.save, title: i18n.ts._preferencesBackups.save,
text: t('_preferencesBackups.saveConfirm', { name }), text: i18n.tsx._preferencesBackups.saveConfirm({ name }),
}); });
if (canceled) return; if (canceled) return;
@ -370,15 +369,15 @@ async function rename(id: string): Promise<void> {
if (!profiles.value) return; if (!profiles.value) return;
const { canceled: cancel1, result: name } = await os.inputText({ const { canceled: cancel1, result: name } = await os.inputText({
title: ts._preferencesBackups.inputName, title: i18n.ts._preferencesBackups.inputName,
default: '', default: '',
}); });
if (cancel1 || profiles.value[id].name === name) return; if (cancel1 || profiles.value[id].name === name) return;
if (Object.values(profiles.value).some(x => x.name === name)) { if (Object.values(profiles.value).some(x => x.name === name)) {
return os.alert({ return os.alert({
title: ts._preferencesBackups.cannotSave, title: i18n.ts._preferencesBackups.cannotSave,
text: t('_preferencesBackups.nameAlreadyExists', { name }), text: i18n.tsx._preferencesBackups.nameAlreadyExists({ name }),
}); });
} }
@ -386,8 +385,8 @@ async function rename(id: string): Promise<void> {
const { canceled: cancel2 } = await os.confirm({ const { canceled: cancel2 } = await os.confirm({
type: 'info', type: 'info',
title: ts.rename, title: i18n.ts.rename,
text: t('_preferencesBackups.renameConfirm', { old: registry.name, new: name }), text: i18n.tsx._preferencesBackups.renameConfirm({ old: registry.name, new: name }),
}); });
if (cancel2) return; if (cancel2) return;
@ -399,25 +398,25 @@ function menu(ev: MouseEvent, profileId: string) {
if (!profiles.value) return; if (!profiles.value) return;
return os.popupMenu([{ return os.popupMenu([{
text: ts._preferencesBackups.apply, text: i18n.ts._preferencesBackups.apply,
icon: 'ti ti-check', icon: 'ti ti-check',
action: () => applyProfile(profileId), action: () => applyProfile(profileId),
}, { }, {
type: 'a', type: 'a',
text: ts.download, text: i18n.ts.download,
icon: 'ti ti-download', icon: 'ti ti-download',
href: URL.createObjectURL(new Blob([JSON.stringify(profiles.value[profileId], null, 2)], { type: 'application/json' })), href: URL.createObjectURL(new Blob([JSON.stringify(profiles.value[profileId], null, 2)], { type: 'application/json' })),
download: `${profiles.value[profileId].name}.json`, download: `${profiles.value[profileId].name}.json`,
}, { type: 'divider' }, { }, { type: 'divider' }, {
text: ts.rename, text: i18n.ts.rename,
icon: 'ti ti-forms', icon: 'ti ti-forms',
action: () => rename(profileId), action: () => rename(profileId),
}, { }, {
text: ts._preferencesBackups.save, text: i18n.ts._preferencesBackups.save,
icon: 'ti ti-device-floppy', icon: 'ti ti-device-floppy',
action: () => save(profileId), action: () => save(profileId),
}, { type: 'divider' }, { }, { type: 'divider' }, {
text: ts.delete, text: i18n.ts.delete,
icon: 'ti ti-trash', icon: 'ti ti-trash',
action: () => deleteProfile(profileId), action: () => deleteProfile(profileId),
danger: true, danger: true,
@ -439,7 +438,7 @@ onUnmounted(() => {
}); });
definePageMetadata(() => ({ definePageMetadata(() => ({
title: ts.preferencesBackups, title: i18n.ts.preferencesBackups,
icon: 'ti ti-device-floppy', icon: 'ti ti-device-floppy',
})); }));
</script> </script>

4
packages/frontend/src/scripts/code-highlighter.ts
View File

@ -3,7 +3,7 @@
* SPDX-License-Identifier: AGPL-3.0-only * SPDX-License-Identifier: AGPL-3.0-only
*/ */
import { getHighlighterCore, loadWasm } from 'shiki/core'; import { createHighlighterCore, loadWasm } from 'shiki/core';
import darkPlus from 'shiki/themes/dark-plus.mjs'; import darkPlus from 'shiki/themes/dark-plus.mjs';
import { bundledThemesInfo } from 'shiki/themes'; import { bundledThemesInfo } from 'shiki/themes';
import { bundledLanguagesInfo } from 'shiki/langs'; import { bundledLanguagesInfo } from 'shiki/langs';
@ -69,7 +69,7 @@ async function initHighlighter() {
]); ]);
const jsLangInfo = bundledLanguagesInfo.find(t => t.id === 'javascript'); const jsLangInfo = bundledLanguagesInfo.find(t => t.id === 'javascript');
const highlighter = await getHighlighterCore({ const highlighter = await createHighlighterCore({
themes, themes,
langs: [ langs: [
...(jsLangInfo ? [async () => await jsLangInfo.import()] : []), ...(jsLangInfo ? [async () => await jsLangInfo.import()] : []),