-
+
{{ channel.usersCount }}
@@ -14,7 +14,7 @@
-
+
{{ channel.notesCount }}
@@ -27,7 +27,7 @@
diff --git a/packages/client/src/components/chart-tooltip.vue b/packages/client/src/components/chart-tooltip.vue
new file mode 100644
index 0000000000..b080eaf2b4
--- /dev/null
+++ b/packages/client/src/components/chart-tooltip.vue
@@ -0,0 +1,51 @@
+
+
+
+
{{ title }}
+
+
+ {{ x.text }}
+
+
-
{{ i18n.locale.pageLoadError }}
-
{{ i18n.locale.pageLoadErrorDescription }}
-
{{ i18n.locale.serverIsDead }}
+
{{ i18n.ts.pageLoadError }}
+
{{ i18n.ts.pageLoadErrorDescription }}
+
{{ i18n.ts.serverIsDead }}
- {{ i18n.locale.newVersionOfClientAvailable }}
- {{ i18n.locale.youShouldUpgradeClient }}
- {{ i18n.locale.reload }}
+ {{ i18n.ts.newVersionOfClientAvailable }}
+ {{ i18n.ts.youShouldUpgradeClient }}
+ {{ i18n.ts.reload }}
-
{{ i18n.locale.troubleshooting }}
+
{{ i18n.ts.troubleshooting }}
ERROR: {{ error }}
@@ -54,7 +54,7 @@ function reload() {
defineExpose({
[symbols.PAGE_INFO]: {
- title: i18n.locale.error,
+ title: i18n.ts.error,
icon: 'fas fa-exclamation-triangle',
},
});
diff --git a/packages/client/src/pages/about-misskey.vue b/packages/client/src/pages/about-misskey.vue
index f887e29cc0..0ffb6b9e1d 100644
--- a/packages/client/src/pages/about-misskey.vue
+++ b/packages/client/src/pages/about-misskey.vue
@@ -10,7 +10,7 @@
@@ -194,7 +194,7 @@ onBeforeUnmount(() => {
defineExpose({
[symbols.PAGE_INFO]: {
- title: i18n.locale.aboutMisskey,
+ title: i18n.ts.aboutMisskey,
icon: null,
bg: 'var(--bg)',
},
diff --git a/packages/client/src/pages/about.vue b/packages/client/src/pages/about.vue
index a5984c548d..d5bab4baf8 100644
--- a/packages/client/src/pages/about.vue
+++ b/packages/client/src/pages/about.vue
@@ -90,7 +90,7 @@ const initStats = () => os.api('stats', {
defineExpose({
[symbols.PAGE_INFO]: {
- title: i18n.locale.instanceInfo,
+ title: i18n.ts.instanceInfo,
icon: 'fas fa-info-circle',
bg: 'var(--bg)',
},
diff --git a/packages/client/src/pages/admin/emojis.vue b/packages/client/src/pages/admin/emojis.vue
index 5b1dfe565a..a080ee9c23 100644
--- a/packages/client/src/pages/admin/emojis.vue
+++ b/packages/client/src/pages/admin/emojis.vue
@@ -118,7 +118,7 @@ const toggleSelect = (emoji) => {
};
const add = async (ev: MouseEvent) => {
- const files = await selectFiles(ev.currentTarget || ev.target, null);
+ const files = await selectFiles(ev.currentTarget ?? ev.target, null);
const promise = Promise.all(files.map(file => os.api('admin/emoji/add', {
fileId: file.id,
@@ -157,23 +157,23 @@ const remoteMenu = (emoji, ev: MouseEvent) => {
type: 'label',
text: ':' + emoji.name + ':',
}, {
- text: i18n.locale.import,
+ text: i18n.ts.import,
icon: 'fas fa-plus',
action: () => { im(emoji) }
- }], ev.currentTarget || ev.target);
+ }], ev.currentTarget ?? ev.target);
};
const menu = (ev: MouseEvent) => {
os.popupMenu([{
icon: 'fas fa-download',
- text: i18n.locale.export,
+ text: i18n.ts.export,
action: async () => {
os.api('export-custom-emojis', {
})
.then(() => {
os.alert({
type: 'info',
- text: i18n.locale.exportRequested,
+ text: i18n.ts.exportRequested,
});
}).catch((e) => {
os.alert({
@@ -184,16 +184,16 @@ const menu = (ev: MouseEvent) => {
}
}, {
icon: 'fas fa-upload',
- text: i18n.locale.import,
+ text: i18n.ts.import,
action: async () => {
- const file = await selectFile(ev.currentTarget || ev.target);
+ const file = await selectFile(ev.currentTarget ?? ev.target);
os.api('admin/emoji/import-zip', {
fileId: file.id,
})
.then(() => {
os.alert({
type: 'info',
- text: i18n.locale.importRequested,
+ text: i18n.ts.importRequested,
});
}).catch((e) => {
os.alert({
@@ -202,7 +202,7 @@ const menu = (ev: MouseEvent) => {
});
});
}
- }], ev.currentTarget || ev.target);
+ }], ev.currentTarget ?? ev.target);
};
const setCategoryBulk = async () => {
@@ -256,7 +256,7 @@ const setTagBulk = async () => {
const delBulk = async () => {
const { canceled } = await os.confirm({
type: 'warning',
- text: i18n.locale.deleteConfirm,
+ text: i18n.ts.deleteConfirm,
});
if (canceled) return;
await os.apiWithDialog('admin/emoji/delete-bulk', {
@@ -267,13 +267,13 @@ const delBulk = async () => {
defineExpose({
[symbols.PAGE_INFO]: computed(() => ({
- title: i18n.locale.customEmojis,
+ title: i18n.ts.customEmojis,
icon: 'fas fa-laugh',
bg: 'var(--bg)',
actions: [{
asFullButton: true,
icon: 'fas fa-plus',
- text: i18n.locale.addEmoji,
+ text: i18n.ts.addEmoji,
handler: add,
}, {
icon: 'fas fa-ellipsis-h',
@@ -281,11 +281,11 @@ defineExpose({
}],
tabs: [{
active: tab.value === 'local',
- title: i18n.locale.local,
+ title: i18n.ts.local,
onClick: () => { tab.value = 'local'; },
}, {
active: tab.value === 'remote',
- title: i18n.locale.remote,
+ title: i18n.ts.remote,
onClick: () => { tab.value = 'remote'; },
},]
})),
diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue
index 350e7defc6..6b11650f48 100644
--- a/packages/client/src/pages/admin/index.vue
+++ b/packages/client/src/pages/admin/index.vue
@@ -55,7 +55,7 @@ export default defineComponent({
setup(props, context) {
const indexInfo = {
- title: i18n.locale.controlPanel,
+ title: i18n.ts.controlPanel,
icon: 'fas fa-cog',
bg: 'var(--bg)',
hideHeader: true,
@@ -91,119 +91,119 @@ export default defineComponent({
});
const menuDef = computed(() => [{
- title: i18n.locale.quickAction,
+ title: i18n.ts.quickAction,
items: [{
type: 'button',
icon: 'fas fa-search',
- text: i18n.locale.lookup,
+ text: i18n.ts.lookup,
action: lookup,
}, ...(instance.disableRegistration ? [{
type: 'button',
icon: 'fas fa-user',
- text: i18n.locale.invite,
+ text: i18n.ts.invite,
action: invite,
}] : [])],
}, {
- title: i18n.locale.administration,
+ title: i18n.ts.administration,
items: [{
icon: 'fas fa-tachometer-alt',
- text: i18n.locale.dashboard,
+ text: i18n.ts.dashboard,
to: '/admin/overview',
active: page.value === 'overview',
}, {
icon: 'fas fa-users',
- text: i18n.locale.users,
+ text: i18n.ts.users,
to: '/admin/users',
active: page.value === 'users',
}, {
icon: 'fas fa-laugh',
- text: i18n.locale.customEmojis,
+ text: i18n.ts.customEmojis,
to: '/admin/emojis',
active: page.value === 'emojis',
}, {
icon: 'fas fa-globe',
- text: i18n.locale.federation,
+ text: i18n.ts.federation,
to: '/admin/federation',
active: page.value === 'federation',
}, {
icon: 'fas fa-clipboard-list',
- text: i18n.locale.jobQueue,
+ text: i18n.ts.jobQueue,
to: '/admin/queue',
active: page.value === 'queue',
}, {
icon: 'fas fa-cloud',
- text: i18n.locale.files,
+ text: i18n.ts.files,
to: '/admin/files',
active: page.value === 'files',
}, {
icon: 'fas fa-broadcast-tower',
- text: i18n.locale.announcements,
+ text: i18n.ts.announcements,
to: '/admin/announcements',
active: page.value === 'announcements',
}, {
icon: 'fas fa-audio-description',
- text: i18n.locale.ads,
+ text: i18n.ts.ads,
to: '/admin/ads',
active: page.value === 'ads',
}, {
icon: 'fas fa-exclamation-circle',
- text: i18n.locale.abuseReports,
+ text: i18n.ts.abuseReports,
to: '/admin/abuses',
active: page.value === 'abuses',
}],
}, {
- title: i18n.locale.settings,
+ title: i18n.ts.settings,
items: [{
icon: 'fas fa-cog',
- text: i18n.locale.general,
+ text: i18n.ts.general,
to: '/admin/settings',
active: page.value === 'settings',
}, {
icon: 'fas fa-envelope',
- text: i18n.locale.emailServer,
+ text: i18n.ts.emailServer,
to: '/admin/email-settings',
active: page.value === 'email-settings',
}, {
icon: 'fas fa-cloud',
- text: i18n.locale.objectStorage,
+ text: i18n.ts.objectStorage,
to: '/admin/object-storage',
active: page.value === 'object-storage',
}, {
icon: 'fas fa-lock',
- text: i18n.locale.security,
+ text: i18n.ts.security,
to: '/admin/security',
active: page.value === 'security',
}, {
icon: 'fas fa-globe',
- text: i18n.locale.relays,
+ text: i18n.ts.relays,
to: '/admin/relays',
active: page.value === 'relays',
}, {
icon: 'fas fa-share-alt',
- text: i18n.locale.integration,
+ text: i18n.ts.integration,
to: '/admin/integrations',
active: page.value === 'integrations',
}, {
icon: 'fas fa-ban',
- text: i18n.locale.instanceBlocking,
+ text: i18n.ts.instanceBlocking,
to: '/admin/instance-block',
active: page.value === 'instance-block',
}, {
icon: 'fas fa-ghost',
- text: i18n.locale.proxyAccount,
+ text: i18n.ts.proxyAccount,
to: '/admin/proxy-account',
active: page.value === 'proxy-account',
}, {
icon: 'fas fa-cogs',
- text: i18n.locale.other,
+ text: i18n.ts.other,
to: '/admin/other-settings',
active: page.value === 'other-settings',
}],
}, {
- title: i18n.locale.info,
+ title: i18n.ts.info,
items: [{
icon: 'fas fa-database',
- text: i18n.locale.database,
+ text: i18n.ts.database,
to: '/admin/database',
active: page.value === 'database',
}],
@@ -275,37 +275,37 @@ export default defineComponent({
const lookup = (ev) => {
os.popupMenu([{
- text: i18n.locale.user,
+ text: i18n.ts.user,
icon: 'fas fa-user',
action: () => {
lookupUser();
}
}, {
- text: i18n.locale.note,
+ text: i18n.ts.note,
icon: 'fas fa-pencil-alt',
action: () => {
alert('TODO');
}
}, {
- text: i18n.locale.file,
+ text: i18n.ts.file,
icon: 'fas fa-cloud',
action: () => {
alert('TODO');
}
}, {
- text: i18n.locale.instance,
+ text: i18n.ts.instance,
icon: 'fas fa-globe',
action: () => {
alert('TODO');
}
- }], ev.currentTarget || ev.target);
+ }], ev.currentTarget ?? ev.target);
};
return {
[symbols.PAGE_INFO]: INFO,
menuDef,
header: {
- title: i18n.locale.controlPanel,
+ title: i18n.ts.controlPanel,
},
noMaintainerInformation,
noBotProtection,
diff --git a/packages/client/src/pages/channel-editor.vue b/packages/client/src/pages/channel-editor.vue
index 58c644be62..3818c7481a 100644
--- a/packages/client/src/pages/channel-editor.vue
+++ b/packages/client/src/pages/channel-editor.vue
@@ -112,7 +112,7 @@ export default defineComponent({
},
setBannerImage(e) {
- selectFile(e.currentTarget || e.target, null).then(file => {
+ selectFile(e.currentTarget ?? e.target, null).then(file => {
this.bannerId = file.id;
});
},
diff --git a/packages/client/src/pages/clip.vue b/packages/client/src/pages/clip.vue
index 6b49221d32..c999f1bfc9 100644
--- a/packages/client/src/pages/clip.vue
+++ b/packages/client/src/pages/clip.vue
@@ -127,7 +127,7 @@ export default defineComponent({
clipId: this.clip.id,
});
}
- } : undefined], ev.currentTarget || ev.target);
+ } : undefined], ev.currentTarget ?? ev.target);
}
}
});
diff --git a/packages/client/src/pages/drive.vue b/packages/client/src/pages/drive.vue
index 1e17bea0cc..68777bb083 100644
--- a/packages/client/src/pages/drive.vue
+++ b/packages/client/src/pages/drive.vue
@@ -15,7 +15,7 @@ let folder = $ref(null);
defineExpose({
[symbols.PAGE_INFO]: computed(() => ({
- title: folder ? folder.name : i18n.locale.drive,
+ title: folder ? folder.name : i18n.ts.drive,
icon: 'fas fa-cloud',
bg: 'var(--bg)',
hideHeader: true,
diff --git a/packages/client/src/pages/emojis.emoji.vue b/packages/client/src/pages/emojis.emoji.vue
index 83539ce7a3..b2801694db 100644
--- a/packages/client/src/pages/emojis.emoji.vue
+++ b/packages/client/src/pages/emojis.emoji.vue
@@ -23,13 +23,13 @@ function menu(ev) {
type: 'label',
text: ':' + props.emoji.name + ':',
}, {
- text: i18n.locale.copy,
+ text: i18n.ts.copy,
icon: 'fas fa-copy',
action: () => {
copyToClipboard(`:${props.emoji.name}:`);
os.success();
}
- }], ev.currentTarget || ev.target);
+ }], ev.currentTarget ?? ev.target);
}
diff --git a/packages/client/src/pages/emojis.vue b/packages/client/src/pages/emojis.vue
index 6577f5abd9..886b5f7119 100644
--- a/packages/client/src/pages/emojis.vue
+++ b/packages/client/src/pages/emojis.vue
@@ -16,14 +16,14 @@ const tab = ref('category');
function menu(ev) {
os.popupMenu([{
icon: 'fas fa-download',
- text: i18n.locale.export,
+ text: i18n.ts.export,
action: async () => {
os.api('export-custom-emojis', {
})
.then(() => {
os.alert({
type: 'info',
- text: i18n.locale.exportRequested,
+ text: i18n.ts.exportRequested,
});
}).catch((e) => {
os.alert({
@@ -32,12 +32,12 @@ function menu(ev) {
});
});
}
- }], ev.currentTarget || ev.target);
+ }], ev.currentTarget ?? ev.target);
}
defineExpose({
[symbols.PAGE_INFO]: {
- title: i18n.locale.customEmojis,
+ title: i18n.ts.customEmojis,
icon: 'fas fa-laugh',
bg: 'var(--bg)',
actions: [{
diff --git a/packages/client/src/pages/favorites.vue b/packages/client/src/pages/favorites.vue
index 8965b30d60..b4f6ff35bc 100644
--- a/packages/client/src/pages/favorites.vue
+++ b/packages/client/src/pages/favorites.vue
@@ -34,7 +34,7 @@ const pagingComponent = ref
>();
defineExpose({
[symbols.PAGE_INFO]: {
- title: i18n.locale.favorites,
+ title: i18n.ts.favorites,
icon: 'fas fa-star',
bg: 'var(--bg)',
},
diff --git a/packages/client/src/pages/featured.vue b/packages/client/src/pages/featured.vue
index 725c70f0f7..14fe0cb740 100644
--- a/packages/client/src/pages/featured.vue
+++ b/packages/client/src/pages/featured.vue
@@ -17,7 +17,7 @@ const pagination = {
defineExpose({
[symbols.PAGE_INFO]: {
- title: i18n.locale.featured,
+ title: i18n.ts.featured,
icon: 'fas fa-fire-alt',
bg: 'var(--bg)',
},
diff --git a/packages/client/src/pages/federation.vue b/packages/client/src/pages/federation.vue
index 6a4a28b6b4..3c5050cdb8 100644
--- a/packages/client/src/pages/federation.vue
+++ b/packages/client/src/pages/federation.vue
@@ -115,7 +115,7 @@ const pagination = {
offsetMode: true,
params: computed(() => ({
sort: sort,
- host: host != '' ? host : null,
+ host: host !== '' ? host : null,
...(
state === 'federating' ? { federating: true } :
state === 'subscribing' ? { subscribing: true } :
@@ -135,7 +135,7 @@ function getStatus(instance) {
defineExpose({
[symbols.PAGE_INFO]: {
- title: i18n.locale.federation,
+ title: i18n.ts.federation,
icon: 'fas fa-globe',
bg: 'var(--bg)',
},
@@ -157,11 +157,10 @@ defineExpose({
> .instance {
padding: 16px;
- border: solid 1px var(--divider);
- border-radius: 6px;
+ background: var(--panel);
+ border-radius: 8px;
&:hover {
- border: solid 1px var(--accent);
text-decoration: none;
}
diff --git a/packages/client/src/pages/follow-requests.vue b/packages/client/src/pages/follow-requests.vue
index 764daa0d3e..6adc1a404b 100644
--- a/packages/client/src/pages/follow-requests.vue
+++ b/packages/client/src/pages/follow-requests.vue
@@ -60,7 +60,7 @@ function reject(user) {
defineExpose({
[symbols.PAGE_INFO]: computed(() => ({
- title: i18n.locale.followRequests,
+ title: i18n.ts.followRequests,
icon: 'fas fa-user-clock',
bg: 'var(--bg)',
})),
diff --git a/packages/client/src/pages/gallery/edit.vue b/packages/client/src/pages/gallery/edit.vue
index e3fa1a0fcd..25ee513186 100644
--- a/packages/client/src/pages/gallery/edit.vue
+++ b/packages/client/src/pages/gallery/edit.vue
@@ -92,7 +92,7 @@ export default defineComponent({
methods: {
selectFile(e) {
- selectFiles(e.currentTarget || e.target, null).then(files => {
+ selectFiles(e.currentTarget ?? e.target, null).then(files => {
this.files = this.files.concat(files);
});
},
diff --git a/packages/client/src/pages/instance-info.vue b/packages/client/src/pages/instance-info.vue
index fa36db0659..f19cb9d1a2 100644
--- a/packages/client/src/pages/instance-info.vue
+++ b/packages/client/src/pages/instance-info.vue
@@ -29,6 +29,7 @@
Moderation
{{ $ts.stopActivityDelivery }}
{{ $ts.blockThisInstance }}
+ Refresh metadata
@@ -111,6 +112,7 @@ import MkChart from '@/components/chart.vue';
import MkObjectView from '@/components/object-view.vue';
import FormLink from '@/components/form/link.vue';
import MkLink from '@/components/link.vue';
+import MkButton from '@/components/ui/button.vue';
import FormSection from '@/components/form/section.vue';
import MkKeyValue from '@/components/key-value.vue';
import MkSelect from '@/components/form/select.vue';
@@ -155,6 +157,15 @@ async function toggleSuspend(v) {
});
}
+function refreshMetadata() {
+ os.api('admin/federation/refresh-remote-instance-metadata', {
+ host: instance.host,
+ });
+ os.alert({
+ text: 'Refresh requested',
+ });
+}
+
fetch();
defineExpose({
diff --git a/packages/client/src/pages/mentions.vue b/packages/client/src/pages/mentions.vue
index bda56fc729..9b57c956bf 100644
--- a/packages/client/src/pages/mentions.vue
+++ b/packages/client/src/pages/mentions.vue
@@ -16,7 +16,7 @@ const pagination = {
defineExpose({
[symbols.PAGE_INFO]: {
- title: i18n.locale.mentions,
+ title: i18n.ts.mentions,
icon: 'fas fa-at',
bg: 'var(--bg)',
},
diff --git a/packages/client/src/pages/messages.vue b/packages/client/src/pages/messages.vue
index 8efdc55586..9c5fb9b341 100644
--- a/packages/client/src/pages/messages.vue
+++ b/packages/client/src/pages/messages.vue
@@ -12,14 +12,14 @@ import { i18n } from '@/i18n';
const pagination = {
endpoint: 'notes/mentions' as const,
limit: 10,
- params: () => ({
+ params: {
visibility: 'specified'
- }),
+ },
};
defineExpose({
[symbols.PAGE_INFO]: {
- title: i18n.locale.directNotes,
+ title: i18n.ts.directNotes,
icon: 'fas fa-envelope',
bg: 'var(--bg)',
},
diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index 554ebc4b6b..88a1e07afc 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -128,7 +128,7 @@ export default defineComponent({
text: this.$ts.messagingWithGroup,
icon: 'fas fa-users',
action: () => { this.startGroup() }
- }], ev.currentTarget || ev.target);
+ }], ev.currentTarget ?? ev.target);
},
async startUser() {
diff --git a/packages/client/src/pages/messaging/messaging-room.form.vue b/packages/client/src/pages/messaging/messaging-room.form.vue
index 1b9421ca9a..3863c8f82b 100644
--- a/packages/client/src/pages/messaging/messaging-room.form.vue
+++ b/packages/client/src/pages/messaging/messaging-room.form.vue
@@ -154,7 +154,7 @@ export default defineComponent({
},
chooseFile(e) {
- selectFile(e.currentTarget || e.target, this.$ts.selectFile).then(file => {
+ selectFile(e.currentTarget ?? e.target, this.$ts.selectFile).then(file => {
this.file = file;
});
},
@@ -214,7 +214,7 @@ export default defineComponent({
},
async insertEmoji(ev) {
- os.openEmojiPicker(ev.currentTarget || ev.target, {}, this.$refs.text);
+ os.openEmojiPicker(ev.currentTarget ?? ev.target, {}, this.$refs.text);
}
}
});
diff --git a/packages/client/src/pages/messaging/messaging-room.vue b/packages/client/src/pages/messaging/messaging-room.vue
index 65c44ce113..2ecc68eb54 100644
--- a/packages/client/src/pages/messaging/messaging-room.vue
+++ b/packages/client/src/pages/messaging/messaging-room.vue
@@ -335,7 +335,7 @@ const Component = defineComponent({
popout(path);
this.$router.back();
},
- }], ev.currentTarget || ev.target);
+ }], ev.currentTarget ?? ev.target);
}
}
});
diff --git a/packages/client/src/pages/my-antennas/create.vue b/packages/client/src/pages/my-antennas/create.vue
index 427c9935c3..a08bece731 100644
--- a/packages/client/src/pages/my-antennas/create.vue
+++ b/packages/client/src/pages/my-antennas/create.vue
@@ -31,7 +31,7 @@ function onAntennaCreated() {
defineExpose({
[symbols.PAGE_INFO]: {
- title: i18n.locale.manageAntennas,
+ title: i18n.ts.manageAntennas,
icon: 'fas fa-satellite',
bg: 'var(--bg)',
},
diff --git a/packages/client/src/pages/my-clips/index.vue b/packages/client/src/pages/my-clips/index.vue
index 97b563f6f8..e287357a42 100644
--- a/packages/client/src/pages/my-clips/index.vue
+++ b/packages/client/src/pages/my-clips/index.vue
@@ -19,7 +19,7 @@ import MkPagination from '@/components/ui/pagination.vue';
import MkButton from '@/components/ui/button.vue';
import * as os from '@/os';
import * as symbols from '@/symbols';
-import i18n from '@/components/global/i18n';
+import { i18n } from '@/i18n';
const pagination = {
endpoint: 'clips/list' as const,
@@ -29,20 +29,20 @@ const pagination = {
const pagingComponent = $ref>();
async function create() {
- const { canceled, result } = await os.form(i18n.locale.createNewClip, {
+ const { canceled, result } = await os.form(i18n.ts.createNewClip, {
name: {
type: 'string',
- label: i18n.locale.name,
+ label: i18n.ts.name,
},
description: {
type: 'string',
required: false,
multiline: true,
- label: i18n.locale.description,
+ label: i18n.ts.description,
},
isPublic: {
type: 'boolean',
- label: i18n.locale.public,
+ label: i18n.ts.public,
default: false,
},
});
@@ -63,7 +63,7 @@ function onClipDeleted() {
defineExpose({
[symbols.PAGE_INFO]: {
- title: i18n.locale.clip,
+ title: i18n.ts.clip,
icon: 'fas fa-paperclip',
bg: 'var(--bg)',
action: {
diff --git a/packages/client/src/pages/my-lists/index.vue b/packages/client/src/pages/my-lists/index.vue
index e6fcba1b34..9ed9e2960e 100644
--- a/packages/client/src/pages/my-lists/index.vue
+++ b/packages/client/src/pages/my-lists/index.vue
@@ -31,7 +31,7 @@ const pagination = {
async function create() {
const { canceled, result: name } = await os.inputText({
- title: i18n.locale.enterListName,
+ title: i18n.ts.enterListName,
});
if (canceled) return;
await os.apiWithDialog('users/lists/create', { name: name });
@@ -40,7 +40,7 @@ async function create() {
defineExpose({
[symbols.PAGE_INFO]: {
- title: i18n.locale.manageLists,
+ title: i18n.ts.manageLists,
icon: 'fas fa-list-ul',
bg: 'var(--bg)',
action: {
diff --git a/packages/client/src/pages/not-found.vue b/packages/client/src/pages/not-found.vue
index 914fdb9297..cdeb54b88b 100644
--- a/packages/client/src/pages/not-found.vue
+++ b/packages/client/src/pages/not-found.vue
@@ -13,7 +13,7 @@ import { i18n } from '@/i18n';
defineExpose({
[symbols.PAGE_INFO]: {
- title: i18n.locale.notFound,
+ title: i18n.ts.notFound,
icon: 'fas fa-exclamation-triangle',
bg: 'var(--bg)',
},
diff --git a/packages/client/src/pages/notifications.vue b/packages/client/src/pages/notifications.vue
index 090e80f99a..36e423e534 100644
--- a/packages/client/src/pages/notifications.vue
+++ b/packages/client/src/pages/notifications.vue
@@ -27,26 +27,26 @@ function setFilter(ev) {
}));
const items = includeTypes != null ? [{
icon: 'fas fa-times',
- text: i18n.locale.clear,
+ text: i18n.ts.clear,
action: () => {
includeTypes = null;
}
}, null, ...typeItems] : typeItems;
- os.popupMenu(items, ev.currentTarget || ev.target);
+ os.popupMenu(items, ev.currentTarget ?? ev.target);
}
defineExpose({
[symbols.PAGE_INFO]: computed(() => ({
- title: i18n.locale.notifications,
+ title: i18n.ts.notifications,
icon: 'fas fa-bell',
bg: 'var(--bg)',
actions: [{
- text: i18n.locale.filter,
+ text: i18n.ts.filter,
icon: 'fas fa-filter',
highlighted: includeTypes != null,
handler: setFilter,
}, {
- text: i18n.locale.markAllAsRead,
+ text: i18n.ts.markAllAsRead,
icon: 'fas fa-check',
handler: () => {
os.apiWithDialog('notifications/mark-all-as-read');
@@ -54,11 +54,11 @@ defineExpose({
}],
tabs: [{
active: tab === 'all',
- title: i18n.locale.all,
+ title: i18n.ts.all,
onClick: () => { tab = 'all'; },
}, {
active: tab === 'unread',
- title: i18n.locale.unread,
+ title: i18n.ts.unread,
onClick: () => { tab = 'unread'; },
},]
})),
diff --git a/packages/client/src/pages/page-editor/page-editor.vue b/packages/client/src/pages/page-editor/page-editor.vue
index fe207555f8..f302ac4f90 100644
--- a/packages/client/src/pages/page-editor/page-editor.vue
+++ b/packages/client/src/pages/page-editor/page-editor.vue
@@ -448,7 +448,7 @@ export default defineComponent({
},
setEyeCatchingImage(e) {
- selectFile(e.currentTarget || e.target, null).then(file => {
+ selectFile(e.currentTarget ?? e.target, null).then(file => {
this.eyeCatchingImageId = file.id;
});
},
diff --git a/packages/client/src/pages/preview.vue b/packages/client/src/pages/preview.vue
index 8eb4549516..4accac4192 100644
--- a/packages/client/src/pages/preview.vue
+++ b/packages/client/src/pages/preview.vue
@@ -12,7 +12,7 @@ import { i18n } from '@/i18n';
defineExpose({
[symbols.PAGE_INFO]: computed(() => ({
- title: i18n.locale.preview,
+ title: i18n.ts.preview,
icon: 'fas fa-eye',
bg: 'var(--bg)',
})),
diff --git a/packages/client/src/pages/reset-password.vue b/packages/client/src/pages/reset-password.vue
index 8ef73858f6..7d008ae75c 100644
--- a/packages/client/src/pages/reset-password.vue
+++ b/packages/client/src/pages/reset-password.vue
@@ -3,10 +3,10 @@
- {{ i18n.locale.newPassword }}
+ {{ i18n.ts.newPassword }}
- {{ i18n.locale.save }}
+ {{ i18n.ts.save }}
@@ -43,7 +43,7 @@ onMounted(() => {
defineExpose({
[symbols.PAGE_INFO]: {
- title: i18n.locale.resetPassword,
+ title: i18n.ts.resetPassword,
icon: 'fas fa-lock',
bg: 'var(--bg)',
},
diff --git a/packages/client/src/pages/settings/accounts.vue b/packages/client/src/pages/settings/accounts.vue
index c795ede8ac..a744a031d4 100644
--- a/packages/client/src/pages/settings/accounts.vue
+++ b/packages/client/src/pages/settings/accounts.vue
@@ -64,7 +64,7 @@ export default defineComponent({
icon: 'fas fa-trash-alt',
danger: true,
action: () => this.removeAccount(account),
- }], ev.currentTarget || ev.target);
+ }], ev.currentTarget ?? ev.target);
},
addAccount(ev) {
@@ -74,7 +74,7 @@ export default defineComponent({
}, {
text: this.$ts.createAccount,
action: () => { this.createAccount(); },
- }], ev.currentTarget || ev.target);
+ }], ev.currentTarget ?? ev.target);
},
addExistingAccount() {
diff --git a/packages/client/src/pages/settings/drive.vue b/packages/client/src/pages/settings/drive.vue
index f1016ebd84..134fa63308 100644
--- a/packages/client/src/pages/settings/drive.vue
+++ b/packages/client/src/pages/settings/drive.vue
@@ -28,6 +28,7 @@
{{ uploadFolder ? uploadFolder.name : '-' }}
+ {{ $ts.keepOriginalUploading }}{{ $ts.keepOriginalUploadingDescription }}
@@ -36,18 +37,21 @@
import { defineComponent } from 'vue';
import * as tinycolor from 'tinycolor2';
import FormLink from '@/components/form/link.vue';
+import FormSwitch from '@/components/form/switch.vue';
import FormSection from '@/components/form/section.vue';
import MkKeyValue from '@/components/key-value.vue';
import FormSplit from '@/components/form/split.vue';
import * as os from '@/os';
import bytes from '@/filters/bytes';
import * as symbols from '@/symbols';
+import { defaultStore } from '@/store';
// TODO: render chart
export default defineComponent({
components: {
FormLink,
+ FormSwitch,
FormSection,
MkKeyValue,
FormSplit,
@@ -79,7 +83,8 @@ export default defineComponent({
l: 0.5
})
};
- }
+ },
+ keepOriginalUploading: defaultStore.makeGetterSetter('keepOriginalUploading'),
},
async created() {
diff --git a/packages/client/src/pages/settings/email.vue b/packages/client/src/pages/settings/email.vue
index 54557f8773..4697fec9b7 100644
--- a/packages/client/src/pages/settings/email.vue
+++ b/packages/client/src/pages/settings/email.vue
@@ -62,7 +62,7 @@ export default defineComponent({
const emailAddress = ref($i.email);
const INFO = {
- title: i18n.locale.email,
+ title: i18n.ts.email,
icon: 'fas fa-envelope',
bg: 'var(--bg)',
};
@@ -75,7 +75,7 @@ export default defineComponent({
const saveEmailAddress = () => {
os.inputText({
- title: i18n.locale.password,
+ title: i18n.ts.password,
type: 'password'
}).then(({ canceled, result: password }) => {
if (canceled) return;
diff --git a/packages/client/src/pages/settings/import-export.vue b/packages/client/src/pages/settings/import-export.vue
index 21031c559e..c153b4d28c 100644
--- a/packages/client/src/pages/settings/import-export.vue
+++ b/packages/client/src/pages/settings/import-export.vue
@@ -60,7 +60,7 @@ export default defineComponent({
setup(props, context) {
const INFO = {
- title: i18n.locale.importAndExport,
+ title: i18n.ts.importAndExport,
icon: 'fas fa-boxes',
bg: 'var(--bg)',
};
@@ -71,14 +71,14 @@ export default defineComponent({
const onExportSuccess = () => {
os.alert({
type: 'info',
- text: i18n.locale.exportRequested,
+ text: i18n.ts.exportRequested,
});
};
const onImportSuccess = () => {
os.alert({
type: 'info',
- text: i18n.locale.importRequested,
+ text: i18n.ts.importRequested,
});
};
@@ -114,22 +114,22 @@ export default defineComponent({
};
const importFollowing = async (ev) => {
- const file = await selectFile(ev.currentTarget || ev.target);
+ const file = await selectFile(ev.currentTarget ?? ev.target);
os.api('i/import-following', { fileId: file.id }).then(onImportSuccess).catch(onError);
};
const importUserLists = async (ev) => {
- const file = await selectFile(ev.currentTarget || ev.target);
+ const file = await selectFile(ev.currentTarget ?? ev.target);
os.api('i/import-user-lists', { fileId: file.id }).then(onImportSuccess).catch(onError);
};
const importMuting = async (ev) => {
- const file = await selectFile(ev.currentTarget || ev.target);
+ const file = await selectFile(ev.currentTarget ?? ev.target);
os.api('i/import-muting', { fileId: file.id }).then(onImportSuccess).catch(onError);
};
const importBlocking = async (ev) => {
- const file = await selectFile(ev.currentTarget || ev.target);
+ const file = await selectFile(ev.currentTarget ?? ev.target);
os.api('i/import-blocking', { fileId: file.id }).then(onImportSuccess).catch(onError);
};
diff --git a/packages/client/src/pages/settings/index.vue b/packages/client/src/pages/settings/index.vue
index 66c8b147bb..ac8414ddbc 100644
--- a/packages/client/src/pages/settings/index.vue
+++ b/packages/client/src/pages/settings/index.vue
@@ -49,7 +49,7 @@ export default defineComponent({
setup(props, context) {
const indexInfo = {
- title: i18n.locale.settings,
+ title: i18n.ts.settings,
icon: 'fas fa-cog',
bg: 'var(--bg)',
hideHeader: true,
@@ -61,96 +61,96 @@ export default defineComponent({
const el = ref(null);
const childInfo = ref(null);
const menuDef = computed(() => [{
- title: i18n.locale.basicSettings,
+ title: i18n.ts.basicSettings,
items: [{
icon: 'fas fa-user',
- text: i18n.locale.profile,
+ text: i18n.ts.profile,
to: '/settings/profile',
active: page.value === 'profile',
}, {
icon: 'fas fa-lock-open',
- text: i18n.locale.privacy,
+ text: i18n.ts.privacy,
to: '/settings/privacy',
active: page.value === 'privacy',
}, {
icon: 'fas fa-laugh',
- text: i18n.locale.reaction,
+ text: i18n.ts.reaction,
to: '/settings/reaction',
active: page.value === 'reaction',
}, {
icon: 'fas fa-cloud',
- text: i18n.locale.drive,
+ text: i18n.ts.drive,
to: '/settings/drive',
active: page.value === 'drive',
}, {
icon: 'fas fa-bell',
- text: i18n.locale.notifications,
+ text: i18n.ts.notifications,
to: '/settings/notifications',
active: page.value === 'notifications',
}, {
icon: 'fas fa-envelope',
- text: i18n.locale.email,
+ text: i18n.ts.email,
to: '/settings/email',
active: page.value === 'email',
}, {
icon: 'fas fa-share-alt',
- text: i18n.locale.integration,
+ text: i18n.ts.integration,
to: '/settings/integration',
active: page.value === 'integration',
}, {
icon: 'fas fa-lock',
- text: i18n.locale.security,
+ text: i18n.ts.security,
to: '/settings/security',
active: page.value === 'security',
}],
}, {
- title: i18n.locale.clientSettings,
+ title: i18n.ts.clientSettings,
items: [{
icon: 'fas fa-cogs',
- text: i18n.locale.general,
+ text: i18n.ts.general,
to: '/settings/general',
active: page.value === 'general',
}, {
icon: 'fas fa-palette',
- text: i18n.locale.theme,
+ text: i18n.ts.theme,
to: '/settings/theme',
active: page.value === 'theme',
}, {
icon: 'fas fa-list-ul',
- text: i18n.locale.menu,
+ text: i18n.ts.menu,
to: '/settings/menu',
active: page.value === 'menu',
}, {
icon: 'fas fa-music',
- text: i18n.locale.sounds,
+ text: i18n.ts.sounds,
to: '/settings/sounds',
active: page.value === 'sounds',
}, {
icon: 'fas fa-plug',
- text: i18n.locale.plugins,
+ text: i18n.ts.plugins,
to: '/settings/plugin',
active: page.value === 'plugin',
}],
}, {
- title: i18n.locale.otherSettings,
+ title: i18n.ts.otherSettings,
items: [{
icon: 'fas fa-boxes',
- text: i18n.locale.importAndExport,
+ text: i18n.ts.importAndExport,
to: '/settings/import-export',
active: page.value === 'import-export',
}, {
icon: 'fas fa-volume-mute',
- text: i18n.locale.instanceMute,
+ text: i18n.ts.instanceMute,
to: '/settings/instance-mute',
active: page.value === 'instance-mute',
}, {
icon: 'fas fa-ban',
- text: i18n.locale.muteAndBlock,
+ text: i18n.ts.muteAndBlock,
to: '/settings/mute-block',
active: page.value === 'mute-block',
}, {
icon: 'fas fa-comment-slash',
- text: i18n.locale.wordMute,
+ text: i18n.ts.wordMute,
to: '/settings/word-mute',
active: page.value === 'word-mute',
}, {
@@ -160,7 +160,7 @@ export default defineComponent({
active: page.value === 'api',
}, {
icon: 'fas fa-ellipsis-h',
- text: i18n.locale.other,
+ text: i18n.ts.other,
to: '/settings/other',
active: page.value === 'other',
}],
@@ -168,7 +168,7 @@ export default defineComponent({
items: [{
type: 'button',
icon: 'fas fa-trash',
- text: i18n.locale.clearCache,
+ text: i18n.ts.clearCache,
action: () => {
localStorage.removeItem('locale');
localStorage.removeItem('theme');
@@ -177,7 +177,7 @@ export default defineComponent({
}, {
type: 'button',
icon: 'fas fa-sign-in-alt fa-flip-horizontal',
- text: i18n.locale.logout,
+ text: i18n.ts.logout,
action: () => {
signout();
},
diff --git a/packages/client/src/pages/settings/mute-block.vue b/packages/client/src/pages/settings/mute-block.vue
index f4f9ebf8dd..28d11809e3 100644
--- a/packages/client/src/pages/settings/mute-block.vue
+++ b/packages/client/src/pages/settings/mute-block.vue
@@ -52,7 +52,7 @@ const blockingPagination = {
defineExpose({
[symbols.PAGE_INFO]: {
- title: i18n.locale.muteAndBlock,
+ title: i18n.ts.muteAndBlock,
icon: 'fas fa-ban',
bg: 'var(--bg)',
},
diff --git a/packages/client/src/pages/settings/privacy.vue b/packages/client/src/pages/settings/privacy.vue
index dd13ba4bd0..cfae7e9ca8 100644
--- a/packages/client/src/pages/settings/privacy.vue
+++ b/packages/client/src/pages/settings/privacy.vue
@@ -86,7 +86,7 @@ function save() {
defineExpose({
[symbols.PAGE_INFO]: {
- title: i18n.locale.privacy,
+ title: i18n.ts.privacy,
icon: 'fas fa-lock-open',
bg: 'var(--bg)',
},
diff --git a/packages/client/src/pages/settings/profile.vue b/packages/client/src/pages/settings/profile.vue
index f875146a2c..66b654d87f 100644
--- a/packages/client/src/pages/settings/profile.vue
+++ b/packages/client/src/pages/settings/profile.vue
@@ -3,45 +3,45 @@