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-23 22:51:09 +01:00
commit 825b571cf3
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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