Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-12-21 06:25:13 +01:00
commit 9f3b0e9753
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java
View file

@ -166,14 +166,14 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
ttsRequests = 0; ttsRequests = 0;
final float speechRate = cSpeechRate; final float speechRate = cSpeechRate;
Locale newLocale0 = new Locale(language); final String[] languageFields = language.split("[\\_\\-]");
// #3344: Try Locale builder instead of constructor (only available from API 21) Locale newLocale0 = new Locale(languageFields[0], languageFields[1], languageFields[2]);
// #3344: Try Locale builder instead of constructor (only available from API 21), also supports script
if (android.os.Build.VERSION.SDK_INT >= 21) { if (android.os.Build.VERSION.SDK_INT >= 21) {
try { try {
final String[] languageFields = language.split("[\\_\\-]"); newLocale0 = new Locale.Builder().setLanguage(languageFields[0]).setScript("languageFields[3]").setRegion(languageFields[1]).setVariant(languageFields[2]).build();
newLocale0 = new Locale.Builder().setLanguage(languageFields[0]).setScript("").setRegion(languageFields[1]).build();
} catch (RuntimeException e) { } catch (RuntimeException e) {
// Falls back to "new Locale(language)" // Falls back to constructor
} }
} }
final Locale newLocale = newLocale0; final Locale newLocale = newLocale0;