Major refactor of down dictionary list is stored by app.

[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 fcf74f1e97bc1564cd660936bd01674c596b78b9..90bc3b947ab57197fa4aadb23f59aeeb49f97cbe 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/Language.java
+++ b/src/com/hughes/android/dictionary/engine/Language.java
@@ -14,6 +14,7 @@
 \r
 package com.hughes.android.dictionary.engine;\r
 \r
+import java.util.ArrayList;\r
 import java.util.LinkedHashMap;\r
 import java.util.Locale;\r
 import java.util.Map;\r
@@ -84,10 +85,16 @@ public class Language {
     isoCodeToResourceId.put("BO", R.string.BO);\r
     isoCodeToResourceId.put("TR", R.string.TR);\r
     isoCodeToResourceId.put("UK", R.string.UK);\r
+    isoCodeToResourceId.put("UR", R.string.UR);\r
     isoCodeToResourceId.put("VI", R.string.VI);\r
     isoCodeToResourceId.put("CI", R.string.CI);\r
     isoCodeToResourceId.put("YI", R.string.YI);\r
     isoCodeToResourceId.put("ZU", R.string.ZU);\r
+    \r
+    // Hack to allow lower-case ISO codes to work:\r
+    for (final String isoCode : new ArrayList<String>(isoCodeToResourceId.keySet())) {\r
+      isoCodeToResourceId.put(isoCode.toLowerCase(), isoCodeToResourceId.get(isoCode));\r
+    }\r
   }\r
 \r
 \r
@@ -133,10 +140,11 @@ public class Language {
    */\r
   private static final String rtlChars =\r
       "\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC";\r
-  private static final Pattern RTL_TOKEN = Pattern.compile("[" + rtlChars + "]+");\r
+  private static final Pattern RTL_TOKEN = Pattern.compile("[" + rtlChars + "]");\r
   \r
   public static String fixBidiText(final String text) {\r
-    return RTL_TOKEN.matcher(text).replaceAll("\u200e $0 \u200e");\r
+    // TODO: fix me!, use me!\r
+    return text;\r
   }\r
   \r
   // ----------------------------------------------------------------\r