Split ZH into cmn and yue.

[Dictionary.git] / src / com / hughes / android / dictionary / engine / Language.java

diff --git a/src/com/hughes/android/dictionary/engine/Language.java b/src/com/hughes/android/dictionary/engine/Language.java
index 144366d9449fb4611019ea090b736abeca7b7561..0a8d3a04a769993515c2de1da7e4de8215b85265 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/Language.java
+++ b/src/com/hughes/android/dictionary/engine/Language.java
@@ -51,10 +51,13 @@ public class Language {
     isoCodeToResources.put("BN", new LanguageResources("Bengali", R.string.BN));\r
     isoCodeToResources.put("BS", new LanguageResources("Bosnian", R.string.BS));\r
     isoCodeToResources.put("BG", new LanguageResources("Bulgarian", R.string.BG));\r
+    isoCodeToResources.put("MY", new LanguageResources("Burmese", R.string.MY));\r
+    isoCodeToResources.put("ZH", new LanguageResources("Chinese", R.string.ZH));\r
+    isoCodeToResources.put("cmn", new LanguageResources("Mandarin", R.string.cmn));\r
+    isoCodeToResources.put("yue", new LanguageResources("Cantonese", R.string.yue));\r
     isoCodeToResources.put("CA", new LanguageResources("Catalan", R.string.CA));\r
     isoCodeToResources.put("HR", new LanguageResources("Croatian", R.string.HR));\r
     isoCodeToResources.put("CS", new LanguageResources("Czech", R.string.CS));\r
-    isoCodeToResources.put("ZH", new LanguageResources("Chinese", R.string.ZH));\r
     isoCodeToResources.put("DA", new LanguageResources("Danish", R.string.DA));\r
     isoCodeToResources.put("NL", new LanguageResources("Dutch", R.string.NL));\r
     isoCodeToResources.put("EN", new LanguageResources("English", R.string.EN));\r
@@ -64,13 +67,15 @@ public class Language {
     isoCodeToResources.put("FR", new LanguageResources("French", R.string.FR));\r
     isoCodeToResources.put("DE", new LanguageResources("German", R.string.DE));\r
     isoCodeToResources.put("EL", new LanguageResources("Greek", R.string.EL));\r
+    isoCodeToResources.put("grc", new LanguageResources("Ancient Greek", R.string.grc));\r
     isoCodeToResources.put("haw", new LanguageResources("Hawaiian", R.string.haw));\r
     isoCodeToResources.put("HE", new LanguageResources("Hebrew", R.string.HE));\r
     isoCodeToResources.put("HI", new LanguageResources("Hindi", R.string.HI));\r
     isoCodeToResources.put("HU", new LanguageResources("Hungarian", R.string.HU));\r
     isoCodeToResources.put("IS", new LanguageResources("Icelandic", R.string.IS));\r
     isoCodeToResources.put("ID", new LanguageResources("Indonesian", R.string.ID));\r
-    isoCodeToResources.put("GA", new LanguageResources("Gaelic (Irish, Scottish)", R.string.GA));\r
+    isoCodeToResources.put("GA", new LanguageResources("Irish", R.string.GA));\r
+    isoCodeToResources.put("GD", new LanguageResources("Scottish Gaelic", R.string.GD));\r
     isoCodeToResources.put("IT", new LanguageResources("Italian", R.string.IT));\r
     isoCodeToResources.put("LA", new LanguageResources("Latin", R.string.LA));\r
     isoCodeToResources.put("LV", new LanguageResources("Latvian", R.string.LV));\r
@@ -92,6 +97,7 @@ public class Language {
     isoCodeToResources.put("SA", new LanguageResources("Sanskrit", R.string.SA));\r
     isoCodeToResources.put("SR", new LanguageResources("Serbian", R.string.SR));\r
     isoCodeToResources.put("SK", new LanguageResources("Slovak", R.string.SK));\r
+    isoCodeToResources.put("SK", new LanguageResources("Slovenian", R.string.SL));\r
     isoCodeToResources.put("SO", new LanguageResources("Somali", R.string.SO));\r
     isoCodeToResources.put("ES", new LanguageResources("Spanish", R.string.ES));\r
     isoCodeToResources.put("SW", new LanguageResources("Swahili", R.string.SW));\r
@@ -101,22 +107,27 @@ public class Language {
     isoCodeToResources.put("TH", new LanguageResources("Thai", R.string.TH));\r
     isoCodeToResources.put("BO", new LanguageResources("Tibetan", R.string.BO));\r
     isoCodeToResources.put("TR", new LanguageResources("Turkish", R.string.TR));\r
-    isoCodeToResources.put("UK", new LanguageResources("", R.string.UK));\r
-    isoCodeToResources.put("UR", new LanguageResources("", R.string.UR));\r
-    isoCodeToResources.put("VI", new LanguageResources("", R.string.VI));\r
-    isoCodeToResources.put("CI", new LanguageResources("", R.string.CI));\r
-    isoCodeToResources.put("YI", new LanguageResources("", R.string.YI));\r
-    isoCodeToResources.put("ZU", new LanguageResources("", R.string.ZU));\r
-\r
-    isoCodeToResources.put("AZ", new LanguageResources("", R.string.AZ));\r
-    isoCodeToResources.put("EU", new LanguageResources("", R.string.EU));\r
-    isoCodeToResources.put("BR", new LanguageResources("", R.string.BR));\r
-    isoCodeToResources.put("MR", new LanguageResources("", R.string.MR));\r
-    isoCodeToResources.put("FO", new LanguageResources("", R.string.FO));\r
-    isoCodeToResources.put("GL", new LanguageResources("", R.string.GL));\r
-    isoCodeToResources.put("HT", new LanguageResources("", R.string.HT));\r
-    isoCodeToResources.put("LB", new LanguageResources("", R.string.LB));\r
-    isoCodeToResources.put("MK", new LanguageResources("", R.string.MK));\r
+    isoCodeToResources.put("UK", new LanguageResources("Ukrainian", R.string.UK));\r
+    isoCodeToResources.put("UR", new LanguageResources("Urdu", R.string.UR));\r
+    isoCodeToResources.put("VI", new LanguageResources("Vietnamese", R.string.VI));\r
+    isoCodeToResources.put("CI", new LanguageResources("Welsh", R.string.CI));\r
+    isoCodeToResources.put("YI", new LanguageResources("Yiddish", R.string.YI));\r
+    isoCodeToResources.put("ZU", new LanguageResources("Zulu", R.string.ZU));\r
+    isoCodeToResources.put("AZ", new LanguageResources("Azeri", R.string.AZ));\r
+    isoCodeToResources.put("EU", new LanguageResources("Basque", R.string.EU));\r
+    isoCodeToResources.put("BR", new LanguageResources("Breton", R.string.BR));\r
+    isoCodeToResources.put("MR", new LanguageResources("Burmese", R.string.MR));\r
+    isoCodeToResources.put("FO", new LanguageResources("Faroese", R.string.FO));\r
+    isoCodeToResources.put("GL", new LanguageResources("Galician", R.string.GL));\r
+    isoCodeToResources.put("KA", new LanguageResources("Georgian", R.string.KA));\r
+    isoCodeToResources.put("HT", new LanguageResources("Haitian Creole", R.string.HT));\r
+    isoCodeToResources.put("LB", new LanguageResources("Luxembourgish", R.string.LB));\r
+    isoCodeToResources.put("MK", new LanguageResources("Macedonian", R.string.MK));\r
+    isoCodeToResources.put("LO", new LanguageResources("Lao", R.string.LO));\r
+    isoCodeToResources.put("ML", new LanguageResources("Malayalam", R.string.ML));\r
+    isoCodeToResources.put("SL", new LanguageResources("Slovenian", R.string.SL));\r
+    isoCodeToResources.put("TA", new LanguageResources("Tamil", R.string.TA));\r
+    isoCodeToResources.put("SH", new LanguageResources("Serbo-Croations", R.string.SH));\r
 \r
     // Hack to allow lower-case ISO codes to work:\r
     for (final String isoCode : new ArrayList<String>(isoCodeToResources.keySet())) {\r
@@ -150,10 +161,11 @@ public class Language {
   }\r
   \r
   public synchronized Collator getCollator() {\r
-    if (collator == null) {\r
+    // Don't think this is thread-safe...\r
+//    if (collator == null) {\r
       this.collator = Collator.getInstance(locale);\r
       this.collator.setStrength(Collator.IDENTICAL);\r
-    }\r
+//    }\r
     return collator;\r
   }\r
   \r