Fixes for Malay$ and reorderings due to new ICU4J.

[DictionaryPC.git] / src / com / hughes / android / dictionary / parser / wiktionary / WiktionaryLangs.java

diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java b/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java
index 6341fa9e2c6c19df199e2c5f5f008771c6284ade..3af9a139a63f9e6e21e43af3b6ed1eda7e6e5bfa 100644 (file)
--- a/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java
+++ b/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java
@@ -101,13 +101,14 @@ public class WiktionaryLangs {
     isoCodeToEnWikiName.put("AZ", "Azeri");
     isoCodeToEnWikiName.put("EU", "Basque");
     isoCodeToEnWikiName.put("BR", "Breton");
-    isoCodeToEnWikiName.put("MR", "Burmese");
+    isoCodeToEnWikiName.put("MR", "Marathi");
     isoCodeToEnWikiName.put("FO", "Faroese");
     isoCodeToEnWikiName.put("GL", "Galician");
     isoCodeToEnWikiName.put("KA", "Georgian");
     isoCodeToEnWikiName.put("HT", "Haitian Creole");
     isoCodeToEnWikiName.put("LB", "Luxembourgish");
     isoCodeToEnWikiName.put("MK", "Macedonian");
+    isoCodeToEnWikiName.put("GV", "Manx");
     
     // No longer exists in EN:
     // isoCodeToEnWikiName.put("BS", "Bosnian");
@@ -199,7 +200,10 @@ public class WiktionaryLangs {
           return null;
       }
       if (name.indexOf('|') != -1) {
-          return name.substring(name.indexOf('|'));
+          return name.substring(0, name.indexOf('|'));
+      }
+      if (name.indexOf('$') != -1) {
+          return name.substring(0, name.indexOf('$'));
       }
       return name;  // can be null.
   }