]> gitweb.fperrin.net Git - Dictionary.git/blobdiff - src/com/hughes/android/dictionary/engine/Language.java
Fixed crashes, Slovenian fix, hide up/down buttons, proper keyboard
[Dictionary.git] / src / com / hughes / android / dictionary / engine / Language.java
index 90bc3b947ab57197fa4aadb23f59aeeb49f97cbe..1955ad739ce69ddca7e34398e0368cbc27b664a7 100644 (file)
 \r
 package com.hughes.android.dictionary.engine;\r
 \r
+import com.hughes.android.dictionary.R;\r
+import com.ibm.icu.text.Collator;\r
+\r
 import java.util.ArrayList;\r
 import java.util.LinkedHashMap;\r
 import java.util.Locale;\r
 import java.util.Map;\r
 import java.util.regex.Pattern;\r
 \r
-import com.hughes.android.dictionary.R;\r
-import com.ibm.icu.text.Collator;\r
-\r
 public class Language {\r
+  \r
+  public static final class LanguageResources {\r
+    public final String englishName;\r
+    public final int nameId;\r
+    public final int flagId;\r
+    \r
+    private LanguageResources(final String englishName, int nameId, int flagId) {\r
+      this.englishName = englishName;\r
+      this.nameId = nameId;\r
+      this.flagId = flagId;\r
+    }\r
 \r
-  public static final Map<String,Integer> isoCodeToResourceId = new LinkedHashMap<String,Integer>();\r
+    private LanguageResources(final String englishName, int nameId) {\r
+      this(englishName, nameId, 0);\r
+    }\r
+}\r
+\r
+  public static final Map<String,LanguageResources> isoCodeToResources = new LinkedHashMap<String,LanguageResources>();\r
   static {\r
-    isoCodeToResourceId.put("AF", R.string.AF);\r
-    isoCodeToResourceId.put("SQ", R.string.SQ);\r
-    isoCodeToResourceId.put("AR", R.string.AR);\r
-    isoCodeToResourceId.put("HY", R.string.HY);\r
-    isoCodeToResourceId.put("BE", R.string.BE);\r
-    isoCodeToResourceId.put("BN", R.string.BN);\r
-    isoCodeToResourceId.put("BS", R.string.BS);\r
-    isoCodeToResourceId.put("BG", R.string.BG);\r
-    isoCodeToResourceId.put("CA", R.string.CA);\r
-    isoCodeToResourceId.put("HR", R.string.HR);\r
-    isoCodeToResourceId.put("CS", R.string.CS);\r
-    isoCodeToResourceId.put("ZH", R.string.ZH);\r
-    isoCodeToResourceId.put("DA", R.string.DA);\r
-    isoCodeToResourceId.put("NL", R.string.NL);\r
-    isoCodeToResourceId.put("EN", R.string.EN);\r
-    isoCodeToResourceId.put("EO", R.string.EO);\r
-    isoCodeToResourceId.put("ET", R.string.ET);\r
-    isoCodeToResourceId.put("FI", R.string.FI);\r
-    isoCodeToResourceId.put("FR", R.string.FR);\r
-    isoCodeToResourceId.put("DE", R.string.DE);\r
-    isoCodeToResourceId.put("EL", R.string.EL);\r
-    isoCodeToResourceId.put("haw", R.string.haw);\r
-    isoCodeToResourceId.put("HE", R.string.HE);\r
-    isoCodeToResourceId.put("HI", R.string.HI);\r
-    isoCodeToResourceId.put("HU", R.string.HU);\r
-    isoCodeToResourceId.put("IS", R.string.IS);\r
-    isoCodeToResourceId.put("ID", R.string.ID);\r
-    isoCodeToResourceId.put("GA", R.string.GA);\r
-    isoCodeToResourceId.put("IT", R.string.IT);\r
-    isoCodeToResourceId.put("LA", R.string.LA);\r
-    isoCodeToResourceId.put("LV", R.string.LV);\r
-    isoCodeToResourceId.put("LT", R.string.LT);\r
-    isoCodeToResourceId.put("JA", R.string.JA);\r
-    isoCodeToResourceId.put("KO", R.string.KO);\r
-    isoCodeToResourceId.put("KU", R.string.KU);\r
-    isoCodeToResourceId.put("MS", R.string.MS);\r
-    isoCodeToResourceId.put("MI", R.string.MI);\r
-    isoCodeToResourceId.put("MN", R.string.MN);\r
-    isoCodeToResourceId.put("NE", R.string.NE);\r
-    isoCodeToResourceId.put("NO", R.string.NO);\r
-    isoCodeToResourceId.put("FA", R.string.FA);\r
-    isoCodeToResourceId.put("PL", R.string.PL);\r
-    isoCodeToResourceId.put("PT", R.string.PT);\r
-    isoCodeToResourceId.put("PA", R.string.PA);\r
-    isoCodeToResourceId.put("RO", R.string.RO);\r
-    isoCodeToResourceId.put("RU", R.string.RU);\r
-    isoCodeToResourceId.put("SA", R.string.SA);\r
-    isoCodeToResourceId.put("SR", R.string.SR);\r
-    isoCodeToResourceId.put("SK", R.string.SK);\r
-    isoCodeToResourceId.put("SO", R.string.SO);\r
-    isoCodeToResourceId.put("ES", R.string.ES);\r
-    isoCodeToResourceId.put("SW", R.string.SW);\r
-    isoCodeToResourceId.put("SV", R.string.SV);\r
-    isoCodeToResourceId.put("TG", R.string.TG);\r
-    isoCodeToResourceId.put("TH", R.string.TH);\r
-    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
+    isoCodeToResources.put("AF", new LanguageResources("Afrikaans", R.string.AF));\r
+    isoCodeToResources.put("SQ", new LanguageResources("Albanian", R.string.SQ));\r
+    isoCodeToResources.put("AR", new LanguageResources("Arabic", R.string.AR));\r
+    isoCodeToResources.put("HY", new LanguageResources("Armenian", R.string.HY));\r
+    isoCodeToResources.put("BE", new LanguageResources("Belarusian", R.string.BE));\r
+    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("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
+    isoCodeToResources.put("EO", new LanguageResources("Esperanto", R.string.EO));\r
+    isoCodeToResources.put("ET", new LanguageResources("Estonian", R.string.ET));\r
+    isoCodeToResources.put("FI", new LanguageResources("Finnish", R.string.FI));\r
+    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("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
+    isoCodeToResources.put("LT", new LanguageResources("Lithuanian", R.string.LT));\r
+    isoCodeToResources.put("JA", new LanguageResources("Japanese", R.string.JA));\r
+    isoCodeToResources.put("KO", new LanguageResources("Korean", R.string.KO));\r
+    isoCodeToResources.put("KU", new LanguageResources("Kurdish", R.string.KU));\r
+    isoCodeToResources.put("MS", new LanguageResources("Malay", R.string.MS));\r
+    isoCodeToResources.put("MI", new LanguageResources("Maori", R.string.MI));\r
+    isoCodeToResources.put("MN", new LanguageResources("Mongolian", R.string.MN));\r
+    isoCodeToResources.put("NE", new LanguageResources("Nepali", R.string.NE));\r
+    isoCodeToResources.put("NO", new LanguageResources("Norwegian", R.string.NO));\r
+    isoCodeToResources.put("FA", new LanguageResources("Persian", R.string.FA));\r
+    isoCodeToResources.put("PL", new LanguageResources("Polish", R.string.PL));\r
+    isoCodeToResources.put("PT", new LanguageResources("Portuguese", R.string.PT));\r
+    isoCodeToResources.put("PA", new LanguageResources("Punjabi", R.string.PA));\r
+    isoCodeToResources.put("RO", new LanguageResources("Romanian", R.string.RO));\r
+    isoCodeToResources.put("RU", new LanguageResources("Russian", R.string.RU));\r
+    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("SL", 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
+    isoCodeToResources.put("SV", new LanguageResources("Swedish", R.string.SV));\r
+    isoCodeToResources.put("TL", new LanguageResources("Tagalog", R.string.TL));\r
+    isoCodeToResources.put("TG", new LanguageResources("Tajik", R.string.TG));\r
+    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("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>(isoCodeToResourceId.keySet())) {\r
-      isoCodeToResourceId.put(isoCode.toLowerCase(), isoCodeToResourceId.get(isoCode));\r
+    for (final String isoCode : new ArrayList<String>(isoCodeToResources.keySet())) {\r
+      isoCodeToResources.put(isoCode.toLowerCase(), isoCodeToResources.get(isoCode));\r
     }\r
+\r
   }\r
 \r
 \r
@@ -122,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
@@ -140,10 +180,16 @@ 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
+\r
+  private static final String puncChars =\r
+      "\\[\\]\\(\\)\\{\\}\\=";\r
+\r
+  private static final Pattern RTL_LEFT_BOUNDARY = Pattern.compile("(["+ puncChars +"])([" + rtlChars + "])");\r
+  private static final Pattern RTL_RIGHT_BOUNDARY = Pattern.compile("([" + rtlChars + "])(["+ puncChars +"])");\r
   \r
-  public static String fixBidiText(final String text) {\r
-    // TODO: fix me!, use me!\r
+  public static String fixBidiText(String text) {\r
+//    text = RTL_LEFT_BOUNDARY.matcher(text).replaceAll("$1\u200e $2");\r
+//    text = RTL_RIGHT_BOUNDARY.matcher(text).replaceAll("$1 \u200e$2");\r
     return text;\r
   }\r
   \r