Use BCP 47 locale codes for Voice.getLocale() to support the correct localization on Lollipop and later.

android/eSpeakTests/src/com/reecedunn/espeak/test/TextToSpeechTest.java

@@ -123,8 +123,8 @@ public class TextToSpeechTest extends TextToSpeechTestCase
 
             assertThat(data, is(notNullValue()));
             assertThat(voice.getName(), is(data.name));
-            assertThat(voice.getLocale().getLanguage(), is(data.javaLanguage));
-            assertThat(voice.getLocale().getCountry(), is(data.javaCountry));
+            assertThat(voice.getLocale().getLanguage(), is(data.ianaLanguage));
+            assertThat(voice.getLocale().getCountry(), is(data.ianaCountry));
             assertThat(voice.getLocale().getVariant(), is(data.variant));
             assertThat(voice.getFeatures(), is(notNullValue()));
             assertThat(voice.getFeatures().size(), is(0));
@@ -139,8 +139,8 @@ public class TextToSpeechTest extends TextToSpeechTestCase
             android.speech.tts.Voice voice2 = getEngine().getVoice();
             assertThat(voice2, is(notNullValue()));
             assertThat(voice2.getName(), is(data.name));
-            assertThat(voice2.getLocale().getLanguage(), is(data.javaLanguage));
-            assertThat(voice2.getLocale().getCountry(), is(data.javaCountry));
+            assertThat(voice2.getLocale().getLanguage(), is(data.ianaLanguage));
+            assertThat(voice2.getLocale().getCountry(), is(data.ianaCountry));
             assertThat(voice2.getLocale().getVariant(), is(data.variant));
             assertThat(voice2.getFeatures(), is(notNullValue()));
             assertThat(voice2.getFeatures().size(), is(0));

android/src/com/reecedunn/espeak/TtsService.java

@@ -220,7 +220,7 @@ public class TtsService extends TextToSpeechService {
             int latency = android.speech.tts.Voice.LATENCY_VERY_LOW;
             Locale locale = new Locale(voice.locale.getISO3Language(), voice.locale.getISO3Country(), voice.locale.getVariant());
             Set<String> features = onGetFeaturesForLanguage(locale.getLanguage(), locale.getCountry(), locale.getVariant());
-            voices.add(new android.speech.tts.Voice(voice.name, locale, quality, latency, false, features));
+            voices.add(new android.speech.tts.Voice(voice.name, voice.locale, quality, latency, false, features));
         }
         return voices;
     }