From 1ce1a94a35a1e5e3549182c25a9571b506d8a478 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sun, 27 Aug 2017 01:38:05 +0800
Subject: [PATCH] Update translations

---
 .../main/java/com/topjohnwu/magisk/MagiskManager.java  |  8 +++++---
 .../main/java/com/topjohnwu/magisk/utils/Utils.java    | 10 ++++++----
 app/src/main/res/values-zh-rTW/strings.xml             |  5 +++++
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java b/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
index 438e6c1fd..3e04cff8f 100644
--- a/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
+++ b/app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
@@ -87,6 +87,7 @@ public class MagiskManager extends Application {
     public int suResponseType;
     public int suNotificationType;
     public int suNamespaceMode;
+    public String localeConfig;
 
     // Global resources
     public SharedPreferences prefs;
@@ -125,11 +126,11 @@ public class MagiskManager extends Application {
     }
 
     public void setLocale() {
-        String localeTag = prefs.getString("locale", "");
-        if (localeTag.isEmpty()) {
+        localeConfig = prefs.getString("locale", "");
+        if (localeConfig.isEmpty()) {
             locale = defaultLocale;
         } else {
-            locale = Locale.forLanguageTag(localeTag);
+            locale = Locale.forLanguageTag(localeConfig);
         }
         Resources res = getBaseContext().getResources();
         Configuration config = new Configuration(res.getConfiguration());
@@ -192,6 +193,7 @@ public class MagiskManager extends Application {
                 .putString("multiuser_mode", String.valueOf(multiuserMode))
                 .putString("mnt_ns", String.valueOf(suNamespaceMode))
                 .putString("busybox_version", BUSYBOX_VERSION)
+                .putString("locale", localeConfig)
                 .apply();
 
         // Add busybox to PATH
diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java b/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
index a586d7f52..64316a1e7 100644
--- a/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
@@ -266,21 +266,23 @@ public class Utils {
         HashSet<String> set = new HashSet<>();
         Locale locale;
 
+        int compareId = R.string.download_file_error;
+
         // Add default locale
         locales.add(Locale.ENGLISH);
-        set.add(getLocaleString(context, Locale.ENGLISH, R.string.download));
+        set.add(getLocaleString(context, Locale.ENGLISH, compareId));
 
         // Add some special locales
         locales.add(Locale.TAIWAN);
-        set.add(getLocaleString(context, Locale.TAIWAN, R.string.download));
+        set.add(getLocaleString(context, Locale.TAIWAN, compareId));
         locale = new Locale("pt", "BR");
         locales.add(locale);
-        set.add(getLocaleString(context, locale, R.string.download));
+        set.add(getLocaleString(context, locale, compareId));
 
         // Other locales
         for (String s : context.getAssets().getLocales()) {
             locale = Locale.forLanguageTag(s);
-            if (set.add(getLocaleString(context, locale, R.string.download))) {
+            if (set.add(getLocaleString(context, locale, compareId))) {
                 locales.add(locale);
             }
         }
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 45c16c46e..a4d4f16b7 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -221,5 +221,10 @@
     <string name="magisk_updates">Magisk 更新</string>
     <string name="system_default">(系統預設)</string>
     <string name="language">語言</string>
+    <string name="flashing">正在刷入</string>
+    <string name="hide_manager_toast">正在隱藏 Magisk Manager…</string>
+    <string name="hide_manager_fail_toast">隱藏 Magisk Manager 失敗</string>
+    <string name="settings_hide_manager_title">隱藏 Magisk Manager</string>
+    <string name="settings_hide_manager_summary">暫時隱藏 Magisk Manager。\n這會新增一個新的 app 叫做 Unhide Magisk Manager</string>
 
 </resources>