diff --git a/CALCKEY.md b/CALCKEY.md index 8f64109e71..c2925d4c8f 100644 --- a/CALCKEY.md +++ b/CALCKEY.md @@ -84,6 +84,7 @@ - Phosphor icons instead of FontAwesome - Fully deprecate MkEmojiPickerWindow in favor of MkEmojiPickerDialog - Link hover effect +- Replace all `$ts` with i18n - Obliteration of Ai-chan - [Make showing ads optional](https://github.com/misskey-dev/misskey/pull/8996) - [Tapping avatar in mobile opens account modal](https://github.com/misskey-dev/misskey/pull/9056) diff --git a/packages/client/src/components/MkContainer.vue b/packages/client/src/components/MkContainer.vue index dbb028f48d..03a2b40ce6 100644 --- a/packages/client/src/components/MkContainer.vue +++ b/packages/client/src/components/MkContainer.vue @@ -20,7 +20,7 @@
@@ -29,6 +29,7 @@ diff --git a/packages/client/src/pages/announcements.vue b/packages/client/src/pages/announcements.vue index 17c056e0e5..b038a68573 100644 --- a/packages/client/src/pages/announcements.vue +++ b/packages/client/src/pages/announcements.vue @@ -10,7 +10,7 @@ @@ -25,6 +25,7 @@ import MkButton from '@/components/MkButton.vue'; import * as os from '@/os'; import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; +import { i18n } from '@/i18n'; const pagination = { endpoint: 'announcements' as const, diff --git a/packages/client/src/pages/antenna-timeline.vue b/packages/client/src/pages/antenna-timeline.vue index 3fd763138d..348512ea72 100644 --- a/packages/client/src/pages/antenna-timeline.vue +++ b/packages/client/src/pages/antenna-timeline.vue @@ -2,7 +2,7 @@
-
+
{{ app.description }}

-

{{ $ts._auth.permissionAsk }}

+

{{ i18n.ts._auth.permissionAsk }}

  • {{ $t(`_permissions.${p}`) }}
@@ -23,6 +23,7 @@ import { defineComponent } from 'vue'; import MkButton from '@/components/MkButton.vue'; import * as os from '@/os'; +import { i18n } from '@/i18n'; const emit = defineEmits<{ (ev: 'denied'): void; diff --git a/packages/client/src/pages/auth.vue b/packages/client/src/pages/auth.vue index bb55881a22..70c2c9622b 100644 --- a/packages/client/src/pages/auth.vue +++ b/packages/client/src/pages/auth.vue @@ -12,15 +12,15 @@ @accepted="accepted" />
-

{{ $ts._auth.denied }}

+

{{ i18n.ts._auth.denied }}

-

{{ session.app.isAuthorized ? $t('already-authorized') : $ts.allowed }}

-

{{ $ts._auth.callback }}

-

{{ $ts._auth.pleaseGoBack }}

+

{{ session.app.isAuthorized ? $t('already-authorized') : i18n.ts.allowed }}

+

{{ i18n.ts._auth.callback }}

+

{{ i18n.ts._auth.pleaseGoBack }}

-

{{ $ts.somethingHappened }}

+

{{ i18n.ts.somethingHappened }}

@@ -34,6 +34,7 @@ import XForm from './auth.form.vue'; import MkSignin from '@/components/MkSignin.vue'; import * as os from '@/os'; import { login } from '@/account'; +import { i18n } from '@/i18n'; export default defineComponent({ components: { diff --git a/packages/client/src/pages/explore.users.vue b/packages/client/src/pages/explore.users.vue index b97825e2a9..0536b2f416 100644 --- a/packages/client/src/pages/explore.users.vue +++ b/packages/client/src/pages/explore.users.vue @@ -10,15 +10,15 @@ - + - + - + @@ -65,6 +65,7 @@ import MkTab from '@/components/MkTab.vue'; import number from '@/filters/number'; import * as os from '@/os'; import { i18n } from '@/i18n'; +import { $i } from '@/account'; import { instance } from '@/instance'; const props = defineProps<{ diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.button.vue b/packages/client/src/pages/page-editor/els/page-editor.el.button.vue index da6f1e549d..20e6a08758 100644 --- a/packages/client/src/pages/page-editor/els/page-editor.el.button.vue +++ b/packages/client/src/pages/page-editor/els/page-editor.el.button.vue @@ -1,38 +1,38 @@