From 772d4618a660c8873e4891845ce85ef751344e35 Mon Sep 17 00:00:00 2001 From: Johann150 Date: Wed, 21 Sep 2022 10:03:39 +0200 Subject: [PATCH] remove global variables for i18n --- packages/client/src/components/federation.vue | 48 +++++++++---------- .../client/src/components/media-image.vue | 7 +-- .../src/components/modal-page-window.vue | 2 +- .../client/src/components/note-detailed.vue | 2 +- packages/client/src/components/note.vue | 2 +- .../client/src/components/poll-editor.vue | 2 +- packages/client/src/components/poll.vue | 4 +- packages/client/src/components/signin.vue | 6 +-- .../src/components/sub-note-content.vue | 2 +- .../client/src/components/ui/container.vue | 3 +- .../client/src/components/user-preview.vue | 7 +-- packages/client/src/i18n.ts | 8 ---- packages/client/src/init.ts | 2 - packages/client/src/pages/admin/relays.vue | 2 +- packages/client/src/pages/announcements.vue | 2 +- packages/client/src/pages/messaging/index.vue | 6 +-- .../messaging/messaging-room.message.vue | 9 ++-- packages/client/src/pages/page-editor.vue | 28 +++++------ packages/client/src/pages/settings/2fa.vue | 2 +- packages/client/src/pages/settings/apps.vue | 2 +- packages/client/src/pages/settings/sounds.vue | 2 +- .../client/src/pages/user/index.activity.vue | 2 +- .../client/src/pages/user/index.photos.vue | 5 +- packages/client/src/pages/welcome.setup.vue | 8 ++-- .../src/ui/_common_/sidebar-for-mobile.vue | 13 ++--- packages/client/src/ui/_common_/sidebar.vue | 13 ++--- packages/client/src/ui/classic.header.vue | 4 +- .../client/src/ui/deck/antenna-column.vue | 2 +- packages/client/src/ui/deck/list-column.vue | 2 +- .../src/ui/deck/notifications-column.vue | 3 +- packages/client/src/ui/deck/tl-column.vue | 6 +-- .../client/src/ui/deck/widgets-column.vue | 3 +- packages/client/src/widgets/calendar.vue | 8 ++-- packages/client/src/widgets/slideshow.vue | 2 +- packages/client/src/widgets/timeline.vue | 2 +- packages/client/src/widgets/trends.vue | 2 +- 36 files changed, 111 insertions(+), 112 deletions(-) diff --git a/packages/client/src/components/federation.vue b/packages/client/src/components/federation.vue index 9517533d1..676e473cb 100644 --- a/packages/client/src/components/federation.vue +++ b/packages/client/src/components/federation.vue @@ -3,35 +3,35 @@
- + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + +
diff --git a/packages/client/src/components/media-image.vue b/packages/client/src/components/media-image.vue index 1ec07c3cf..ac22557f9 100644 --- a/packages/client/src/components/media-image.vue +++ b/packages/client/src/components/media-image.vue @@ -3,8 +3,8 @@
- {{ $ts.sensitive }} - {{ $ts.clickToShow }} + {{ i18n.ts.sensitive }} + {{ i18n.ts.clickToShow }}
@@ -16,7 +16,7 @@
GIF
- + @@ -26,6 +26,7 @@ import * as foundkey from 'foundkey-js'; import { getStaticImageUrl } from '@/scripts/get-static-image-url'; import ImgWithBlurhash from '@/components/img-with-blurhash.vue'; import { defaultStore } from '@/store'; +import { i18n } from '@/i18n'; const props = defineProps<{ image: foundkey.entities.DriveFile; diff --git a/packages/client/src/components/modal-page-window.vue b/packages/client/src/components/modal-page-window.vue index fdb4b7610..6bd3a8552 100644 --- a/packages/client/src/components/modal-page-window.vue +++ b/packages/client/src/components/modal-page-window.vue @@ -2,7 +2,7 @@
- + diff --git a/packages/client/src/components/note-detailed.vue b/packages/client/src/components/note-detailed.vue index f617f4237..e64e13375 100644 --- a/packages/client/src/components/note-detailed.vue +++ b/packages/client/src/components/note-detailed.vue @@ -60,7 +60,7 @@
- {{ $t('translatedFrom', { x: translation.sourceLang }) }}: + {{ i18n.t('translatedFrom', { x: translation.sourceLang }) }}:
diff --git a/packages/client/src/components/note.vue b/packages/client/src/components/note.vue index e65ba298f..f818f7dae 100644 --- a/packages/client/src/components/note.vue +++ b/packages/client/src/components/note.vue @@ -48,7 +48,7 @@
- {{ $t('translatedFrom', { x: translation.sourceLang }) }}: + {{ i18n.t('translatedFrom', { x: translation.sourceLang }) }}:
diff --git a/packages/client/src/components/poll-editor.vue b/packages/client/src/components/poll-editor.vue index 6c1a4cc89..b2a98b7ee 100644 --- a/packages/client/src/components/poll-editor.vue +++ b/packages/client/src/components/poll-editor.vue @@ -5,7 +5,7 @@

  • - +

- {{ $t('_poll.totalVotes', { n: total }) }} + {{ i18n.t('_poll.totalVotes', { n: total }) }} · {{ showResult ? i18n.ts._poll.vote : i18n.ts._poll.showResult }} {{ i18n.ts._poll.voted }} diff --git a/packages/client/src/components/signin.vue b/packages/client/src/components/signin.vue index de6739e50..f4e32fc7e 100644 --- a/packages/client/src/components/signin.vue +++ b/packages/client/src/components/signin.vue @@ -41,9 +41,9 @@

diff --git a/packages/client/src/components/sub-note-content.vue b/packages/client/src/components/sub-note-content.vue index 48b122405..078197e9b 100644 --- a/packages/client/src/components/sub-note-content.vue +++ b/packages/client/src/components/sub-note-content.vue @@ -7,7 +7,7 @@ RN: ...
- ({{ $t('withNFiles', { n: note.files.length }) }}) + ({{ i18n.t('withNFiles', { n: note.files.length }) }})
diff --git a/packages/client/src/components/ui/container.vue b/packages/client/src/components/ui/container.vue index f7d668b1a..13104a543 100644 --- a/packages/client/src/components/ui/container.vue +++ b/packages/client/src/components/ui/container.vue @@ -20,7 +20,7 @@
@@ -29,6 +29,7 @@