Fix enIndex=1, not 2.

diff --git a/bugs b/bugs
index 4050d591a1f0ecc255de650045ec956ee2f5f519..6e0af80967d670ff7677ab041c4bc3fa37e501f6 100644 (file)
--- a/bugs
+++ b/bugs
@@ -1,5 +1,14 @@
+UI:
+enter should hide keyboard
+add to wordlist should focus word (so next typing clears text).
+sideways keyboard appear.
 icons
+
+PC:
+sub-levels in translations.
 handle word-info in English.
+italian verbs... (show conjugation, pulled from a linked place....)
+
 
 
 Bad ordering:
@@ -7,7 +16,5 @@ Bad ordering:
   do {{wikipedia|Do (nota)|lang=it}}{{infl|it|noun|g=m}} :: do, the musical note
   fare {{it-verb}} {{transitive}} :: To do
 
-sub-levels in translations.
-
 in wiktionary
   futurismo :: futurism () (noun)

diff --git a/src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java b/src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java
index 36564eacce3ef918459e6c906849d9833c9af7a6..20bf4ba4437909286baf5b6593199c19ee8a6b8d 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java
+++ b/src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java
@@ -99,14 +99,14 @@ public class DictionaryBuilderMain extends TestCase {
             "--input2Format=enwiktionary",
             "--input2LangPattern=" + isoToRegex.get(foreignIso),
             "--input2LangCodePattern=" + foreignIso.toLowerCase(),
-            "--input2EnIndex=2",
+            "--input2EnIndex=1",
 
             "--input3=" + INPUTS + "enWikiSplit/EN.data",
             "--input3Name=enwiktionary.english",
             "--input3Format=enwiktionary",
             "--input3LangPattern=" + isoToRegex.get(foreignIso),
             "--input3LangCodePattern=" + foreignIso.toLowerCase(),
-            "--input3EnIndex=2",
+            "--input3EnIndex=1",
 
         });
         
@@ -125,9 +125,11 @@ public class DictionaryBuilderMain extends TestCase {
     }  // foreignIso
 
     DictionaryBuilder.main(new String[] {
-        "--dictOut=" + OUTPUTS + "DE-EN_chemnitz_enwiktionary",
+        "--dictOut=" + OUTPUTS + "DE-EN_chemnitz_enwiktionary.quickdic",
         "--lang1=DE",
         "--lang2=EN",
+        String.format("--lang1Stoplist=%s", STOPLISTS + isoToStoplist.get("DE")),
+        String.format("--lang2Stoplist=%s", STOPLISTS + isoToStoplist.get("EN")),
         "--dictInfo=@" + INPUTS + "de-en_chemnitz_enwiktionary.info",
 
         "--input1=" + INPUTS + "de-en_chemnitz.txt",

diff --git a/src/com/hughes/android/dictionary/engine/WiktionarySplitter.java b/src/com/hughes/android/dictionary/engine/WiktionarySplitter.java
index 94f7e262b7421c7af26cf0710ee77cee8736c4b1..9f9a7aeb4e66012057f888b9691e6a33768fc07c 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/WiktionarySplitter.java
+++ b/src/com/hughes/android/dictionary/engine/WiktionarySplitter.java
@@ -82,10 +82,10 @@ public class WiktionarySplitter extends org.xml.sax.helpers.DefaultHandler {
 //          new Selector("../DictionaryData/inputs/enWikiSplit/AF.data", ".*[Aa]frikaans.*"),
 //          new Selector("../DictionaryData/inputs/enWikiSplit/AR.data", ".*[Aa]rabic.*"),
 //          new Selector("../DictionaryData/inputs/enWikiSplit/HY.data", ".*[Aa]rmenian.*"),
-//          new Selector("../DictionaryData/inputs/enWikiSplit/HR.data", ".*[Cc]roation.*"),
+          new Selector("../DictionaryData/inputs/enWikiSplit/HR.data", ".*[Cc]roatian.*"),
 //          new Selector("../DictionaryData/inputs/enWikiSplit/CS.data", ".*[Cc]zech.*"),
-          new Selector("../DictionaryData/inputs/enWikiSplit/ZH.data", ".*[Cc]hinese.*|.*[Mm]andarin.*|.*Cantonese.*"),
-          new Selector("../DictionaryData/inputs/enWikiSplit/DA.data", ".*[Dd]anish.*")
+          new Selector("../DictionaryData/inputs/enWikiSplit/ZH.data", ".*[Cc]hinese.*|.*[Mm]andarin.*|.*Cantonese.*")
+//          new Selector("../DictionaryData/inputs/enWikiSplit/DA.data", ".*[Dd]anish.*"),
 //          new Selector("../DictionaryData/inputs/enWikiSplit/NL.data", ".*[Dd]utch.*"),
 //          new Selector("../DictionaryData/inputs/enWikiSplit/EN.data", ".*[Ee]nglish.*"),
 //          new Selector("../DictionaryData/inputs/enWikiSplit/FI.data", ".*[Ff]innish.*"),