From c73362847a9f759ff67788dbc6de0d4b7a83f7d7 Mon Sep 17 00:00:00 2001
From: Yink <yink.user@gmail.com>
Date: Sun, 29 Apr 2018 12:56:27 +0200
Subject: [PATCH] Fixed change from traditional to simplified chinese

---
 .../java/com/example/yink/amadeus/LangContext.java     |  6 ++++++
 app/src/main/res/values-zh-rCN/strings.xml             |  2 +-
 app/src/main/res/values/strings.xml                    | 10 +++++-----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/example/yink/amadeus/LangContext.java b/app/src/main/java/com/example/yink/amadeus/LangContext.java
index 4bcb74f..88f6730 100644
--- a/app/src/main/java/com/example/yink/amadeus/LangContext.java
+++ b/app/src/main/java/com/example/yink/amadeus/LangContext.java
@@ -37,6 +37,12 @@ public class LangContext extends ContextWrapper {
                 locale = new Locale(langArr[0]);
                 break;
         }
+
+        if (lang.equals("zh-rTW"))
+            locale = Locale.TAIWAN;
+        else if (lang.equals("zh-rCN"))
+            locale = Locale.CHINA;
+
         Locale.setDefault(locale);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             setSystemLocale(config, locale);
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index aac696a..60b2d9c 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -4,7 +4,7 @@
     <string name="call">连接到助手</string>
     <string name="connecting">连接中...</string>
     <string name="disconnected">断开连接</string>
-    <string name="default_lang">en</string>
+    <string name="default_lang">zh-rCN</string>
     <string name="default_recog_lang">en-US</string>
     <string name="google_app_error">没有检测到Google App</string>
     <string name="incoming_call">来自助手的电话</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 854dede..16e7384 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -55,13 +55,13 @@
     <string name="line_nice_to_meet_okabe">Nice to meet you, Okabe Rintaro. I\'m Makise Kurisu.</string>
     <string name="line_look_forward_to_working">I look forward to working with you.</string>
     <string name="line_senpai_question">Anyway, can I ask a question?</string>
-    <string name="line_senpai_question_mark">Um� Senpai? Excuse me.</string>
-    <string name="line_senpai_what_we_talkin">Hey Senpai, about what we were just talking about�</string>
+    <string name="line_senpai_question_mark">Um… Senpai? Excuse me.</string>
+    <string name="line_senpai_what_we_talkin">Hey Senpai, about what we were just talking about…</string>
     <string name="line_senpai_who_is_this">Uh, who is this?</string>
-    <string name="line_senpai_please_dont_tell">Senpai, please, don\'t tell the others�</string>
+    <string name="line_senpai_please_dont_tell">Senpai, please, don\'t tell the others…</string>
     <string name="line_still_not_happy">I\'m still not happy about that.</string>
     <string name="line_tm_nonsense">That\s pure nonsense.</string>
-    <string name="line_tm_not_possible">Let\'s see� My conclusion is that it\'s not possible.</string>
+    <string name="line_tm_not_possible">Let\'s see… My conclusion is that it\'s not possible.</string>
     <string name="line_tm_scientist_no_evidence">That\'s probably because scientists haven\'t discovered something important yet.</string>
     <string name="line_tm_we_dont_know">But we don\'t know for sure that it\'s impossible, I guess.</string>
     <string name="line_tm_you_said">A time machine, you said?</string>
@@ -70,7 +70,7 @@
     <string name="line_secret_diary">I keep a secret diary.</string>
     <string name="line_modifying_memories_impossible">Modifying my memories? It\'s theoretically possible.</string>
     <string name="line_memories_christina">For example, it would be possible to make me think my name was Christina.</string>
-    <string name="line_gah_extended">Gah. Ah� Aaaaah.</string>
+    <string name="line_gah_extended">Gah. Ah… Aaaaah.</string>
     <string name="line_Leskinen_awesome">Awesome, he\'s really something!</string>
     <string name="line_Leskinen_nice">Nice!</string>
     <string name="line_Leskinen_oh_no">Oh no!</string>