Re-enable hy-west support.

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

@@ -208,6 +208,9 @@ public class TextToSpeechTest extends TextToSpeechTestCase
                 if (data.ianaLanguage.equals("vi") && data.ianaCountry.equals("VN")) {
                     checkLanguage(data, iana2, TextToSpeech.LANG_COUNTRY_AVAILABLE, data.javaLanguage, data.javaCountry, "hue");
                     checkLanguage(data, java2, TextToSpeech.LANG_COUNTRY_AVAILABLE, data.javaLanguage, data.javaCountry, "hue");
+                } else if (data.ianaLanguage.equals("hy") && data.ianaCountry.equals("AM")) {
+                    checkLanguage(data, iana2, TextToSpeech.LANG_COUNTRY_AVAILABLE, data.javaLanguage, data.javaCountry, "arevmda");
+                    checkLanguage(data, java2, TextToSpeech.LANG_COUNTRY_AVAILABLE, data.javaLanguage, data.javaCountry, "arevmda");
                 } else {
                     checkLanguage(data, iana2, TextToSpeech.LANG_COUNTRY_AVAILABLE, data.javaLanguage, data.javaCountry, "");
                     checkLanguage(data, java2, TextToSpeech.LANG_COUNTRY_AVAILABLE, data.javaLanguage, data.javaCountry, "");

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

@@ -114,7 +114,7 @@ public class VoiceData
         new Voice("hr",          "europe/hr",    "hr",  "hrv", "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Croatian",                         "hrv",              "Ovo je primjer teksta izgovorenog na hrvatski"),
         new Voice("hu",          "europe/hu",    "hu",  "hun", "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Hungarian",                        "hun",              "Ez egy magyar nyelven felolvasott szöveg mintája."),
         new Voice("hy",          "asia/hy",      "hy",  "hye", "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Armenian",                         "hye",              "This is a sample of text spoken in Armenian", "This is a sample of text spoken in հայերեն"),
-//      new Voice("hy-west",     "asia/hy-west", "hy",  "hye", "",    "",    "arevmda",  SpeechSynthesis.GENDER_MALE,        "Armenian (Western)",               "hye-arevmda",      "This is a sample of text spoken in Armenian (Western Armenian)", "This is a sample of text spoken in հայերեն (AREVMDA)"),
+        new Voice("hy-west",     "asia/hy-west", "hy",  "hye", "AM",  "ARM", "arevmda",  SpeechSynthesis.GENDER_MALE,        "Armenian (Western)",               "hye-ARM-arevmda",  "This is a sample of text spoken in Armenian (Armenia,Western Armenian)", "This is a sample of text spoken in հայերեն (Հայաստան,AREVMDA)", "This is a sample of text spoken in հայերեն (Հայաստան,արեւմտահայերէն)"),
         new Voice("ia",          "other/ia",     "ia",  "ina", "",    "",    "",         SpeechSynthesis.GENDER_UNSPECIFIED, "Interlingua",                      "ina",              "This is a sample of text spoken in Interlingua"),
         new Voice("id",          "asia/id",      "in",  "ind", "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Indonesia",                        "ind",              "Ini adalah sebuah contoh teks yang diucapkan di Bahasa Indonesia"), // NOTE: 'id' is the correct ISO 639-1 code, but Android/Java uses 'in'.
         new Voice("is",          "europe/is",    "is",  "isl", "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Icelandic",                        "isl",              "This is a sample of text spoken in íslenska", "This is a sample of text spoken in Icelandic"),

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

@@ -428,6 +428,7 @@ public class SpeechSynthesis {
         mJavaToIanaLanguageCode.put("vie", "vi");
         mJavaToIanaLanguageCode.put("zho", "zh");
 
+        mJavaToIanaCountryCode.put("ARM", "AM");
         mJavaToIanaCountryCode.put("BEL", "BE");
         mJavaToIanaCountryCode.put("BRA", "BR");
         mJavaToIanaCountryCode.put("FRA", "FR");
@@ -447,7 +448,7 @@ public class SpeechSynthesis {
         mLocaleFixes.put("en-wi", new Locale("en", "JM"));
         mLocaleFixes.put("es-la", new Locale("es", "MX"));
         mLocaleFixes.put("fa-pin", null); // Script tags not supported.
-        mLocaleFixes.put("hy-west", null); // language-variant locales not supported.
+        mLocaleFixes.put("hy-west", new Locale("hy", "AM", "arevmda")); // hy-arevmda crashes on Android 5.0
         mLocaleFixes.put("vi-hue", new Locale("vi", "VN", "hue"));
         mLocaleFixes.put("vi-sgn", new Locale("vi", "VN", "saigon"));
         mLocaleFixes.put("zh-yue", new Locale("zh", "HK"));