Merge branch 'master' into feature/download-cboardSER

cboard-org · Apr 20, 2022 · c91d197 · c91d197
2 parents 00b9897 + f33f31c
commit c91d197
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 22 deletions.
diff --git a/src/components/Settings/Language/Language.component.js b/src/components/Settings/Language/Language.component.js
@@ -233,6 +233,39 @@ class Language extends React.Component {
     return null;
   }
 
+  getFormattedName(lang) {
+    const locale = lang.slice(0, 2).toLowerCase();
+    let name = <FormattedMessage {...messages[locale]} />;
+
+    //handle custom names
+    if (lang === 'sr-ME') {
+      name = <FormattedMessage {...messages['srme']} />;
+    }
+    return name;
+  }
+
+  getNativeName(lang) {
+    const { langs } = this.props;
+    const locale = lang.slice(0, 2).toLowerCase();
+    const showLangCode =
+      langs.filter(langCode => langCode.slice(0, 2).toLowerCase() === locale)
+        .length > 1;
+    const langCode = showLangCode ? `(${lang})` : '';
+    let nativeName = `${ISO6391.getNativeName(locale)} ${langCode}`;
+
+    //handle custom native name
+    if (lang === 'sr-ME') {
+      nativeName = 'Crnogorski jezik';
+    } else if (lang === 'sr-SP') {
+      nativeName = `Српски језик ${langCode}`;
+    } else if (lang === 'sr-RS') {
+      nativeName = `Srpski jezik ${langCode}`;
+    } else if (lang === 'pt-TL') {
+      nativeName = `Tetum`;
+    }
+    return nativeName;
+  }
+
   render() {
     const {
       langs,
@@ -260,23 +293,6 @@ class Language extends React.Component {
     const ttsEnginesNames = ttsEngines.map(tts => tts.name);
 
     const langItems = langs.map((lang, index, array) => {
-      const locale = lang.slice(0, 2).toLowerCase();
-      const showLangCode =
-        langs.filter(langCode => langCode.slice(0, 2).toLowerCase() === locale)
-          .length > 1;
-      const langCode = showLangCode ? `(${lang})` : '';
-      let nativeName = `${ISO6391.getNativeName(locale)} ${langCode}`;
-      //handle custom native name
-      if (lang === 'sr-ME') {
-        nativeName = 'Crnogorski jezik';
-      } else if (lang === 'sr-SP') {
-        nativeName = `Српски језик ${langCode}`;
-      } else if (lang === 'sr-RS') {
-        nativeName = `Srpski jezik ${langCode}`;
-      } else if (lang === 'pt-TL') {
-        nativeName = `Tetum`;
-      }
-
       const isLocalLang = localLangs.includes(lang);
 
       return (
@@ -291,8 +307,8 @@ class Language extends React.Component {
         >
           <div className="Language__LangMenuItemText">
             <ListItemText
-              primary={nativeName}
-              secondary={<FormattedMessage {...messages[locale]} />}
+              primary={this.getNativeName(lang)}
+              secondary={this.getFormattedName(lang)}
             />
             {!isLocalLang && (
               <Chip label="online" size="small" color="secondary" />
@@ -311,7 +327,7 @@ class Language extends React.Component {
     });
 
     const downloadableLangItems = downloadablesLangsOnly?.map(
-      ({ lang, langCode, nativeName, marketId, ttsName }, index, array) => {
+      ({ lang, marketId, ttsName }, index, array) => {
         const availableTts = ttsEnginesNames.includes(ttsName);
         const sameTts = ttsEngine && ttsEngine.name === ttsName;
         return (
@@ -337,8 +353,8 @@ class Language extends React.Component {
           >
             <div className="Language__LangMenuItemText">
               <ListItemText
-                primary={nativeName ? nativeName : lang}
-                secondary={<FormattedMessage {...messages[langCode]} />}
+                primary={this.getNativeName(lang)}
+                secondary={this.getFormattedName(lang)}
                 className={'Language__LangListItemText'}
               />
               {(!availableTts || sameTts) && (

diff --git a/src/components/Settings/Language/Language.messages.js b/src/components/Settings/Language/Language.messages.js
@@ -177,6 +177,10 @@ export default defineMessages({
     id: 'cboard.components.Settings.Language.albanian',
     defaultMessage: 'Albanian'
   },
+  srme: {
+    id: 'cboard.components.Settings.Language.montenegrin',
+    defaultMessage: 'Montenegrin'
+  },
   ttsEnginesSubheader: {
     id: 'cboard.components.Settings.Language.ttsEnginesSubheader',
     defaultMessage: 'Text to speech engine'