From ffef0c0efb3246845299afc5e1d3195063d72d9e Mon Sep 17 00:00:00 2001
From: Larbi Gharib <larbi.gharib@savoirfairelinux.com>
Date: Tue, 3 Nov 2020 15:35:45 -0500
Subject: [PATCH] Fix default language english
Change-Id: Ifa4c2f18ee6019a1cf881da31ca76fe58b8a86a4
---
.../LanguagePicker/LanguagePicker.js | 26 +++++++++++++------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/jams-react-client/src/components/LanguagePicker/LanguagePicker.js b/jams-react-client/src/components/LanguagePicker/LanguagePicker.js
index 2cd8b148..107b77c6 100644
--- a/jams-react-client/src/components/LanguagePicker/LanguagePicker.js
+++ b/jams-react-client/src/components/LanguagePicker/LanguagePicker.js
@@ -17,6 +17,13 @@ export default function LanguagePicker(props) {
const { i18n } = useTranslation();
+ const handleChange = (value) => {
+ setLanguage(value);
+ i18n.changeLanguage(value).then(()=>{
+ history.push(props.navigationTarget);
+ })
+ };
+
useEffect(() => {
fetch("/available_languages.json").then(res => res.json()).then((result) => {
const response = result.languages;
@@ -25,21 +32,24 @@ export default function LanguagePicker(props) {
response.forEach((lang) =>
{
if(result.stats[lang.code]["translated"]["percentage"] > 0.01){
- console.log(lang);
translates_languages.push(lang);
}
})
+ let exists = false;
+ translates_languages.map((option) => {
+ if (option.code === language) {
+ exists = true;
+ }
+ })
+ if (!exists ) {
+ setLanguage("en");
+ i18n.changeLanguage("en");
+ }
setLanguages(translates_languages)
})
- }, [language])
- const handleChange = (value) => {
- setLanguage(value);
- i18n.changeLanguage(value).then(()=>{
- history.push(props.navigationTarget);
- })
- };
+ }, [language])
return (
<PopupState variant="popover" popupId="demo-popup-menu">
--
GitLab