From 5ef939a230f7e2adcc62fbffd56aae7b74aec565 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <dpschen@noreply.kolaente.de>
Date: Mon, 23 May 2022 05:23:59 +0000
Subject: [PATCH] feature/fix-vue-i18n-9.2.31 (#1994)

Co-authored-by: renovate <renovatebot@kolaente.de>
Co-authored-by: Dominik Pschenitschni <mail@celement.de>
Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/1994
Reviewed-by: konrad <k@knt.li>
Co-authored-by: Dominik Pschenitschni <dpschen@noreply.kolaente.de>
Co-committed-by: Dominik Pschenitschni <dpschen@noreply.kolaente.de>
---
 package.json                                  |  2 +-
 src/App.vue                                   |  2 +-
 src/components/date/datepickerWithRange.vue   |  2 +-
 src/components/misc/api-config.vue            |  2 +-
 src/components/misc/create-edit.vue           | 11 +--
 src/components/misc/no-auth-wrapper.vue       |  2 +-
 src/components/misc/subscription.vue          |  2 +-
 src/components/sharing/linkSharing.vue        |  2 +-
 src/components/sharing/userTeam.vue           |  2 +-
 src/components/tasks/add-task.vue             |  2 +-
 src/components/tasks/edit-task.vue            |  2 +-
 .../tasks/partials/checklist-summary.vue      |  2 +-
 src/components/tasks/partials/comments.vue    |  2 +-
 src/components/tasks/partials/defer-task.vue  |  2 +-
 .../tasks/partials/editAssignees.vue          |  2 +-
 src/components/tasks/partials/editLabels.vue  |  2 +-
 src/components/tasks/partials/listSearch.vue  |  2 +-
 src/composables/useCopyToClipboard.ts         |  2 +-
 src/i18n/index.ts                             |  8 ++-
 src/views/filters/FilterDelete.vue            |  2 +-
 src/views/filters/FilterEdit.vue              |  2 +-
 src/views/list/ListGantt.vue                  |  2 +-
 src/views/list/NewList.vue                    |  2 +-
 src/views/list/settings/archive.vue           |  2 +-
 src/views/list/settings/delete.vue            |  2 +-
 src/views/list/settings/duplicate.vue         |  2 +-
 src/views/list/settings/share.vue             |  2 +-
 src/views/migrator/Migrate.vue                |  2 +-
 src/views/namespaces/settings/share.vue       |  2 +-
 src/views/sharing/LinkSharingAuth.vue         |  2 +-
 src/views/tasks/ShowTasks.vue                 |  2 +-
 src/views/teams/EditTeam.vue                  |  2 +-
 src/views/teams/ListTeams.vue                 |  2 +-
 src/views/user/PasswordReset.vue              |  2 +-
 src/views/user/Settings.vue                   |  2 +-
 src/views/user/settings/Avatar.vue            |  2 +-
 src/views/user/settings/Caldav.vue            |  2 +-
 src/views/user/settings/DataExport.vue        |  2 +-
 src/views/user/settings/Deletion.vue          |  2 +-
 src/views/user/settings/EmailUpdate.vue       |  2 +-
 src/views/user/settings/General.vue           |  4 +-
 src/views/user/settings/PasswordUpdate.vue    |  2 +-
 src/views/user/settings/TOTP.vue              |  2 +-
 yarn.lock                                     | 70 +++++++++----------
 44 files changed, 85 insertions(+), 88 deletions(-)

diff --git a/package.json b/package.json
index 150a26bb0..f95c040be 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "vue-advanced-cropper": "2.8.1",
     "vue-drag-resize": "2.0.3",
     "vue-flatpickr-component": "9.0.6",
-    "vue-i18n": "9.2.0-beta.30",
+    "vue-i18n": "9.2.0-beta.35",
     "vue-router": "4.0.15",
     "vuex": "4.0.2",
     "workbox-precaching": "6.5.3",
diff --git a/src/App.vue b/src/App.vue
index ec62fd9a9..79d686833 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -48,7 +48,7 @@ const keyboardShortcutsActive = computed(() => store.state.keyboardShortcutsActi
 const authUser = computed(() => store.getters['auth/authUser'])
 const authLinkShare = computed(() => store.getters['auth/authLinkShare'])
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 
 // setup account deletion verification
 const accountDeletionConfirm = useRouteQuery('accountDeletionConfirm') as Ref<null | string>
diff --git a/src/components/date/datepickerWithRange.vue b/src/components/date/datepickerWithRange.vue
index 61c21ef53..d4acf6623 100644
--- a/src/components/date/datepickerWithRange.vue
+++ b/src/components/date/datepickerWithRange.vue
@@ -83,7 +83,7 @@ import BaseButton from '@/components/base/BaseButton.vue'
 import DatemathHelp from '@/components/date/datemathHelp.vue'
 
 const store = useStore()
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 
 const emit = defineEmits(['dateChanged'])
 
diff --git a/src/components/misc/api-config.vue b/src/components/misc/api-config.vue
index 16a62a57b..d07aa68a9 100644
--- a/src/components/misc/api-config.vue
+++ b/src/components/misc/api-config.vue
@@ -70,7 +70,7 @@ watch(() => props.configureOpen, (value) => {
 }, {immediate: true})
 
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 
 const errorMsg = ref('')
 const successMsg = ref('')
diff --git a/src/components/misc/create-edit.vue b/src/components/misc/create-edit.vue
index 12a292b4e..5d9ee2842 100644
--- a/src/components/misc/create-edit.vue
+++ b/src/components/misc/create-edit.vue
@@ -28,22 +28,21 @@
 					{{ $t('misc.cancel') }}
 				</x-button>
 				<x-button
-					v-if="primaryLabel !== ''"
 					variant="primary"
 					@click.prevent.stop="primary()"
 					:icon="primaryIcon"
 					:disabled="primaryDisabled"
 				>
-					{{ primaryLabel }}
+					{{ primaryLabel || $t('misc.create') }}
 				</x-button>
 			</footer>
 		</card>
 	</modal>
 </template>
 
+<script lang="ts">
+</script>
 <script setup lang="ts">
-import { useI18n } from 'vue-i18n'
-
 defineProps({
 	title: {
 		type: String,
@@ -51,10 +50,6 @@ defineProps({
 	},
 	primaryLabel: {
 		type: String,
-		default() {
-			const {t} = useI18n()
-			return t('misc.create')
-		},
 	},
 	primaryIcon: {
 		type: String,
diff --git a/src/components/misc/no-auth-wrapper.vue b/src/components/misc/no-auth-wrapper.vue
index e03db0521..2f1239d47 100644
--- a/src/components/misc/no-auth-wrapper.vue
+++ b/src/components/misc/no-auth-wrapper.vue
@@ -38,7 +38,7 @@ import {useTitle} from '@/composables/useTitle'
 
 const route = useRoute()
 const store = useStore()
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 
 const motd = computed(() => store.state.config.motd)
 
diff --git a/src/components/misc/subscription.vue b/src/components/misc/subscription.vue
index e7f9e9585..011a1650b 100644
--- a/src/components/misc/subscription.vue
+++ b/src/components/misc/subscription.vue
@@ -51,7 +51,7 @@ const emit = defineEmits(['change'])
 
 const subscriptionService = shallowRef(new SubscriptionService())
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 const tooltipText = computed(() => {
 	if (disabled.value) {
 		return t('task.subscription.subscribedThroughParent', {
diff --git a/src/components/sharing/linkSharing.vue b/src/components/sharing/linkSharing.vue
index c616bb84e..e0b454e6a 100644
--- a/src/components/sharing/linkSharing.vue
+++ b/src/components/sharing/linkSharing.vue
@@ -195,7 +195,7 @@ const props = defineProps({
 	},
 })
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 
 const linkShares = ref([])
 const linkShareService = shallowReactive(new LinkShareService())
diff --git a/src/components/sharing/userTeam.vue b/src/components/sharing/userTeam.vue
index c402d479c..6e928b12e 100644
--- a/src/components/sharing/userTeam.vue
+++ b/src/components/sharing/userTeam.vue
@@ -179,7 +179,7 @@ const props = defineProps({
 	},
 })
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 
 // This user service is either a userNamespaceService or a userListService, depending on the type we are using
 let stuffService: ShallowReactive<UserNamespaceService | UserListService | TeamListService | TeamNamespaceService>
diff --git a/src/components/tasks/add-task.vue b/src/components/tasks/add-task.vue
index c5d00b12f..03c818f76 100644
--- a/src/components/tasks/add-task.vue
+++ b/src/components/tasks/add-task.vue
@@ -133,7 +133,7 @@ const emit = defineEmits(['taskAdded'])
 const newTaskTitle = ref('')
 const newTaskInput = useAutoHeightTextarea(newTaskTitle)
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 const store = useStore()
 
 const taskService = shallowReactive(new TaskService())
diff --git a/src/components/tasks/edit-task.vue b/src/components/tasks/edit-task.vue
index 8f67fe793..6a6b703a9 100644
--- a/src/components/tasks/edit-task.vue
+++ b/src/components/tasks/edit-task.vue
@@ -90,7 +90,7 @@ import ColorPicker from '../input/colorPicker.vue'
 
 import {success} from '@/message'
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 const router = useRouter()
 
 const props = defineProps({
diff --git a/src/components/tasks/partials/checklist-summary.vue b/src/components/tasks/partials/checklist-summary.vue
index 5d501bb2e..23653bff7 100644
--- a/src/components/tasks/partials/checklist-summary.vue
+++ b/src/components/tasks/partials/checklist-summary.vue
@@ -34,7 +34,7 @@ const checklistCircleDone = computed(() => {
 	return ((100 - progress) / 100) * c
 })
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 const label = computed(() => {
 	return checklist.value.total === checklist.value.checked 
 		? t('task.checklistAllDone', checklist.value)
diff --git a/src/components/tasks/partials/comments.vue b/src/components/tasks/partials/comments.vue
index f9b897d38..d11f66ea5 100644
--- a/src/components/tasks/partials/comments.vue
+++ b/src/components/tasks/partials/comments.vue
@@ -173,7 +173,7 @@ const props = defineProps({
 	},
 })
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 const store = useStore()
 
 const comments = ref<TaskCommentModel[]>([])
diff --git a/src/components/tasks/partials/defer-task.vue b/src/components/tasks/partials/defer-task.vue
index abc21ecfd..48b52fb60 100644
--- a/src/components/tasks/partials/defer-task.vue
+++ b/src/components/tasks/partials/defer-task.vue
@@ -54,7 +54,7 @@ const props = defineProps({
 })
 const emit = defineEmits(['update:modelValue'])
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 const store = useStore()
 
 const taskService = shallowReactive(new TaskService())
diff --git a/src/components/tasks/partials/editAssignees.vue b/src/components/tasks/partials/editAssignees.vue
index ff904a05d..13de683aa 100644
--- a/src/components/tasks/partials/editAssignees.vue
+++ b/src/components/tasks/partials/editAssignees.vue
@@ -60,7 +60,7 @@ const props = defineProps({
 const emit = defineEmits(['update:modelValue'])
 
 const store = useStore()
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 
 const listUserService = shallowReactive(new ListUserService())
 const foundUsers = ref([])
diff --git a/src/components/tasks/partials/editLabels.vue b/src/components/tasks/partials/editLabels.vue
index 1961cbccb..051f8b9ae 100644
--- a/src/components/tasks/partials/editLabels.vue
+++ b/src/components/tasks/partials/editLabels.vue
@@ -67,7 +67,7 @@ const props = defineProps({
 const emit = defineEmits(['update:modelValue', 'change'])
 
 const store = useStore()
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 
 const labelTaskService = shallowReactive(new LabelTaskService())
 const labels = ref<LabelModel[]>([])
diff --git a/src/components/tasks/partials/listSearch.vue b/src/components/tasks/partials/listSearch.vue
index 08489391d..482e47e2e 100644
--- a/src/components/tasks/partials/listSearch.vue
+++ b/src/components/tasks/partials/listSearch.vue
@@ -36,7 +36,7 @@ const props = defineProps({
 const emit = defineEmits(['update:modelValue'])
 
 const store = useStore()
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 
 const list = reactive<ListModel>(new ListModel())
 
diff --git a/src/composables/useCopyToClipboard.ts b/src/composables/useCopyToClipboard.ts
index c363bc7bd..30ea37456 100644
--- a/src/composables/useCopyToClipboard.ts
+++ b/src/composables/useCopyToClipboard.ts
@@ -2,7 +2,7 @@ import {error} from '@/message'
 import {useI18n} from 'vue-i18n'
 
 export function useCopyToClipboard() {
-	const {t} = useI18n()
+	const {t} = useI18n({useScope: 'global'})
 
 	return async (text: string) => {
 		try {
diff --git a/src/i18n/index.ts b/src/i18n/index.ts
index 3570b5d57..266fe99af 100644
--- a/src/i18n/index.ts
+++ b/src/i18n/index.ts
@@ -4,7 +4,9 @@ import langEN from './lang/en.json'
 export const i18n = createI18n({
 	locale: 'en', // set locale
 	fallbackLocale: 'en',
+	legacy: true,
 	globalInjection: true,
+	allowComposition: true,
 	messages: {
 		en: langEN,
 	},
@@ -26,9 +28,9 @@ export const availableLanguages = {
 
 const loadedLanguages = ['en'] // our default language that is preloaded
 
-const setI18nLanguage = lang => {
+const setI18nLanguage = (lang: string) => {
 	i18n.global.locale = lang
-	document.querySelector('html').setAttribute('lang', lang)
+	document.documentElement.lang =lang
 	return lang
 }
 
@@ -73,7 +75,7 @@ export const getCurrentLanguage = () => {
 	return 'en'
 }
 
-export const saveLanguage = lang => {
+export const saveLanguage = (lang: string) => {
 	localStorage.setItem('language', lang)
 	setLanguage()
 }
diff --git a/src/views/filters/FilterDelete.vue b/src/views/filters/FilterDelete.vue
index 3ec870f62..15238ec00 100644
--- a/src/views/filters/FilterDelete.vue
+++ b/src/views/filters/FilterDelete.vue
@@ -21,7 +21,7 @@ import SavedFilterModel from '@/models/savedFilter'
 import SavedFilterService from '@/services/savedFilter'
 import {getSavedFilterIdFromListId} from '@/helpers/savedFilter'
 
-const { t } = useI18n()
+const { t } = useI18n({useScope: 'global'})
 const router = useRouter()
 const route = useRoute()
 
diff --git a/src/views/filters/FilterEdit.vue b/src/views/filters/FilterEdit.vue
index 8c6bfebf4..109057925 100644
--- a/src/views/filters/FilterEdit.vue
+++ b/src/views/filters/FilterEdit.vue
@@ -68,7 +68,7 @@ import SavedFilterService from '@/services/savedFilter'
 import {objectToSnakeCase} from '@/helpers/case'
 import {getSavedFilterIdFromListId} from '@/helpers/savedFilter'
 
-const { t } = useI18n()
+const { t } = useI18n({useScope: 'global'})
 
 function useSavedFilter(listId) {
 	const filterService = shallowRef(new SavedFilterService())
diff --git a/src/views/list/ListGantt.vue b/src/views/list/ListGantt.vue
index dba346d49..3373e4950 100644
--- a/src/views/list/ListGantt.vue
+++ b/src/views/list/ListGantt.vue
@@ -91,7 +91,7 @@ const now = ref(new Date())
 const dateFrom = ref(new Date((new Date()).setDate(now.value.getDate() - 15)))
 const dateTo = ref(new Date((new Date()).setDate(now.value.getDate() + 30)))
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 const store = useStore()
 const flatPickerConfig = computed(() => ({
 	altFormat: t('date.altFormatShort'),
diff --git a/src/views/list/NewList.vue b/src/views/list/NewList.vue
index f119aaebe..a63dc4081 100644
--- a/src/views/list/NewList.vue
+++ b/src/views/list/NewList.vue
@@ -45,7 +45,7 @@ import ColorPicker from '@/components/input/colorPicker.vue'
 import { success } from '@/message'
 import { useTitle } from '@/composables/useTitle'
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 const store = useStore()
 const router = useRouter()
 const route = useRoute()
diff --git a/src/views/list/settings/archive.vue b/src/views/list/settings/archive.vue
index 51cd93bc5..92e24d0fa 100644
--- a/src/views/list/settings/archive.vue
+++ b/src/views/list/settings/archive.vue
@@ -27,7 +27,7 @@ import ListService from '@/services/list'
 import { success } from '@/message'
 import { useTitle } from '@/composables/useTitle'
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 const store = useStore()
 const router = useRouter()
 const route = useRoute()
diff --git a/src/views/list/settings/delete.vue b/src/views/list/settings/delete.vue
index 923aaa78a..6ddb2b4ab 100644
--- a/src/views/list/settings/delete.vue
+++ b/src/views/list/settings/delete.vue
@@ -36,7 +36,7 @@ import {success} from '@/message'
 import TaskCollectionService from '@/services/taskCollection'
 import Loading from '@/components/misc/loading.vue'
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 const store = useStore()
 const route = useRoute()
 const router = useRouter()
diff --git a/src/views/list/settings/duplicate.vue b/src/views/list/settings/duplicate.vue
index 3264e043a..f6916aa1d 100644
--- a/src/views/list/settings/duplicate.vue
+++ b/src/views/list/settings/duplicate.vue
@@ -37,7 +37,7 @@ import { useTitle } from '@/composables/useTitle'
 import { useNameSpaceSearch } from '@/composables/useNamespaceSearch'
 
 
-const { t } = useI18n()
+const { t } = useI18n({useScope: 'global'})
 useTitle(() => t('list.duplicate.title'))
 
 
diff --git a/src/views/list/settings/share.vue b/src/views/list/settings/share.vue
index 119769515..bd2cf0728 100644
--- a/src/views/list/settings/share.vue
+++ b/src/views/list/settings/share.vue
@@ -45,7 +45,7 @@ import CreateEdit from '@/components/misc/create-edit.vue'
 import LinkSharing from '@/components/sharing/linkSharing.vue'
 import userTeam from '@/components/sharing/userTeam.vue'
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 
 const list = ref()
 const title = computed(() => list.value?.title
diff --git a/src/views/migrator/Migrate.vue b/src/views/migrator/Migrate.vue
index 7afceab47..450276aab 100644
--- a/src/views/migrator/Migrate.vue
+++ b/src/views/migrator/Migrate.vue
@@ -28,7 +28,7 @@ import {useStore} from 'vuex'
 import {MIGRATORS} from './migrators'
 import {useTitle} from '@/composables/useTitle'
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 const store = useStore()
 
 useTitle(() => t('migrate.title'))
diff --git a/src/views/namespaces/settings/share.vue b/src/views/namespaces/settings/share.vue
index 2746b5f2b..e2b138ddb 100644
--- a/src/views/namespaces/settings/share.vue
+++ b/src/views/namespaces/settings/share.vue
@@ -41,7 +41,7 @@ import NamespaceModel from '@/models/namespace'
 import CreateEdit from '@/components/misc/create-edit.vue'
 import manageSharing from '@/components/sharing/userTeam.vue'
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 
 const namespace = ref()
 
diff --git a/src/views/sharing/LinkSharingAuth.vue b/src/views/sharing/LinkSharingAuth.vue
index 66744930f..7dd2a8e11 100644
--- a/src/views/sharing/LinkSharingAuth.vue
+++ b/src/views/sharing/LinkSharingAuth.vue
@@ -41,7 +41,7 @@ import {useTitle} from '@vueuse/core'
 
 import Message from '@/components/misc/message.vue'
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 useTitle(t('sharing.authenticating'))
 
 function useAuth() {
diff --git a/src/views/tasks/ShowTasks.vue b/src/views/tasks/ShowTasks.vue
index b54ef3ee4..dd21069db 100644
--- a/src/views/tasks/ShowTasks.vue
+++ b/src/views/tasks/ShowTasks.vue
@@ -64,7 +64,7 @@ import LlamaCool from '@/assets/llama-cool.svg?component'
 const store = useStore()
 const route = useRoute()
 const router = useRouter()
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 
 const tasks = ref<TaskModel[]>([])
 const showNothingToDo = ref<boolean>(false)
diff --git a/src/views/teams/EditTeam.vue b/src/views/teams/EditTeam.vue
index 468cdef3a..27881bba5 100644
--- a/src/views/teams/EditTeam.vue
+++ b/src/views/teams/EditTeam.vue
@@ -183,7 +183,7 @@ import {success} from '@/message'
 const store = useStore()
 const route = useRoute()
 const router = useRouter()
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 
 const userIsAdmin = computed(() => {
 	return (
diff --git a/src/views/teams/ListTeams.vue b/src/views/teams/ListTeams.vue
index 6a9214ddf..bf5d68452 100644
--- a/src/views/teams/ListTeams.vue
+++ b/src/views/teams/ListTeams.vue
@@ -32,7 +32,7 @@ import { useI18n } from 'vue-i18n'
 import TeamService from '@/services/team'
 import { useTitle } from '@/composables/useTitle'
 
-const { t } = useI18n()
+const { t } = useI18n({useScope: 'global'})
 useTitle(() => t('team.title'))
 
 const teams = ref([])
diff --git a/src/views/user/PasswordReset.vue b/src/views/user/PasswordReset.vue
index 4eece7964..4bd2600f5 100644
--- a/src/views/user/PasswordReset.vue
+++ b/src/views/user/PasswordReset.vue
@@ -66,7 +66,7 @@ import PasswordResetModel from '@/models/passwordReset'
 import PasswordResetService from '@/services/passwordReset'
 import Message from '@/components/misc/message.vue'
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 
 const credentials = reactive({
 	password: '',
diff --git a/src/views/user/Settings.vue b/src/views/user/Settings.vue
index bb9f7048e..5ec8d9e50 100644
--- a/src/views/user/Settings.vue
+++ b/src/views/user/Settings.vue
@@ -23,7 +23,7 @@ import { store } from '@/store'
 import { useI18n } from 'vue-i18n'
 import { useTitle } from '@/composables/useTitle'
 
-const { t } = useI18n()
+const { t } = useI18n({useScope: 'global'})
 useTitle(() => t('user.settings.title'))
 
 const totpEnabled = computed(() => store.state.config.totpEnabled)
diff --git a/src/views/user/settings/Avatar.vue b/src/views/user/settings/Avatar.vue
index 036161b6e..56e1d1b50 100644
--- a/src/views/user/settings/Avatar.vue
+++ b/src/views/user/settings/Avatar.vue
@@ -77,7 +77,7 @@ import AvatarModel from '@/models/avatar'
 import { useTitle } from '@/composables/useTitle'
 import { success } from '@/message'
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 const store = useStore()
 
 const AVATAR_PROVIDERS = {
diff --git a/src/views/user/settings/Caldav.vue b/src/views/user/settings/Caldav.vue
index cfeede767..d8b81c379 100644
--- a/src/views/user/settings/Caldav.vue
+++ b/src/views/user/settings/Caldav.vue
@@ -81,7 +81,7 @@ import CaldavTokenModel from '@/models/caldavToken'
 
 const copy = useCopyToClipboard()
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 useTitle(() => `${t('user.settings.caldav.title')} - ${t('user.settings.title')}`)
 
 const service = shallowReactive(new CaldavTokenService())
diff --git a/src/views/user/settings/DataExport.vue b/src/views/user/settings/DataExport.vue
index 3711c6b8e..36e3d6592 100644
--- a/src/views/user/settings/DataExport.vue
+++ b/src/views/user/settings/DataExport.vue
@@ -55,7 +55,7 @@ import DataExportService from '@/services/dataExport'
 import { useTitle } from '@/composables/useTitle'
 import {success} from '@/message'
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 const store = useStore()
 
 useTitle(() => `${t('user.export.title')} - ${t('user.settings.title')}`)
diff --git a/src/views/user/settings/Deletion.vue b/src/views/user/settings/Deletion.vue
index 48589070e..bba895a2c 100644
--- a/src/views/user/settings/Deletion.vue
+++ b/src/views/user/settings/Deletion.vue
@@ -100,7 +100,7 @@ import {parseDateOrNull} from '@/helpers/parseDateOrNull'
 import {useTitle} from '@/composables/useTitle'
 import {success} from '@/message'
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 useTitle(() => `${t('user.deletion.title')} - ${t('user.settings.title')}`)
 
 const accountDeleteService = shallowReactive(new AccountDeleteService())
diff --git a/src/views/user/settings/EmailUpdate.vue b/src/views/user/settings/EmailUpdate.vue
index 5452a2303..7fb21bcf9 100644
--- a/src/views/user/settings/EmailUpdate.vue
+++ b/src/views/user/settings/EmailUpdate.vue
@@ -53,7 +53,7 @@ import EmailUpdateModel from '@/models/emailUpdate'
 import {success} from '@/message'
 import {useTitle} from '@/composables/useTitle'
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 useTitle(() => `${t('user.settings.updateEmailTitle')} - ${t('user.settings.title')}`)
 
 const store = useStore()
diff --git a/src/views/user/settings/General.vue b/src/views/user/settings/General.vue
index 3026877e1..dedf200ca 100644
--- a/src/views/user/settings/General.vue
+++ b/src/views/user/settings/General.vue
@@ -159,13 +159,13 @@ import {AuthenticatedHTTPFactory} from '@/http-common'
 import {useColorScheme} from '@/composables/useColorScheme'
 import { useTitle } from '@/composables/useTitle'
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 useTitle(() => `${t('user.settings.general.title')} - ${t('user.settings.title')}`)
 
 const DEFAULT_LIST_ID = 0
 
 function useColorSchemeSetting() {
-	const {t} = useI18n()
+	const {t} = useI18n({useScope: 'global'})
 	const colorSchemeSettings = computed(() => ({
 		light: t('user.settings.appearance.colorScheme.light'),
 		auto: t('user.settings.appearance.colorScheme.system'),
diff --git a/src/views/user/settings/PasswordUpdate.vue b/src/views/user/settings/PasswordUpdate.vue
index 9ad5cb45b..d7db100b3 100644
--- a/src/views/user/settings/PasswordUpdate.vue
+++ b/src/views/user/settings/PasswordUpdate.vue
@@ -74,7 +74,7 @@ const passwordUpdateService = shallowReactive(new PasswordUpdateService())
 const passwordUpdate = reactive(new PasswordUpdateModel())
 const passwordConfirm = ref('')
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 const store = useStore()
 useTitle(() => `${t('user.settings.newPasswordTitle')} - ${t('user.settings.title')}`)
 
diff --git a/src/views/user/settings/TOTP.vue b/src/views/user/settings/TOTP.vue
index d329e9661..2785eb712 100644
--- a/src/views/user/settings/TOTP.vue
+++ b/src/views/user/settings/TOTP.vue
@@ -80,7 +80,7 @@ import {success} from '@/message'
 
 import { useTitle } from '@/composables/useTitle'
 
-const {t} = useI18n()
+const {t} = useI18n({useScope: 'global'})
 useTitle(() => `${t('user.settings.totp.title')} - ${t('user.settings.title')}`)
 
 
diff --git a/yarn.lock b/yarn.lock
index a7c6daea6..6b9ea8074 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1182,43 +1182,43 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
-"@intlify/core-base@9.2.0-beta.30":
-  version "9.2.0-beta.30"
-  resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.2.0-beta.30.tgz#82f86e3199661c18fbbd9b07ba58243909148384"
-  integrity sha512-tnOuI8gs4S7vv4WjG8oFL7vbZ4PM7Is/Ld3lRHQlBO7UjpnCVcQ94AgP/4F0cUPFn9JSPMQRN0aOOahW1BXvSA==
+"@intlify/core-base@9.2.0-beta.35":
+  version "9.2.0-beta.35"
+  resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.2.0-beta.35.tgz#ef714d6ddf387024b1f1c0fcde0040a11bd33b0e"
+  integrity sha512-53yuCpo2ov5OKdvBTvE5zKMo2clLVqNORwkcY9TUu0B+yrOeDwLWQnbPJnOoDu5KkRdbdXlMxnHNCpJ5vlGZ1g==
   dependencies:
-    "@intlify/devtools-if" "9.2.0-beta.30"
-    "@intlify/message-compiler" "9.2.0-beta.30"
-    "@intlify/shared" "9.2.0-beta.30"
-    "@intlify/vue-devtools" "9.2.0-beta.30"
+    "@intlify/devtools-if" "9.2.0-beta.35"
+    "@intlify/message-compiler" "9.2.0-beta.35"
+    "@intlify/shared" "9.2.0-beta.35"
+    "@intlify/vue-devtools" "9.2.0-beta.35"
 
-"@intlify/devtools-if@9.2.0-beta.30":
-  version "9.2.0-beta.30"
-  resolved "https://registry.yarnpkg.com/@intlify/devtools-if/-/devtools-if-9.2.0-beta.30.tgz#98b52ef802abe6ad29fd3d8486b9c8454469cf4f"
-  integrity sha512-3OxGFi6ooya9DFqX/JsxFjrj9nGYcDoo4CRGYSDqnC+xv4bnsyB5ekmaYBiVZtagCdZdSUMxbTFphl1WbtgNLQ==
+"@intlify/devtools-if@9.2.0-beta.35":
+  version "9.2.0-beta.35"
+  resolved "https://registry.yarnpkg.com/@intlify/devtools-if/-/devtools-if-9.2.0-beta.35.tgz#16a8bb6b3f6d612ed705ab00a28eba8a8cb7b1ba"
+  integrity sha512-y3+7M+eS9mqeXTBa1QWAvt4nsjwWJ5G4xT+G3IFtd7Vb2CQHwli229n0avD+VdlDGwWCDWpLkny8QWtdNEYpOA==
   dependencies:
-    "@intlify/shared" "9.2.0-beta.30"
+    "@intlify/shared" "9.2.0-beta.35"
 
-"@intlify/message-compiler@9.2.0-beta.30":
-  version "9.2.0-beta.30"
-  resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.2.0-beta.30.tgz#51955ebb388bc8774465e6e017a63bba1aeaed04"
-  integrity sha512-2kj/0nLIFrgiO86f9VifcUUcV8LdzXt4YYPIujx/LkTEQOuSFUo/bNiMaG1hyfiU/8mfq6tsaWKjoOZjeao1eQ==
+"@intlify/message-compiler@9.2.0-beta.35":
+  version "9.2.0-beta.35"
+  resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.2.0-beta.35.tgz#3df3809650f4fef97d00ae739a87f33eb095bd79"
+  integrity sha512-wYQCgnRtyJ40HK3bJTrszHDaxqDXZH+9Ps7RsXNuNwZ9hIb1cVkLiUNIbuJS/XSJ1kATJXA6K+4if6ZLb0Ozxw==
   dependencies:
-    "@intlify/shared" "9.2.0-beta.30"
+    "@intlify/shared" "9.2.0-beta.35"
     source-map "0.6.1"
 
-"@intlify/shared@9.2.0-beta.30":
-  version "9.2.0-beta.30"
-  resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.2.0-beta.30.tgz#623a2fcffdb063d5aa940f7236ab28a083c004c8"
-  integrity sha512-E1WHRTIlUEse3d/6t1pAagSXRxmeVeNIhx5kT80dfpYxw8lOnCWV9wLve2bq9Fkv+3TD2I5j+CdN7jvSl3LdsA==
+"@intlify/shared@9.2.0-beta.35":
+  version "9.2.0-beta.35"
+  resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.2.0-beta.35.tgz#10f98403cb541d29d90d428a2ef58fbd927caf1d"
+  integrity sha512-DXf7xrwf08GKhr93XPQ8EgaEN0CIELl+mAS6SlRhi/aLtZv5HSGSMkz4M/ICwoWzFLSgOx/ZdBSasex19MMogg==
 
-"@intlify/vue-devtools@9.2.0-beta.30":
-  version "9.2.0-beta.30"
-  resolved "https://registry.yarnpkg.com/@intlify/vue-devtools/-/vue-devtools-9.2.0-beta.30.tgz#6ef377067f59e170ae33c7018c9b4a6758da87b7"
-  integrity sha512-hcqDfwP/oXVmVCaJ0RA+uv1WSCcd42/Y13S0bySmWZv2KamLcxiD7wYxp/MaECG/D4KZcSLkq/wDHTG7lhYf5Q==
+"@intlify/vue-devtools@9.2.0-beta.35":
+  version "9.2.0-beta.35"
+  resolved "https://registry.yarnpkg.com/@intlify/vue-devtools/-/vue-devtools-9.2.0-beta.35.tgz#209b5c4964a6dfc40ecc0497334f3fcc347b59d8"
+  integrity sha512-h7nf5F7AV4uKrr7zKTIyv8EOaIv4yAXuo7tvnFsp5uF8FO+kpBwWDm5csw9v9neyz42hiINJSP0Amou9M2ShEA==
   dependencies:
-    "@intlify/core-base" "9.2.0-beta.30"
-    "@intlify/shared" "9.2.0-beta.30"
+    "@intlify/core-base" "9.2.0-beta.35"
+    "@intlify/shared" "9.2.0-beta.35"
 
 "@jest/types@^25.5.0":
   version "25.5.0"
@@ -12643,14 +12643,14 @@ vue-flatpickr-component@9.0.6:
   dependencies:
     flatpickr "^4.6.9"
 
-vue-i18n@9.2.0-beta.30:
-  version "9.2.0-beta.30"
-  resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-9.2.0-beta.30.tgz#e58effd4e1dcd328c3c40ad945aaf914146237c6"
-  integrity sha512-5DqrgG9ffgC7j3RRAfViC0WUcdz0C3Ix1qq1AyQItpF7UkSB6iSJGEjBG6KdspbRQq/8t1YzDx4JRXbL05l6ow==
+vue-i18n@9.2.0-beta.35:
+  version "9.2.0-beta.35"
+  resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-9.2.0-beta.35.tgz#9e5f18bcab8ca40db5c6fe8115bacea3e13cb981"
+  integrity sha512-kTYzZSB3B/ar3M9RfQ0KAyTGfvRw544qVzY++/sNV4stOKG6NxIDOdHdYTfVEXTSkczFwoZHTKXTWNVpx+GuHA==
   dependencies:
-    "@intlify/core-base" "9.2.0-beta.30"
-    "@intlify/shared" "9.2.0-beta.30"
-    "@intlify/vue-devtools" "9.2.0-beta.30"
+    "@intlify/core-base" "9.2.0-beta.35"
+    "@intlify/shared" "9.2.0-beta.35"
+    "@intlify/vue-devtools" "9.2.0-beta.35"
     "@vue/devtools-api" "^6.0.0-beta.13"
 
 vue-resize@^2.0.0-alpha.1: