X-Git-Url: http://gitweb.fperrin.net/?p=DictionaryPC.git;a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fparser%2Fwiktionary%2FWiktionaryLangs.java;h=7f52642821bc4b8b2bbafac65be248a0642fa504;hp=a72c918c9552f799a49e2a7b51aa2466e23e30e1;hb=16c4f59950e8e6beabe312dd03e7678d084fe25b;hpb=63c291d10ef30eb90d9e2379a01c39e5e57a32b6

diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java b/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java
index a72c918..7f52642 100644
--- a/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java
+++ b/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java
@@ -35,7 +35,6 @@ public class WiktionaryLangs {
     isoCodeToEnWikiName.put("BG", "Bulgarian");
     isoCodeToEnWikiName.put("CA", "Catalan");
     isoCodeToEnWikiName.put("SH", "Serbo-Croatian");
-    isoCodeToEnWikiName.put("HR", "Croatian");
     isoCodeToEnWikiName.put("CS", "Czech");
     isoCodeToEnWikiName.put("ZH", "Chinese");
     isoCodeToEnWikiName.put("cmn", "Mandarin");
@@ -48,8 +47,8 @@ public class WiktionaryLangs {
     isoCodeToEnWikiName.put("FI", "Finnish");
     isoCodeToEnWikiName.put("FR", "French");
     isoCodeToEnWikiName.put("DE", "German");
-    isoCodeToEnWikiName.put("EL", "Greek");
     isoCodeToEnWikiName.put("grc", "Ancient Greek");
+    isoCodeToEnWikiName.put("EL", "Greek");
     isoCodeToEnWikiName.put("haw", "Hawaiian");
     isoCodeToEnWikiName.put("HE", "Hebrew");
     isoCodeToEnWikiName.put("HI", "Hindi");
@@ -58,6 +57,7 @@ public class WiktionaryLangs {
     isoCodeToEnWikiName.put("ID", "Indonesian");
     isoCodeToEnWikiName.put("GA", "Irish");
     isoCodeToEnWikiName.put("GD", "Gaelic");
+    isoCodeToEnWikiName.put("GV", "Manx");
     isoCodeToEnWikiName.put("IT", "Italian");
     isoCodeToEnWikiName.put("LA", "Latin");
     isoCodeToEnWikiName.put("LV", "Latvian");
@@ -66,8 +66,8 @@ public class WiktionaryLangs {
     isoCodeToEnWikiName.put("KO", "Korean");
     isoCodeToEnWikiName.put("KU", "Kurdish");
     isoCodeToEnWikiName.put("LO", "Lao");
-    isoCodeToEnWikiName.put("MS", "Malay$");
     isoCodeToEnWikiName.put("ML", "Malayalam");
+    isoCodeToEnWikiName.put("MS", "Malay");
     isoCodeToEnWikiName.put("MI", "Maori");
     isoCodeToEnWikiName.put("MN", "Mongolian");
     isoCodeToEnWikiName.put("NE", "Nepali");
@@ -100,28 +100,30 @@ 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");
     // isoCodeToEnWikiName.put("SR", "Serbian");
+    // isoCodeToEnWikiName.put("HR", "Croatian");
     
     // Font doesn't work:
     //isoCodeToEnWikiName.put("MY", "Burmese");
 
 
     {
-        Set<String> missing = new LinkedHashSet<String>(isoCodeToEnWikiName.keySet());
-        missing.removeAll(Language.isoCodeToResources.keySet());
+        //Set<String> missing = new LinkedHashSet<String>(isoCodeToEnWikiName.keySet());
+        //missing.removeAll(Language.isoCodeToResources.keySet());
         //System.out.println(missing);
     }
-    assert Language.isoCodeToResources.keySet().containsAll(isoCodeToEnWikiName.keySet());
+    //assert Language.isoCodeToResources.keySet().containsAll(isoCodeToEnWikiName.keySet());
   }
 
   public static final Map<String,Map<String,String>> wikiCodeToIsoCodeToWikiName = new LinkedHashMap<String, Map<String,String>>();
@@ -141,17 +143,18 @@ public class WiktionaryLangs {
     isoCodeToWikiName.put("FR", "Französisch");
     isoCodeToWikiName.put("EO", "Esperanto");
     isoCodeToWikiName.put("CA", "Katalanisch");
-    isoCodeToWikiName.put("LA", "Lateinisch");
+    isoCodeToWikiName.put("LA", "Latein");
     isoCodeToWikiName.put("CS", "Tschechisch");
     isoCodeToWikiName.put("HU", "Ungarisch");
     isoCodeToWikiName.put("SV", "Schwedisch");
     isoCodeToWikiName.put("ES", "Spanisch");
 
-    // egrep -o '\{\{=[a-zA-Z]+=\}\}' frwiktionary-pages-articles.xml | sort | uniq -c | sort -nr
+    // egrep -o '== *\{\{langue\|[a-zA-Z]+\}\} *==' frwiktionary-pages-articles.xml | sort | uniq -c | sort -nr
     isoCodeToWikiName = new LinkedHashMap<String, String>();
     wikiCodeToIsoCodeToWikiName.put("fr", isoCodeToWikiName);
     isoCodeToWikiName.put("FR", Pattern.quote("{{langue|fr}}"));
     isoCodeToWikiName.put("RU", Pattern.quote("{{langue|ru}}"));
+    isoCodeToWikiName.put("AR", Pattern.quote("{{langue|ar}}"));  // Arabic
     isoCodeToWikiName.put("BG", Pattern.quote("{{langue|bg}}"));  // Bulgarian
     isoCodeToWikiName.put("EN", Pattern.quote("{{langue|en}}"));
     //isoCodeToWikiName.put("", Pattern.quote("{{langue|sl}}"));
@@ -187,7 +190,12 @@ public class WiktionaryLangs {
     isoCodeToWikiName.put("HU", Pattern.quote("{{-hu-}}"));
     isoCodeToWikiName.put("EL", Pattern.quote("{{-grc-}}"));
     isoCodeToWikiName.put("SV", Pattern.quote("{{-sv-}}"));
+    isoCodeToWikiName.put("RU", Pattern.quote("{{-ru-}}"));
 
+    // There seems to be no consistent pattern and few foreign language entries anyway
+    isoCodeToWikiName = new LinkedHashMap<String, String>();
+    wikiCodeToIsoCodeToWikiName.put("es", isoCodeToWikiName);
+    isoCodeToWikiName.put("ES", Pattern.quote("{{ES"));
   }
   public static String getEnglishName(String langCode) {
       String name = isoCodeToEnWikiName.get(langCode);
@@ -198,7 +206,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.
   }