fix(lang): fixed initial language

keep-around/4f8e7ffa089f2a879d0dfb99a1b582a24814399e
Rakov Roman 3 years ago
parent af97087ab7
commit 4f8e7ffa08
  1. 2
      src/features/AuthServiceApp/index.tsx
  2. 5
      src/helpers/languageUrlParam/index.tsx

@ -17,7 +17,7 @@ setClientTitleAndDescription(client.title, client.description)
setClientIcons(client.name) setClientIcons(client.name)
const Background = client.background const Background = client.background
const initialLanguage = getLanguageUrlParam() || client.defaultLanguage const initialLanguage = getLanguageUrlParam()
const AuthServiceApp = () => ( const AuthServiceApp = () => (
<BrowserRouter> <BrowserRouter>

@ -1,10 +1,13 @@
import isNull from 'lodash/isNull'
import { history } from 'config/history' import { history } from 'config/history'
import { client } from 'config/clients'
const KEY = 'lang' const KEY = 'lang'
export const getLanguageUrlParam = () => { export const getLanguageUrlParam = () => {
const lang = new URLSearchParams(history.location.search).get(KEY) const lang = new URLSearchParams(history.location.search).get(KEY)
return lang || undefined return (lang !== 'null' && !isNull(lang)) ? lang : client.defaultLanguage
} }
export const addLanguageUrlParam = (lang: string, url: string) => { export const addLanguageUrlParam = (lang: string, url: string) => {

Loading…
Cancel
Save