From 26d3e8eceb9c1a69ffc7b61f09e869bfeb34a6ec Mon Sep 17 00:00:00 2001 From: Hardy Date: Sat, 7 Nov 2020 23:20:41 +0100 Subject: [PATCH] Update TTSCommandPlayerImpl.java --- OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index 01f74ce763..b6e2cd103f 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -191,7 +191,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { final float speechRate = cSpeechRate; final String[] lsplit = (language + "____.").split("[\\_\\-]"); - // 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} + // 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 = ""; @@ -204,8 +204,8 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { 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 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) {