From 75f77ced203295793fac37e187934f2c80253d5c Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Sat, 5 Mar 2022 13:54:46 -0800
Subject: [PATCH] Switch locale when logging in

---
 components/AccountModal/index.tsx |  4 ++--
 components/LoginModal/index.tsx   | 13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/components/AccountModal/index.tsx b/components/AccountModal/index.tsx
index d79a26fb..87f0851a 100644
--- a/components/AccountModal/index.tsx
+++ b/components/AccountModal/index.tsx
@@ -109,8 +109,8 @@ const AccountModal = () => {
 
     function changeLanguage(newLanguage: string) {
         if (newLanguage !== router.locale) {
-            setCookies('NEXT_LOCALE', language, { path: '/'})
-            router.push(router.asPath, undefined, { locale: language })
+            setCookies('NEXT_LOCALE', newLanguage, { path: '/'})
+            router.push(router.asPath, undefined, { locale: newLanguage })
         }
     }
 
diff --git a/components/LoginModal/index.tsx b/components/LoginModal/index.tsx
index eb11dc41..831e35d5 100644
--- a/components/LoginModal/index.tsx
+++ b/components/LoginModal/index.tsx
@@ -1,5 +1,6 @@
 import React, { useState } from 'react'
 import { useCookies } from 'react-cookie'
+import Router, { useRouter } from 'next/router'
 import { useTranslation } from 'react-i18next'
 import { AxiosResponse } from 'axios'
 
@@ -25,6 +26,7 @@ interface ErrorMap {
 const emailRegex = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
 
 const LoginModal = (props: Props) => {
+    const router = useRouter()
     const { t } = useTranslation('common')
 
     // Set up form states and error handling
@@ -126,8 +128,6 @@ const LoginModal = (props: Props) => {
     function storeUserInfo(response: AxiosResponse) {
         const user = response.data.user
 
-        setCookies('NEXT_LOCALE', user.language, { path: '/' })
-
         const cookieObj = {
             picture: user.picture.picture,
             element: user.picture.element,
@@ -144,7 +144,16 @@ const LoginModal = (props: Props) => {
         }
 
         accountState.account.authorized = true
+
         setOpen(false)
+        changeLanguage(user.language)
+    }
+
+    function changeLanguage(newLanguage: string) {
+        if (newLanguage !== router.locale) {
+            setCookies('NEXT_LOCALE', newLanguage, { path: '/'})
+            router.push(router.asPath, undefined, { locale: newLanguage })
+        }
     }
 
     function openChange(open: boolean) {