Rename LocalizationKey to Locale

ajuvonen · May 28, 2024 · f7152c5 · f7152c5
1 parent b9b540e
commit f7152c5
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/src/constants.ts b/src/constants.ts
@@ -1,4 +1,4 @@
-import type {LocalizationKey} from '@/types';
+import type {Locale} from '@/types';
 
 export const ACTIVITIES = [
   'badminton',
@@ -22,12 +22,12 @@ export const ACTIVITIES = [
   'walking',
 ];
 
-export const DATE_FORMATS: {[key in LocalizationKey]: string} = {
+export const DATE_FORMATS: {[key in Locale]: string} = {
   en: 'MM/dd/y',
   fi: 'd.M.y',
 };
 
-export const SHORT_DATE_FORMATS: {[key in LocalizationKey]: string} = {
+export const SHORT_DATE_FORMATS: {[key in Locale]: string} = {
   en: 'MM/dd',
   fi: 'd.M',
 };

diff --git a/src/hooks/weekdays.ts b/src/hooks/weekdays.ts
@@ -4,6 +4,7 @@ import {useScheduleStore} from '@/stores/schedule';
 import {useI18n} from 'vue-i18n';
 import {DateTime} from 'luxon';
 import {DATE_FORMATS, SHORT_DATE_FORMATS, WEEKDAYS} from '@/constants';
+import type {Locale} from '@/types';
 
 export default function useWeekDays() {
   const scheduleStore = useScheduleStore();
@@ -30,12 +31,14 @@ export default function useWeekDays() {
   });
 
   const getDateInterval = computed(() => (weekIndex: number) => {
-    const formattedStart = getWeekStart.value(weekIndex).toFormat(DATE_FORMATS[locale.value]);
+    const formattedStart = getWeekStart
+      .value(weekIndex)
+      .toFormat(DATE_FORMATS[locale.value as Locale]);
     const formattedEnd = getWeekStart
       .value(weekIndex)
       .plus({days: 6})
       .endOf('day')
-      .toFormat(DATE_FORMATS[locale.value]);
+      .toFormat(DATE_FORMATS[locale.value as Locale]);
     return `${formattedStart} - ${formattedEnd}`;
   });
 
@@ -51,7 +54,7 @@ export default function useWeekDays() {
       getWeekStart
         .value(weekIndex)
         .plus({days: dayIndex})
-        .toFormat(SHORT_DATE_FORMATS[locale.value]),
+        .toFormat(SHORT_DATE_FORMATS[locale.value as Locale]),
   );
 
   return {weekdays, shortWeekdays, getDateInterval, getDisplayWeekNumber, getShortDate};

diff --git a/src/i18n/index.ts b/src/i18n/index.ts
@@ -1,11 +1,11 @@
 import {createI18n} from 'vue-i18n';
-import type {LocalizationKey} from '@/types';
+import type {Locale} from '@/types';
 import en from './en.json';
 import fi from './fi.json';
 
 type MessageSchema = typeof en;
 
-export default createI18n<[MessageSchema], LocalizationKey>({
+export default createI18n<[MessageSchema], Locale>({
   locale: 'en',
   fallbackLocale: 'en',
   legacy: false,

diff --git a/src/types/index.ts b/src/types/index.ts
@@ -1,4 +1,4 @@
-export type LocalizationKey = 'en' | 'fi';
+export type Locale = 'en' | 'fi';
 
 export type Rating = 1 | 2 | 3 | 4 | 5 | null;
 

diff --git a/src/views/SettingsView.vue b/src/views/SettingsView.vue
@@ -9,6 +9,7 @@ import {useScheduleStore} from '@/stores/schedule';
 import useLocalizedActivities from '@/hooks/localizedActivities';
 import useValidatedRef from '@/hooks/validatedRef';
 import {DATE_FORMATS} from '@/constants';
+import type {Locale} from '@/types';
 import {decimalRegex, getIcon} from '@/utils';
 import BaseView from '@/components/BaseView.vue';
 
@@ -86,7 +87,7 @@ const [duration, durationErrors] = useValidatedRef(settings, 'defaultDuration',
         :min-date="DateTime.now().minus({years: 1}).toJSDate()"
         :locale="$i18n.locale"
         :clearable="false"
-        :format="DATE_FORMATS[$i18n.locale]"
+        :format="DATE_FORMATS[$i18n.locale as Locale]"
         :teleport="true"
       >
         <template #dp-input="{value, onClear, openMenu}">