Add languages into menu, fix locale setting

thuryn · Feb 22, 2018 · 6edb831 · 6edb831
1 parent 79d2275
commit 6edb831
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/app/src/main/java/org/thosp/yourlocalweather/utils/LanguageUtil.java b/app/src/main/java/org/thosp/yourlocalweather/utils/LanguageUtil.java
@@ -22,7 +22,13 @@ public static void setLanguage(final ContextWrapper contextWrapper, String local
         if (TextUtils.isEmpty(locale)) {
             sLocale = Locale.getDefault();
         } else {
-            String[] localeParts = locale.split("_");
+            String[] localeParts = locale.split("-");
+            StringBuilder s = new StringBuilder();
+            for (String pa: localeParts) {
+                s.append(pa);
+                s.append(":");
+            }
+            LogToFile.appendLog(contextWrapper, "LanguageUtil", "locale.split(\"_-\"):" + s.toString() + ":locale:" + locale);
             if (localeParts.length > 1) {
                 sLocale = new Locale(localeParts[0], localeParts[1]);
             } else {
@@ -58,8 +64,8 @@ public static String getLanguageName(String locale) {
         if (TextUtils.isEmpty(locale)) {
             locale = Locale.getDefault().toString();
         }
-        if (locale.contains("_")) {
-            return locale.split("_")[0];
+        if (locale.contains("-")) {
+            return locale.split("-")[0];
         }
         return locale;
     }

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -148,35 +148,53 @@
     <!-- Languages array -->
     <string-array name="language_entries" translatable="false">
         <item name="default">@string/pref_language_default</item>
+        <item name="arabic">@string/pref_language_ar</item>
         <item name="english">English</item>
         <item name="basque">Euskara (Basque)</item>
         <item name="belarusian">Беларуская (Belarusian)</item>
         <item name="catalan">Català (Catalan)</item>
         <item name="czech">Čeština (Czech)</item>
+        <item name="greek">@string/pref_language_el</item>
+        <item name="spanish">@string/pref_language_es</item>
         <item name="french">Français (French)</item>
+        <item name="hungarian">@string/pref_language_hu</item>
         <item name="italian">Italiano (Italian)</item>
         <item name="german">Deutsch (German)</item>
         <item name="spanish">Español (Spanish)</item>
         <item name="japanese">日本語 (Japanese)</item>
+        <item name="norwegian">@string/pref_language_nb_rNO</item>
+        <item name="dutch">@string/pref_language_nl</item>
+        <item name="nyanja">@string/pref_language_ny</item>
         <item name="polish">Polski (Polish)</item>
         <item name="russian">Русский (Russian)</item>
+        <item name="swahili">@string/pref_language_sw</item>
         <item name="turkish">Türkçe (Turkish)</item>
+        <item name="chinese">@string/pref_language_zh_rcn</item>
     </string-array>
     <string-array name="language_values" translatable="false">
         <item name="default"></item>
+        <item name="arabic">ar</item>
         <item name="english">en</item>
         <item name="basque">eu</item>
         <item name="belarusian">be</item>
         <item name="catalan">ca</item>
         <item name="czech">cs</item>
+        <item name="greek">el</item>
+        <item name="spanish">es</item>
         <item name="french">fr</item>
+        <item name="hungarian">hu</item>
         <item name="italian">it</item>
         <item name="german">de</item>
         <item name="spanish">es</item>
         <item name="japanese">ja</item>
+        <item name="norwegian">nb-rNO</item>
+        <item name="dutch">nl</item>
+        <item name="nyanja">ny</item>
         <item name="polish">pl</item>
         <item name="russian">ru</item>
+        <item name="swahili">sw</item>
         <item name="turkish">tr</item>
+        <item name="chinese">zh-rCN</item>
     </string-array>
 
     <!-- Themes array -->

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -190,6 +190,15 @@
     <string name="preference_title_category_display" tools:ignore="MissingTranslation">Display</string>
     <string name="pref_title_language" tools:ignore="MissingTranslation">Language</string>
     <string name="pref_language_default" tools:ignore="MissingTranslation">System Default</string>
+    <string name="pref_language_zh_rcn" tools:ignore="MissingTranslation">Chinese (Chinese)</string>
+    <string name="pref_language_sw" tools:ignore="MissingTranslation">Swahili (Swahili)</string>
+    <string name="pref_language_nb_rNO" tools:ignore="MissingTranslation">Norwegian (Norwegian)</string>
+    <string name="pref_language_nl" tools:ignore="MissingTranslation">Dutch (Dutch)</string>
+    <string name="pref_language_ny" tools:ignore="MissingTranslation">Nyanja (Nyanja)</string>
+    <string name="pref_language_hu" tools:ignore="MissingTranslation">Hungarian (Hungarian)</string>
+    <string name="pref_language_es" tools:ignore="MissingTranslation">Spanish (Spanish)</string>
+    <string name="pref_language_el" tools:ignore="MissingTranslation">Greek (Greek)</string>
+    <string name="pref_language_ar" tools:ignore="MissingTranslation">Arabic (Arabic)</string>
     <string name="location_geocoder_title" tools:ignore="MissingTranslation">Location and address source</string>
     <string name="location_geocoder_local" tools:ignore="MissingTranslation">Local MLS and Nominatim (recommended)</string>
     <string name="location_geocoder_system" tools:ignore="MissingTranslation">System</string>