X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fparser%2Fwiktionary%2FWiktionaryLangs.java;h=f87afa107ec3f9e5dbb30b26e62eb0787a67da60;hb=58fd4402729f38bf4408e8fef487a9bc359e45a0;hp=3de77dde399cffa007e07e31eb732061d6dd162f;hpb=3bf8c5424c20dbb0e7219876f8699145f0e6db21;p=DictionaryPC.git

diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java b/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java
index 3de77dd..f87afa1 100644
--- a/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java
+++ b/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java
@@ -17,7 +17,9 @@ package com.hughes.android.dictionary.parser.wiktionary;
 import com.hughes.android.dictionary.engine.Language;
 
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 public class WiktionaryLangs {
@@ -30,14 +32,15 @@ public class WiktionaryLangs {
     isoCodeToEnWikiName.put("HY", "Armenian");
     isoCodeToEnWikiName.put("BE", "Belarusian");
     isoCodeToEnWikiName.put("BN", "Bengali");
-    isoCodeToEnWikiName.put("BS", "Bosnian");
     isoCodeToEnWikiName.put("BG", "Bulgarian");
     isoCodeToEnWikiName.put("MY", "Burmese");
-    isoCodeToEnWikiName.put("yue", "Cantonese");
     isoCodeToEnWikiName.put("CA", "Catalan");
+    isoCodeToEnWikiName.put("SH", "Serbo-Croatian");
     isoCodeToEnWikiName.put("HR", "Croatian");
     isoCodeToEnWikiName.put("CS", "Czech");
-    isoCodeToEnWikiName.put("ZH", "Chinese|Mandarin");
+    isoCodeToEnWikiName.put("ZH", "Chinese");
+    isoCodeToEnWikiName.put("cmn", "Mandarin");
+    isoCodeToEnWikiName.put("yue", "Cantonese");
     isoCodeToEnWikiName.put("DA", "Danish");
     isoCodeToEnWikiName.put("NL", "Dutch");
     isoCodeToEnWikiName.put("EN", "English");
@@ -77,7 +80,6 @@ public class WiktionaryLangs {
     isoCodeToEnWikiName.put("RO", "Romanian");
     isoCodeToEnWikiName.put("RU", "Russian");
     isoCodeToEnWikiName.put("SA", "Sanskrit");
-    isoCodeToEnWikiName.put("SR", "Serbian");
     isoCodeToEnWikiName.put("SK", "Slovak");
     isoCodeToEnWikiName.put("SL", "Slovene|Slovenian");
     isoCodeToEnWikiName.put("SO", "Somali");
@@ -96,7 +98,6 @@ public class WiktionaryLangs {
     isoCodeToEnWikiName.put("CI", "Welsh");
     isoCodeToEnWikiName.put("YI", "Yiddish");
     isoCodeToEnWikiName.put("ZU", "Zulu");
-    
     isoCodeToEnWikiName.put("AZ", "Azeri");
     isoCodeToEnWikiName.put("EU", "Basque");
     isoCodeToEnWikiName.put("BR", "Breton");
@@ -107,8 +108,16 @@ public class WiktionaryLangs {
     isoCodeToEnWikiName.put("HT", "Haitian Creole");
     isoCodeToEnWikiName.put("LB", "Luxembourgish");
     isoCodeToEnWikiName.put("MK", "Macedonian");
+    
+    // No longer exists in EN:
+    // isoCodeToEnWikiName.put("BS", "Bosnian");
+    // isoCodeToEnWikiName.put("SR", "Serbian");
 
-
+    {
+        Set<String> missing = new LinkedHashSet<String>(isoCodeToEnWikiName.keySet());
+        missing.removeAll(Language.isoCodeToResources.keySet());
+        //System.out.println(missing);
+    }
     assert Language.isoCodeToResources.keySet().containsAll(isoCodeToEnWikiName.keySet());
   }
 
@@ -151,6 +160,8 @@ public class WiktionaryLangs {
     //isoCodeToWikiName.put("", Pattern.quote("{{langue|mg}}"));
     //isoCodeToWikiName.put("", Pattern.quote("{{langue|hsb}}"));
     isoCodeToWikiName.put("ZH", Pattern.quote("{{langue|zh}}"));
+    isoCodeToWikiName.put("cmn", Pattern.quote("{{langue|cmn}}"));
+    isoCodeToWikiName.put("yue", Pattern.quote("{{langue|yue}}"));
     isoCodeToWikiName.put("JA", Pattern.quote("{{langue|ja}}"));
     isoCodeToWikiName.put("DE", Pattern.quote("{{langue|de}}"));
     isoCodeToWikiName.put("IS", Pattern.quote("{{langue|is}}"));  // Icelandic