From 57ec87ab2452d5e72c7c21619f1d154e551a4af3 Mon Sep 17 00:00:00 2001
From: Tim Haasdyk <tim_haasdyk@sil.org>
Date: Fri, 2 Feb 2024 12:09:49 +0100
Subject: [PATCH] Always use English and hide display language select

---
 frontend/src/lib/i18n/index.ts                       |  7 ++++++-
 .../src/routes/(authenticated)/user/+page.svelte     |  6 +++---
 .../routes/(unauthenticated)/register/+page.svelte   | 12 +++++++-----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/frontend/src/lib/i18n/index.ts b/frontend/src/lib/i18n/index.ts
index 4a4793bf0b..0b769e4a9a 100644
--- a/frontend/src/lib/i18n/index.ts
+++ b/frontend/src/lib/i18n/index.ts
@@ -7,12 +7,17 @@ import { availableLocales as _availableLocales, registerAll } from '$locales';
 import type { Get } from 'type-fest';
 
 export const availableLocales = Object.freeze([..._availableLocales].sort()) as readonly [string, ...string[]];
+export function getLanguageCodeFromNavigator(): string | undefined {
+  // Keep the language code. Discard the country code.
+  return getLocaleFromNavigator()?.split('-')[0];
+}
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 export async function loadI18n(useLocale?: string): Promise<void> {
   registerAll();
   init({
     fallbackLocale: 'en',
-    initialLocale: useLocale ?? getLocaleFromNavigator()?.split('-')[0] ?? 'en',
+    initialLocale: /* useLocale ?? getLanguageCodeFromNavigator() ?? */ 'en',
   });
   await waitLocale();
 }
diff --git a/frontend/src/routes/(authenticated)/user/+page.svelte b/frontend/src/routes/(authenticated)/user/+page.svelte
index 477b90aafb..a6523f42fa 100644
--- a/frontend/src/routes/(authenticated)/user/+page.svelte
+++ b/frontend/src/routes/(authenticated)/user/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { useEmailResult, useRequestedEmail } from '$lib/email/EmailVerificationStatus.svelte';
-  import { DisplayLanguageSelect, Form, FormError, Input, SubmitButton, lexSuperForm } from '$lib/forms';
+  import { Form, FormError, Input, SubmitButton, lexSuperForm } from '$lib/forms';
   import t from '$lib/i18n';
   import { TitlePage } from '$lib/layout';
   import { _changeUserAccountData } from './+page';
@@ -92,9 +92,9 @@
       error={$errors.email}
       bind:value={$form.email}
     />
-    <DisplayLanguageSelect
+    <!-- <DisplayLanguageSelect
       bind:value={$form.locale}
-    />
+    /> -->
     <FormError error={$message} />
     <SubmitButton loading={$submitting}>{$t('account_settings.button_update')}</SubmitButton>
   </Form>
diff --git a/frontend/src/routes/(unauthenticated)/register/+page.svelte b/frontend/src/routes/(unauthenticated)/register/+page.svelte
index dadf866ef1..2ed021f49b 100644
--- a/frontend/src/routes/(unauthenticated)/register/+page.svelte
+++ b/frontend/src/routes/(unauthenticated)/register/+page.svelte
@@ -1,14 +1,16 @@
 <script lang="ts">
   import { goto } from '$app/navigation';
-  import { SubmitButton, FormError, Input, ProtectedForm, lexSuperForm, passwordFormRules, DisplayLanguageSelect } from '$lib/forms';
-  import t, { availableLocales } from '$lib/i18n';
+  import { SubmitButton, FormError, Input, ProtectedForm, lexSuperForm, passwordFormRules } from '$lib/forms';
+  import t, { availableLocales, getLanguageCodeFromNavigator } from '$lib/i18n';
   import { TitlePage } from '$lib/layout';
   import { register } from '$lib/user';
   import { locale } from 'svelte-intl-precompile';
   import { z } from 'zod';
 
   let turnstileToken = '';
-  const currLocale = $locale;
+  // $locale is the locale that our i18n picked for them (i.e. the best available option we have for them)
+  // getLanguageCodeFromNavigator() gives us the language/locale they probably actually want. Maybe we'll support it in the future.
+  const currLocale = getLanguageCodeFromNavigator() ?? $locale;
   const formSchema = z.object({
     name: z.string().min(1, $t('register.name_missing')),
     email: z.string().email($t('register.email')),
@@ -54,9 +56,9 @@
       error={$errors.password}
       autocomplete="new-password"
     />
-    <DisplayLanguageSelect
+    <!-- <DisplayLanguageSelect
       bind:value={$form.locale}
-    />
+    /> -->
     <FormError error={$message} />
     <SubmitButton loading={$submitting}>{$t('register.button_register')}</SubmitButton>
   </ProtectedForm>