summaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
authoraarne <aarne@chalmers.se>2015-12-11 10:56:07 +0000
committeraarne <aarne@chalmers.se>2015-12-11 10:56:07 +0000
commitd41d512ae3f35626f918e6fedd7bc8f149c893c8 (patch)
tree12a7d65e47aaf4afaf3fb2bbf2e88a51738a4f0b /src/ui
parent6b74a90bd476e44f03bdc0b5c9b896bdf136c23d (diff)
tweaking Chi language codes to get both speech input and output in Android ; one fix in DictionaryChi
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/android/src/org/grammaticalframework/ui/android/TTS.java4
-rw-r--r--src/ui/android/src/org/grammaticalframework/ui/android/Translator.java1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/TTS.java b/src/ui/android/src/org/grammaticalframework/ui/android/TTS.java
index a7a7ef12e..3e020f0af 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/TTS.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/TTS.java
@@ -35,9 +35,9 @@ public class TTS {
}
*/
- /* OR use separate entries for Cantonese and Mandarin */
+ /* Google Chinese speech input has a nonstandard code. In output, yue works for Chi in Google, but SVOX uses the standard zh-CN */
if (language.equals("cmn-Hans-CN")) {
- language = "yue";
+ language = "zh-CN";
}
Locale locale = LocaleUtils.parseJavaLocale(language.replace('-', '_'),
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 c21978802..0781e9397 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java
@@ -29,6 +29,7 @@ public class Translator {
new Language("bg-BG", "Bulgarian", "AppBul", R.xml.cyrillic),
new Language("ca-ES", "Catalan", "AppCat", R.xml.qwerty),
new Language("cmn-Hans-CN", "Chinese", "AppChi", R.xml.qwerty),
+ // new Language("zh-CN", "Chinese", "AppChi", R.xml.qwerty),
// new Language("yue", "Chinese (Cantonese)", "AppChi", R.xml.qwerty),
// new Language("cmn-Hans-CN", "Chinese (Mandarin)", "AppChi", R.xml.qwerty),
new Language("nl-NL", "Dutch", "AppDut", R.xml.qwerty),