Skip to content

A continuation of HomeBox the inventory and organization system built for the Home User

add override locale selector for dates and currencies (#648)

Tonya89aaa8c595cf
diff --git a/frontend/components/App/LanguageSelector.vue b/frontend/components/App/LanguageSelector.vue
index 90a8c723..56bc5c1e 100644
--- a/frontend/components/App/LanguageSelector.vue
+++ b/frontend/components/App/LanguageSelector.vue
@@ -1,31 +1,51 @@
<script setup lang="ts">
import { computed } from "vue";
+ import * as Locales from "date-fns/locale";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
import { Label } from "@/components/ui/label";
import { fmtDate } from "~~/composables/use-formatters";
import { useViewPreferences } from "~~/composables/use-preferences";
+ const preferences = useViewPreferences();
+
+ const locales = Object.values(Locales).map(l => {
+ return {
+ code: l.code,
+ name: new Intl.DisplayNames([preferences.value.language ?? "en-US"], { type: "language" }).of(l.code) ?? l.code,
+ localName: new Intl.DisplayNames([l.code], { type: "language" }).of(l.code) ?? l.code,
+ };
+ });
+
defineProps({
- includeText: {
+ expanded: {
type: Boolean,
default: true,
},
});
- const preferences = useViewPreferences();
-
function setLanguage(lang: string) {
preferences.value.language = lang;
}
+ function setOverrideLocale(locale: string | undefined) {
+ if (locale === undefined || locale === preferences.value.overrideFormatLocale) {
+ preferences.value.overrideFormatLocale = undefined;
+ } else {
+ preferences.value.overrideFormatLocale = locale;
+ }
+ }
+
const dateExample = computed(() => {
+ // hack to force vue to update
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ const locale = preferences.value.overrideFormatLocale;
return fmtDate(new Date(Date.now() - 15 * 60000), "relative");
});
</script>
<template>
- <div class="w-full" :class="{ 'p-5 pt-0': includeText }">
- <Label v-if="includeText" for="language"> {{ $t("profile.language") }} </Label>
+ <div class="w-full" :class="{ 'p-5 pt-0': expanded }">
+ <Label v-if="expanded" for="language"> {{ $t("profile.language") }} </Label>
<Select
id="language"
v-model="$i18n.locale"
@@ -44,8 +64,27 @@
</SelectItem>
</SelectContent>
</Select>
- <p v-if="includeText" class="m-2 text-sm">
- {{ $t("profile.example") }}: {{ $t("global.created") }} {{ dateExample }}
- </p>
+ <template v-if="expanded">
+ <Label for="overrideLocale"> {{ $t("profile.override_locale") }} </Label>
+ <Select
+ id="overrideLocale"
+ :model-value="preferences.overrideFormatLocale"
+ @update:model-value="
+ val => {
+ setOverrideLocale(val?.toString());
+ }
+ "
+ >
+ <SelectTrigger>
+ <SelectValue :placeholder="$t('profile.no_override')" />
+ </SelectTrigger>
+ <SelectContent>
+ <SelectItem v-for="locale in locales" :key="locale.code" :value="locale.code">
+ {{ locale.name }} - ({{ locale.localName }})
+ </SelectItem>
+ </SelectContent>
+ </Select>
+ <p class="m-2 text-sm">{{ $t("profile.example") }}: {{ $t("global.created") }} {{ dateExample }}</p>
+ </template>
</div>
</template>
diff --git a/frontend/composables/use-formatters.ts b/frontend/composables/use-formatters.ts
index 91cf9bf1..77e7a687 100644
--- a/frontend/composables/use-formatters.ts
+++ b/frontend/composables/use-formatters.ts
@@ -29,6 +29,11 @@ export type DateTimeType = "date" | "time" | "datetime";
export function getLocaleCode() {
const { $i18nGlobal } = useNuxtApp();
+ const preferences = useViewPreferences();
+ // TODO: make reactive
+ if (preferences.value.overrideFormatLocale) {
+ return preferences.value.overrideFormatLocale;
+ }
return ($i18nGlobal?.locale?.value as string) ?? "en-US";
}
diff --git a/frontend/composables/use-preferences.ts b/frontend/composables/use-preferences.ts
index 924e7be0..2b6de1aa 100644
--- a/frontend/composables/use-preferences.ts
+++ b/frontend/composables/use-preferences.ts
@@ -14,6 +14,7 @@ export type LocationViewPreferences = {
tableHeaders?: TableHeaderType[];
displayHeaderDecor: boolean;
language?: string;
+ overrideFormatLocale?: string;
};
/**
@@ -32,6 +33,7 @@ export function useViewPreferences(): Ref<LocationViewPreferences> {
itemsPerTablePage: 10,
displayHeaderDecor: true,
language: null,
+ overrideFormatLocale: null,
},
{ mergeDefaults: true }
);
diff --git a/frontend/locales/en.json b/frontend/locales/en.json
index 48c6b11c..38fa489a 100644
--- a/frontend/locales/en.json
+++ b/frontend/locales/en.json
@@ -279,9 +279,9 @@
"zh-CN": "Chinese (Simplified)",
"zh-HK": "Chinese (Hong Kong)",
"zh-MO": "Chinese (Macau)",
- "zh-TW": "Chinese (Traditional)"
+ "zh-TW": "Chinese (Traditional)",
+ "sq-AL": "Albanian"
},
- "languages.sq-AL": "Albanian",
"locations": {
"child_locations": "Child Locations",
"collapse_tree": "Collapse Tree",
@@ -351,6 +351,8 @@
"group_settings_sub": "Shared Group Settings. You may need to refresh your browser for some settings to apply.",
"inactive": "Inactive",
"language": "Language",
+ "override_locale": "Override Date and Currency Language",
+ "no_override": "No override",
"new_password": "New Password",
"no_notifiers": "No notifiers configured",
"notifier_modal": "{ type, select, true {Edit} false {Create} other {Other}} Notifier",
diff --git a/frontend/pages/index.vue b/frontend/pages/index.vue
index 685abce4..b15d7330 100644
--- a/frontend/pages/index.vue
+++ b/frontend/pages/index.vue
@@ -202,7 +202,7 @@
<TooltipContent>{{ $t("global.read_docs") }}</TooltipContent>
</Tooltip>
- <LanguageSelector class="z-10 text-primary" :include-text="false" />
+ <LanguageSelector class="z-10 text-primary" :expanded="false" />
</div>
</TooltipProvider>
</header>