From ae2cef58f825865ec0f8ca46f1511f87ca624a06 Mon Sep 17 00:00:00 2001
From: Chris Amico <eyeseast@gmail.com>
Date: Thu, 21 Nov 2024 15:30:34 -0500
Subject: [PATCH 1/3] Standardize on 'en', not 'en-US' as a language code, but
 register both

---
 src/hooks.server.ts                             |  2 +-
 src/lib/components/documents/Access.svelte      |  2 +-
 src/lib/components/documents/BulkActions.svelte | 14 +++++++-------
 src/lib/i18n/index.js                           |  8 +++++---
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/hooks.server.ts b/src/hooks.server.ts
index 2108c89ca..ea34925dc 100644
--- a/src/hooks.server.ts
+++ b/src/hooks.server.ts
@@ -33,7 +33,7 @@ export const handleError = Sentry.handleErrorWithSentry();
 /** @type {import('@sveltejs/kit').Handle} */
 async function language({ event, resolve }) {
   const lang =
-    event.request.headers.get("accept-language")?.split(",")[0] ?? "en-US";
+    event.request.headers.get("accept-language")?.split(",")[0] ?? "en";
 
   if (lang) {
     locale.set(lang);
diff --git a/src/lib/components/documents/Access.svelte b/src/lib/components/documents/Access.svelte
index a07c21644..a8c106197 100644
--- a/src/lib/components/documents/Access.svelte
+++ b/src/lib/components/documents/Access.svelte
@@ -30,7 +30,7 @@
 <script lang="ts">
   import { _ } from "svelte-i18n";
 
-  import type { Access } from "@/lib/api/types";
+  import type { Access } from "$lib/api/types";
   import type { Level } from "$lib/components/inputs/AccessLevel.svelte";
 
   export let level: Level;
diff --git a/src/lib/components/documents/BulkActions.svelte b/src/lib/components/documents/BulkActions.svelte
index 6692f64a6..5efc6ba4f 100644
--- a/src/lib/components/documents/BulkActions.svelte
+++ b/src/lib/components/documents/BulkActions.svelte
@@ -42,12 +42,12 @@ Most actual actions are deferred to their own forms, so this is more of a switch
   const selected: Readable<Document[]> = getContext("selected");
 
   const actions: Record<Action, ActionDetail> = {
-    share: [$_("bulk.actions.share"), Share16],
-    edit: [$_("bulk.actions.edit"), Pencil16],
-    data: [$_("bulk.actions.data"), Tag16],
-    project: [$_("bulk.actions.project"), FileDirectory16],
-    reprocess: [$_("bulk.actions.reprocess"), IssueReopened16],
-    delete: [$_("bulk.actions.delete"), Alert16],
+    share: ["bulk.actions.share", Share16],
+    edit: ["bulk.actions.edit", Pencil16],
+    data: ["bulk.actions.data", Tag16],
+    project: ["bulk.actions.project", FileDirectory16],
+    reprocess: ["bulk.actions.reprocess", IssueReopened16],
+    delete: ["bulk.actions.delete", Alert16],
   };
 
   let visible: Nullable<Action> = null;
@@ -76,7 +76,7 @@ Most actual actions are deferred to their own forms, so this is more of a switch
     }}
   >
     <svelte:component this={icon} slot="start" />
-    {label}
+    {$_(label)}
   </SidebarItem>
 {/each}
 
diff --git a/src/lib/i18n/index.js b/src/lib/i18n/index.js
index 18530068b..2c155b8a7 100644
--- a/src/lib/i18n/index.js
+++ b/src/lib/i18n/index.js
@@ -5,11 +5,13 @@ import { LANGUAGES } from "@/config/config.js";
 const defaultLocale = "en";
 
 LANGUAGES.forEach(([name, code, flag]) => {
-  if (code) {
-    register(code, () => import(`@/langs/json/${code}.json`));
-  }
+  register(code, () => import(`@/langs/json/${code}.json`));
 });
 
