2 files changed, 18 insertions, 14 deletions
diff --git a/src/locale/i18n.ts b/src/locale/i18n.ts
index 73fa785ea..2b9be60a4 100644
--- a/src/locale/i18n.ts
+++ b/src/locale/i18n.ts
@@ -1,8 +1,9 @@
-import {useLanguagePrefs} from '#/state/preferences'
-import {i18n} from '@lingui/core'
 import {useEffect} from 'react'
-import {messages as messagesEn} from './locales/en/messages'
-import {messages as messagesHi} from './locales/hi/messages'
+import {i18n} from '@lingui/core'
+
+import {useLanguagePrefs} from '#/state/preferences'
+import {messages as messagesEn} from '#/locale/locales/en/messages'
+import {messages as messagesHi} from '#/locale/locales/hi/messages'
 
 export const locales = {
   en: 'English',
@@ -18,15 +19,10 @@ export const defaultLocale = 'en'
  * @param locale any locale string
  */
 export async function dynamicActivate(locale: string) {
-  if (locale === 'en') {
-    i18n.loadAndActivate({locale, messages: messagesEn})
-    return
-  } else if (locale === 'hi') {
+  if (locale === 'hi') {
     i18n.loadAndActivate({locale, messages: messagesHi})
-    return
   } else {
     i18n.loadAndActivate({locale, messages: messagesEn})
-    return
   }
 }
 
diff --git a/src/locale/i18n.web.ts b/src/locale/i18n.web.ts
index 0ea69d1ae..18b05fb8e 100644
--- a/src/locale/i18n.web.ts
+++ b/src/locale/i18n.web.ts
@@ -1,6 +1,7 @@
-import {useLanguagePrefs} from '#/state/preferences'
-import {i18n} from '@lingui/core'
 import {useEffect} from 'react'
+import {i18n} from '@lingui/core'
+
+import {useLanguagePrefs} from '#/state/preferences'
 
 export const locales = {
   en: 'English',
@@ -16,8 +17,15 @@ export const defaultLocale = 'en'
  * @param locale any locale string
  */
 export async function dynamicActivate(locale: string) {
-  const {messages} = await import(`./locales/${locale}/messages`)
-  i18n.load(locale, messages)
+  let mod: any
+
+  if (locale === 'hi') {
+    mod = await import(`./locales/hi/messages`)
+  } else {
+    mod = await import(`./locales/en/messages`)
+  }
+
+  i18n.load(locale, mod.messages)
   i18n.activate(locale)
 }