Simpler te (again)

spraakbanken · Jul 15, 2024 · fd0a864 · fd0a864
1 parent f261962
commit fd0a864
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/src/corpus/config/schema-transform.ts b/src/corpus/config/schema-transform.ts
@@ -2,13 +2,15 @@ import type { JSONSchema6 } from "json-schema";
 import { schemaWalk, type Visitor } from "@cloudflare/json-schema-walker";
 import { useI18n } from "vue-i18n";
 import { capitalize } from "lodash";
+import useLocale from "@/i18n/locale.composable";
 
 const isPropertyName = (name: string) =>
   !/^[0-9]*$/.test(name) &&
   !["properties", "allOf", "anyOf", "if", "then", "else", "not"].includes(name);
 
 export function useTransformSchema() {
-  const { t, te } = useI18n();
+  const { t } = useI18n();
+  const { te } = useLocale();
 
   function transformSchema(schema: JSONSchema6) {
     schemaWalk(schema, undefined, postFunc);

diff --git a/src/i18n/i18n.ts b/src/i18n/i18n.ts
@@ -22,11 +22,3 @@ export const languageNames = {
   sv: "Svenska",
   en: "English",
 };
-
-// Thanks @jclaveau: https://github.com/kazupon/vue-i18n/issues/1521#issuecomment-1799047164
-i18n.global.te = (key, locale?): boolean => {
-  const effectiveLocale =
-    locale && locale.length ? locale : i18n.global.locale.value;
-  const messages = i18n.global.messages.value[effectiveLocale];
-  return Object.prototype.hasOwnProperty.call(messages, key);
-};
diff --git a/src/i18n/locale.composable.ts b/src/i18n/locale.composable.ts
@@ -8,7 +8,7 @@ import type { ByLang, SvEn, SweEng } from "@/util.types";
 const storedLocale = useStorage<SvEn | "">("locale", "");
 
 export default function useLocale() {
-  const { locale } = useI18n();
+  const { locale, messages } = useI18n();
   const formkitConfig = inject(configSymbol);
 
   const exportLocale = () => {
@@ -35,6 +35,14 @@ export default function useLocale() {
     exportLocale();
   });
 
+  /**
+   * Check if translation exists.
+   * Original `te` broken as per https://github.com/kazupon/vue-i18n/issues/1521
+   */
+  function te(key: string): boolean {
+    return !!messages.value[locale.value][key];
+  }
+
   /** Translate here - picks the current language out of a strings-by-language object. */
   function th(map?: ByLang | string): string | undefined {
     if (!map) return undefined;
@@ -53,6 +61,7 @@ export default function useLocale() {
   return {
     locale,
     locale3,
+    te,
     th,
     filesize: myFilesize,
   };

diff --git a/src/message/messenger.composable.ts b/src/message/messenger.composable.ts
@@ -4,6 +4,7 @@ import remove from "lodash/remove";
 import { AxiosError } from "axios";
 import { randomString } from "@/util";
 import type { MinkResponse } from "@/api/api.types";
+import useLocale from "@/i18n/locale.composable";
 
 export type Alert = {
   key: string;
@@ -16,7 +17,8 @@ export type MessageLevel = "error" | "success" | "debug";
 const alerts = ref<Alert[]>([]);
 
 export default function useMessenger() {
-  const { t, te, locale, messages } = useI18n();
+  const { t } = useI18n();
+  const { te } = useLocale();
 
   function alert(message: string, level?: MessageLevel) {
     if (message && level !== "success") {