diff --git a/src/components/Event/DateCalendarIcon.vue b/src/components/Event/DateCalendarIcon.vue index 2a65df29a..4286f4ea9 100644 --- a/src/components/Event/DateCalendarIcon.vue +++ b/src/components/Event/DateCalendarIcon.vue @@ -27,7 +27,7 @@ import { useI18n } from "vue-i18n"; const { locale } = useI18n({ useScope: "global" }); -const localeConverted = locale.replace("_", "-"); +const localeConverted = computed(() => locale.value.replace("_", "-")); const props = withDefaults( defineProps<{ @@ -40,15 +40,15 @@ const props = withDefaults( const dateObj = computed(() => new Date(props.date)); const month = computed(() => - dateObj.value.toLocaleString(localeConverted, { month: "short" }) + dateObj.value.toLocaleString(localeConverted.value, { month: "short" }) ); const day = computed(() => - dateObj.value.toLocaleString(localeConverted, { day: "numeric" }) + dateObj.value.toLocaleString(localeConverted.value, { day: "numeric" }) ); const weekday = computed(() => - dateObj.value.toLocaleString(localeConverted, { weekday: "short" }) + dateObj.value.toLocaleString(localeConverted.value, { weekday: "short" }) ); const smallStyle = computed(() => (props.small ? "1.2" : "2")); diff --git a/src/components/Event/FullAddressAutoComplete.vue b/src/components/Event/FullAddressAutoComplete.vue index 286860cb9..d15a063e6 100644 --- a/src/components/Event/FullAddressAutoComplete.vue +++ b/src/components/Event/FullAddressAutoComplete.vue @@ -346,7 +346,7 @@ const asyncData = async (query: string): Promise => { try { const queryVars = { query, - locale: locale, + locale: locale.value, type: props.resultType, }; @@ -428,7 +428,7 @@ const reverseGeoCode = async (e: LatLng, zoom: number) => { latitude: e.lat, longitude: e.lng, zoom, - locale: locale as unknown as string, + locale: locale.value as unknown as string, }); if (!result) return; addressData.value = result.reverseGeocode; diff --git a/src/utils/i18n.ts b/src/utils/i18n.ts index 852d4cf41..bae4287ee 100644 --- a/src/utils/i18n.ts +++ b/src/utils/i18n.ts @@ -43,7 +43,6 @@ export const i18n = createI18n({ const loadedLanguages = [DEFAULT_LOCALE]; function setI18nLanguage(lang: string): string { - i18n.global.locale = lang; setLanguageInDOM(lang); return lang; } diff --git a/src/views/About/PrivacyView.vue b/src/views/About/PrivacyView.vue index 290ad93a4..0d040533c 100644 --- a/src/views/About/PrivacyView.vue +++ b/src/views/About/PrivacyView.vue @@ -23,10 +23,10 @@ const { locale } = useI18n({ useScope: "global" }); const { result: configResult } = useQuery<{ config: IConfig }>( PRIVACY, () => ({ - locale: locale, + locale: locale.value, }), () => ({ - enabled: locale !== undefined, + enabled: locale.value !== undefined, }) ); diff --git a/src/views/About/TermsView.vue b/src/views/About/TermsView.vue index aa9986e85..e443dcbd8 100644 --- a/src/views/About/TermsView.vue +++ b/src/views/About/TermsView.vue @@ -26,10 +26,10 @@ const { result: termsResult, loading: termsLoading } = useQuery<{ }>( TERMS, () => ({ - locale: locale, + locale: locale.value, }), () => ({ - enabled: locale !== undefined, + enabled: locale.value !== undefined, }) );