From: Thad Hughes <thadh@google.com>
Date: Wed, 9 Jan 2013 05:53:42 +0000 (-0800)
Subject: Fix Malay/Malayalam, add test for "buon g".
X-Git-Url: http://gitweb.fperrin.net/?p=DictionaryPC.git;a=commitdiff_plain;h=63c291d10ef30eb90d9e2379a01c39e5e57a32b6

Fix Malay/Malayalam, add test for "buon g".
---

diff --git a/src/com/hughes/android/dictionary/engine/DictionaryTest.java b/src/com/hughes/android/dictionary/engine/DictionaryTest.java
index 2662cbb..23747e1 100644
--- a/src/com/hughes/android/dictionary/engine/DictionaryTest.java
+++ b/src/com/hughes/android/dictionary/engine/DictionaryTest.java
@@ -64,6 +64,15 @@ public class DictionaryTest extends TestCase {
     assertTrue(!((TokenRow)rows.get(0)).getIndexEntry().htmlEntries.isEmpty());
     }
 
+    {
+    final List<RowBase> rows = itIndex.multiWordSearch("buon g", Arrays.asList("buon", "g"), new AtomicBoolean(false));
+    System.out.println(CollectionUtil.join(rows, "\n  "));
+    assertTrue(rows.toString(), rows.size() > 0);
+    assertTrue(rows.get(0).toString().startsWith("buon giorno@"));
+    assertTrue(rows.get(0) instanceof TokenRow);
+    assertTrue(!((TokenRow)rows.get(0)).getIndexEntry().htmlEntries.isEmpty());
+    }
+
     {
         final IndexEntry searchResult = itIndex.findInsertionPoint("azzurro", new AtomicBoolean(
                 false));
diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java b/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java
index f8300fb..a72c918 100644
--- a/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java
+++ b/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java
@@ -66,7 +66,7 @@ public class WiktionaryLangs {
     isoCodeToEnWikiName.put("KO", "Korean");
     isoCodeToEnWikiName.put("KU", "Kurdish");
     isoCodeToEnWikiName.put("LO", "Lao");
-    isoCodeToEnWikiName.put("MS", "Malay");
+    isoCodeToEnWikiName.put("MS", "Malay$");
     isoCodeToEnWikiName.put("ML", "Malayalam");
     isoCodeToEnWikiName.put("MI", "Maori");
     isoCodeToEnWikiName.put("MN", "Mongolian");