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

Enhace TTS initialization by better interpretation of BCP 47 language tags

Browse source
This commit is contained in:
Hardy 2020-11-07 23:11:59 +01:00 committed by GitHub
parent 19ab7b84a7
commit e9d00aef39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -191,12 +191,26 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
final float speechRate = cSpeechRate;
final String[] lsplit = (language + "____.").split("[\\_\\-]");
// constructor supports lang_country_variant
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)
// As per BCP 47: well formed scripts: [a-zA-Z]{4}, variants: [0-9][0-9a-zA-Z]{3} | [0-9a-zA-Z]{5,8}, countries/regions: [a-zA-Z]{2} | [0-9]{3}
String lregion = "";
String lvariant = "";
String lscript = "";
for (int i=3; i>0; i--) {
if (lsplit[i].length() == 4 && !(lsplit[i] + "A").substring(0, 1).matches("[0-9]")) {
lscript = lsplit[i];
} else if (lsplit[i].length() >= 4) {
lvariant = lsplit[i];
} else {
lregion = lsplit[i];
}
}
// Locale constructor supports 'language, region, variant'.
//Locale newLocale0 = new Locale(lsplit[0], lregion, lvariant); (Setting variant here seems to cause errors on some systems)
Locale newLocale0 = new Locale(lsplit[0], lregion);
// #3344: Try Locale builder instead (only available from API 21), also supports script (we support as 4 letters)
if (android.os.Build.VERSION.SDK_INT >= 21) {
try {
newLocale0 = new Locale.Builder().setLanguage(lsplit[0]).setScript(lsplit[3]).setRegion(lsplit[1]).setVariant(lsplit[2]).build();
newLocale0 = new Locale.Builder().setLanguage(lsplit[0]).setScript(lscript).setRegion(lregion).setVariant(lvariant).build();
} catch (RuntimeException e) {
// Falls back to constructor
}