From a0e6576e457d4e9d2c1572e7af7f6c476433f280 Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Thu, 10 Oct 2013 23:32:05 +0000
Subject: [PATCH] added 'make ParseFre' and 'make ParseEngFre' to
 lib/src/Makefile; added the script french/MkWikt.hs

---
 src/ui/android/res/values/strings.xml                 |  2 +-
 .../ui/android/LexicalEntryActivity.java              |  4 ++--
 .../grammaticalframework/ui/android/Translator.java   | 11 +++++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/ui/android/res/values/strings.xml b/src/ui/android/res/values/strings.xml
index 26601be1b..ca5ea7317 100644
--- a/src/ui/android/res/values/strings.xml
+++ b/src/ui/android/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">GF Translator</string>
+    <string name="app_name">GF4Translator</string>
 
     <string name="microphone">Microphone</string>
     <string name="switch_languages">Switch languages</string>
diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java b/src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java
index d6f935113..b50cbd0bd 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java
@@ -44,8 +44,8 @@ public class LexicalEntryActivity extends ListActivity {
 
 		List<String> data = new ArrayList<String>();
 	    for (MorphoAnalysis a : list) {
-	    	Expr e = Expr.readExpr(a.getLemma());
-	    	String phrase = mTranslator.linearize(e);
+		//	    	Expr e = Expr.readExpr(a.getLemma());
+	    	String phrase = "FOO" ; //mTranslator.linearize(e);
 	    	
 	    	if (!data.contains(phrase)) {
 		    	data.add(phrase);
diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java b/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java
index 50f5bb33d..797428a36 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java
@@ -20,13 +20,16 @@ public class Translator {
     private static final String TAG = "Translator";
 
     // TODO: allow changing
-    private String mGrammar = "ParseEngAbs.pgf";
+    private String mGrammar = "ParseEngChi.pgf";
 
     // TODO: build dynamically?
     private Language[] mLanguages = {
             new Language("en-US", "English", "ParseEng"),
-            new Language("bg-BG", "Bulgarian", "ParseBul"),
-            new Language("cmn-Hans-CN", "Chinese", "ParseChi")
+            new Language("cmn-Hans-CN", "Chinese", "ParseChi"), 
+	    //            new Language("de-DE", "German",  "ParseGer"),
+	    //           new Language("es-ES", "Spanish", "ResourceDemoSpa"),
+            //new Language("fr-FR", "French", "ResourceDemoFre"),
+            //            new Language("bg-BG", "Bulgarian", "ParseBul"),
     };
 
     private Language mSourceLanguage;
@@ -92,7 +95,7 @@ public class Translator {
             return output;
         } catch (ParseError e) {
             Log.e(TAG, "Parse error: " + e);
-            return "parse error: " + e.getMessage(); // TODO: no no no
+            return "parse error: " + input + " " + e.getMessage(); // TODO: no no no
         }
     }