Merge pull request #689 from cboard-org/hotfix-me

Fix that Montenegrin is showed under Serbian language
cboard-org · Apr 28, 2020 · 84eb8a0 · 84eb8a0
2 parents 138b4fb + 1fa80a5
commit 84eb8a0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/src/components/Settings/Language/Language.component.js b/src/components/Settings/Language/Language.component.js
@@ -63,9 +63,9 @@ const Language = ({
       >
         <ListItemText
           primary={
-            locale !== 'me'
+            lang !== 'sr-ME'
               ? `${ISO6391.getNativeName(locale)} ${langCode}`
-              : `crnogorski jezik ${langCode}`
+              : `Crnogorski jezik`
           }
           secondary={<FormattedMessage {...messages[locale]} />}
         />

diff --git a/src/components/Settings/Speech/Speech.component.js b/src/components/Settings/Speech/Speech.component.js
@@ -30,6 +30,13 @@ const styles = theme => ({
   }
 });
 
+const getVoiceLabel = voice => {
+  if (voice.name === 'srpski Crna Gora') {
+    return voice.voiceURI;
+  }
+  return isCordova() ? voice.name + ' - ' + voice.voiceURI : voice.name;
+};
+
 const Speech = ({
   anchorEl,
   classes,
@@ -65,9 +72,7 @@ const Speech = ({
           >
             <ListItemText
               primary={<FormattedMessage {...messages.voice} />}
-              secondary={
-                isCordova() ? voice.name + ' - ' + voice.voiceURI : voice.name
-              }
+              secondary={getVoiceLabel(voice)}
             />
           </ListItem>
           <ListItem divider aria-label={intl.formatMessage(messages.pitch)}>
@@ -116,7 +121,7 @@ const Speech = ({
             selected={index === selectedVoiceIndex}
             onClick={() => handleMenuItemClick(voice, index)}
           >
-            {isCordova() ? voice.name + ' - ' + voice.voiceURI : voice.name}
+            {getVoiceLabel(voice)}
           </MenuItem>
         ))}
       </Menu>

diff --git a/src/translations/sr-ME.json b/src/translations/sr-ME.json
@@ -301,7 +301,7 @@
   "cboard.components.Settings.Language.russian": "Ruski",
   "cboard.components.Settings.Language.sinhala": "cejlonski",
   "cboard.components.Settings.Language.slovak": "Slovački",
-  "cboard.components.Settings.Language.serbian": "Srpski Crna Gora",
+  "cboard.components.Settings.Language.serbian": "Crnogorski jezik",
   "cboard.components.Settings.Language.swedish": "Švedski",
   "cboard.components.Settings.Language.thai": "tajlandski",
   "cboard.components.Settings.Language.turkish": "Turski",

diff --git a/src/translations/sr-RS.json b/src/translations/sr-RS.json
@@ -301,7 +301,7 @@
   "cboard.components.Settings.Language.russian": "ruski",
   "cboard.components.Settings.Language.sinhala": "Sinhala",
   "cboard.components.Settings.Language.slovak": "slovački",
-  "cboard.components.Settings.Language.serbian": "srpski Srbija",
+  "cboard.components.Settings.Language.serbian": "Srpski jezik",
   "cboard.components.Settings.Language.swedish": "švedski",
   "cboard.components.Settings.Language.thai": "tajlandski",
   "cboard.components.Settings.Language.turkish": "turski",