Update manifest for launch!

[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..8136120abfbcc268801f59edf537e6373ced75d0 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/Language.java
+++ b/src/com/hughes/android/dictionary/engine/Language.java
@@ -101,22 +101,23 @@ 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
+\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
 \r
     // Hack to allow lower-case ISO codes to work:\r
     for (final String isoCode : new ArrayList<String>(isoCodeToResources.keySet())) {\r
@@ -150,10 +151,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