Finnish as default language, enable Swedish and English in production

UniversityOfHelsinkiCS · May 8, 2023 · b09df7f · b09df7f
1 parent 5aeb499
commit b09df7f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/src/client/components/NavBar/NavBar.tsx b/src/client/components/NavBar/NavBar.tsx
@@ -25,7 +25,7 @@ import { useTranslation } from 'react-i18next'
 import hyLogo from '../../assets/hy_logo.svg'
 import styles from '../../styles'
 import useLoggedInUser from '../../hooks/useLoggedInUser'
-import { inProduction, FULL_URL } from '../../../config'
+import { FULL_URL } from '../../../config'
 
 const NavBar = () => {
   const { t, i18n } = useTranslation()
@@ -35,13 +35,11 @@ const NavBar = () => {
   const anchorRef = useRef<HTMLButtonElement>(null)
 
   useEffect(() => {
-    if (!inProduction && user?.language) {
-      i18n.changeLanguage(user.language)
-    }
+    if (user?.language) i18n.changeLanguage(user.language)
   }, [user, i18n])
 
   const { language } = i18n
-  const languages = inProduction ? ['fi', 'sv'] : ['fi', 'sv', 'en']
+  const languages = ['fi', 'sv', 'en']
 
   const handleLanguageChange = (newLanguage: string) => {
     i18n.changeLanguage(newLanguage)

diff --git a/src/client/util/il18n.ts b/src/client/util/il18n.ts
@@ -4,25 +4,22 @@ import { initReactI18next } from 'react-i18next'
 import en from '../locales/en.json'
 import fi from '../locales/fi.json'
 import sv from '../locales/sv.json'
-import { inProduction } from '../../config'
 
 declare global {
   interface Window {
     __i18n__: typeof i18n
   }
 }
 
-const defaultLanguage = inProduction ? 'fi' : 'en'
-
 const initializeI18n = () =>
   i18n.use(initReactI18next).init({
     resources: {
       en,
       fi,
       sv,
     },
-    lng: defaultLanguage,
-    fallbackLng: defaultLanguage,
+    lng: 'fi',
+    fallbackLng: 'fi',
     defaultNS: 'common',
   })