Fix locales loading

mastodon · Sep 22, 2023 · 2f82d63 · 2f82d63
1 parent e0af45f
commit 2f82d63
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/app/javascript/mastodon/locales/load_locale.ts b/app/javascript/mastodon/locales/load_locale.ts
@@ -5,9 +5,7 @@ import { isLocaleLoaded, setLocale } from './global_locale';
 
 const localeLoadingSemaphore = new Semaphore(1);
 
-const localeFiles = import.meta.glob<LocaleData['messages']>([
-  './locales/*.json',
-]);
+const localeFiles = import.meta.glob<LocaleData['messages']>(['./*.json']);
 
 export async function loadLocale() {
   // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- we want to match empty strings
@@ -22,9 +20,9 @@ export async function loadLocale() {
     if (isLocaleLoaded()) return;
 
     // If there is no locale file, then fallback to english
-    const localeFile = Object.hasOwn(localeFiles, '`./locales/${locale}.json`')
-      ? localeFiles[`./locales/${locale}.json`]
-      : localeFiles[`./locales/en.json`];
+    const localeFile = Object.hasOwn(localeFiles, '`./${locale}.json`')
+      ? localeFiles[`./${locale}.json`]
+      : localeFiles[`./en.json`];
 
     const localeData = await localeFile();