Merge pull request #687 from cboard-org/support-alfanum-sr-ME

Support for the new montenegrin TTS from Alfanum
cboard-org · Apr 23, 2020 · 138b4fb · 138b4fb
2 parents 3ef3fd5 + b0fcfd5
commit 138b4fb
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 40 deletions.
diff --git a/src/components/App/App.constants.js b/src/components/App/App.constants.js
@@ -30,7 +30,6 @@ export const APP_LANGS = [
   'ja-JP',
   'km-KH',
   'ko-KR',
-  'me-ME',
   'ne-NP',
   'nl-NL',
   'no-NO',
@@ -42,6 +41,7 @@ export const APP_LANGS = [
   'ru-RU',
   'si-LK',
   'sk-SK',
+  'sr-ME',
   'sr-SP',
   'sr-RS',
   'sv-SE',

diff --git a/src/components/Settings/Settings.container.js b/src/components/Settings/Settings.container.js
@@ -27,11 +27,6 @@ export class SettingsContainer extends Component {
               supportedLangs = sLanguages;
             }
           }
-          // hack just for alfanum voice
-          if (supportedLangs.length === 1 && supportedLangs[0] === 'sr-RS') {
-            supportedLangs.push('hr-HR');
-            supportedLangs.push('me-ME');
-          }
           setLangs(supportedLangs);
         }
       });

diff --git a/src/providers/SpeechProvider/SpeechProvider.container.js b/src/providers/SpeechProvider/SpeechProvider.container.js
@@ -34,13 +34,6 @@ export class SpeechProvider extends Component {
           supportedLangs = sLanguages;
         }
       }
-      // hack just for alfanum voice
-      if (
-        supportedLangs.length &&
-        (supportedLangs.includes('sr-RS') || supportedLangs.includes('sr-ME'))
-      ) {
-        supportedLangs.push('me-ME');
-      }
       const lang = supportedLangs.includes(propsLang)
         ? propsLang
         : this.getDefaultLang(supportedLangs);

diff --git a/src/providers/SpeechProvider/SpeechProvider.reducer.js b/src/providers/SpeechProvider/SpeechProvider.reducer.js
@@ -57,31 +57,14 @@ function speechProviderReducer(state = initialState, action) {
         }
       };
     case CHANGE_LANG:
-      // hack just for alfanum voice
-      if (
-        action.lang === 'sr-RS' ||
-        action.lang === 'sr-ME' ||
-        action.lang === 'me-ME'
-      ) {
-        return {
-          ...state,
-          options: {
-            ...state.options,
-            lang: action.lang,
-            voiceURI: getVoiceURI(action.lang, state.voices)
-          },
-          langs: ['me-ME', 'sr-ME', 'sr-RS']
-        };
-      } else {
-        return {
-          ...state,
-          options: {
-            ...state.options,
-            lang: action.lang,
-            voiceURI: getVoiceURI(action.lang, state.voices)
-          }
-        };
-      }
+      return {
+        ...state,
+        options: {
+          ...state.options,
+          lang: action.lang,
+          voiceURI: getVoiceURI(action.lang, state.voices)
+        }
+      };
     case CHANGE_PITCH:
       return { ...state, options: { ...state.options, pitch: action.pitch } };
     case CHANGE_RATE:

diff --git a/src/translations/me-ME.json → src/translations/sr-ME.json b/src/translations/me-ME.json → 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",
+  "cboard.components.Settings.Language.serbian": "Srpski Crna Gora",
   "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",
+  "cboard.components.Settings.Language.serbian": "srpski Srbija",
   "cboard.components.Settings.Language.swedish": "švedski",
   "cboard.components.Settings.Language.thai": "tajlandski",
   "cboard.components.Settings.Language.turkish": "turski",