+// handle two-part locales
+register("en-US", () => import("@/langs/json/en.json"));
+register("en-GB", () => import("@/langs/json/en.json"));
+
 init({
   fallbackLocale: defaultLocale,
   initialLocale: browser ? window.navigator.language : defaultLocale,

From 51ba1c2b7ba04fe10ddf3cd908d999b5b4b0b240 Mon Sep 17 00:00:00 2001
From: Chris Amico <eyeseast@gmail.com>
Date: Thu, 21 Nov 2024 15:46:09 -0500
Subject: [PATCH 2/3] check

---
 src/lib/i18n/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib/i18n/index.js b/src/lib/i18n/index.js
index 2c155b8a7..e84bd85aa 100644
--- a/src/lib/i18n/index.js
+++ b/src/lib/i18n/index.js
@@ -5,7 +5,9 @@ import { LANGUAGES } from "@/config/config.js";
 const defaultLocale = "en";
 
 LANGUAGES.forEach(([name, code, flag]) => {
-  register(code, () => import(`@/langs/json/${code}.json`));
+  if (code) {
+    register(code, () => import(`@/langs/json/${code}.json`));
+  }
 });
 
 // handle two-part locales

From dd5672ee1176d0b039748dfe41721da1bc786a50 Mon Sep 17 00:00:00 2001
From: Chris Amico <eyeseast@gmail.com>
Date: Thu, 21 Nov 2024 16:42:05 -0500
Subject: [PATCH 3/3] Get two-letter code everywhere

---
 src/hooks.server.ts                  |  7 +++++--
 src/lib/i18n/index.js                |  5 ++++-
 src/lib/utils/language.ts            |  6 ++++++
 src/lib/utils/tests/language.test.ts | 19 +++++++++++++++++++
 src/routes/+layout.ts                |  8 ++++++--
 5 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 src/lib/utils/language.ts
 create mode 100644 src/lib/utils/tests/language.test.ts

diff --git a/src/hooks.server.ts b/src/hooks.server.ts
index ea34925dc..1ed6a4643 100644
--- a/src/hooks.server.ts
+++ b/src/hooks.server.ts
@@ -35,8 +35,11 @@ async function language({ event, resolve }) {
   const lang =
     event.request.headers.get("accept-language")?.split(",")[0] ?? "en";
 
-  if (lang) {
-    locale.set(lang);
+  // use en.json for en-US and such
+  const [language, ...tags] = lang.split("-");
+
+  if (language) {
+    locale.set(language);
   }
 
   return resolve(event, {
diff --git a/src/lib/i18n/index.js b/src/lib/i18n/index.js
index e84bd85aa..088a2a54d 100644
--- a/src/lib/i18n/index.js
+++ b/src/lib/i18n/index.js
@@ -1,6 +1,7 @@
 import { browser } from "$app/environment";
 import { init, register } from "svelte-i18n";
 import { LANGUAGES } from "@/config/config.js";
+import { getLanguage } from "../utils/language";
 
 const defaultLocale = "en";
 
@@ -16,5 +17,7 @@ register("en-GB", () => import("@/langs/json/en.json"));
 
 init({
   fallbackLocale: defaultLocale,
-  initialLocale: browser ? window.navigator.language : defaultLocale,
+  initialLocale: browser
+    ? getLanguage(window.navigator?.language ?? defaultLocale)
+    : defaultLocale,
 });
diff --git a/src/lib/utils/language.ts b/src/lib/utils/language.ts
new file mode 100644
index 000000000..1f89c4b81
--- /dev/null
+++ b/src/lib/utils/language.ts
@@ -0,0 +1,6 @@
+// handle language parsing here so we can test it
+
+export function getLanguage(code: string, fallback: string = "en") {
+  const [language, ...tags] = code.split("-");
+  return language || fallback;
+}
diff --git a/src/lib/utils/tests/language.test.ts b/src/lib/utils/tests/language.test.ts
new file mode 100644
index 000000000..996e8046c
--- /dev/null
+++ b/src/lib/utils/tests/language.test.ts
@@ -0,0 +1,19 @@
+import { describe, test, expect } from "vitest";
+import { getLanguage } from "../language";
+
+// code, expected
+const languages = [
+  ["en", "en"],
+  ["en-US", "en"],
+  ["en-GB", "en"],
+  ["es", "es"],
+  ["--", "en"],
+];
+
+describe("language", () => {
+  test("split language codes", () => {
+    for (const [code, expected] of languages) {
+      expect(getLanguage(code as string)).toEqual(expected);
+    }
+  });
+});
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index 8d3ab4c84..942239263 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -1,5 +1,6 @@
 import { browser } from "$app/environment";
 import { locale, waitLocale } from "svelte-i18n";
+import { getLanguage } from "$lib/utils/language";
 
 import "$lib/i18n/index.js"; // Import to initialize. Important :)
 
@@ -7,8 +8,11 @@ export const trailingSlash = "always";
 
 export async function load() {
   if (browser) {
-    const language =
-      localStorage.getItem("dc-locale") || window.navigator.language;
+    const lang = localStorage.getItem("dc-locale") || window.navigator.language;
+
+    // use en.json for en-US and such
+    const language = getLanguage(lang, "en");
+
     locale.set(language);
   }
   await waitLocale();