requested changes

app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt

@@ -42,7 +42,6 @@ import kotlinx.android.synthetic.main.nav_header.view.*
 import java.util.Locale
 import javax.inject.Inject
 import android.app.NotificationManager
-import android.content.Context
 
 
 private const val CURRENT_STATE = "current_state"
@@ -293,10 +292,10 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
     }
 
     fun changeLanguage() {
-        val languages = arrayOf("English", "Hindi", "Japanese", "Russian", "Italian")
+        val languages = resources.getStringArray(R.array.languages)
 
         val builder = AlertDialog.Builder(this)
-        builder.setTitle("Choose Language")
+        builder.setTitle(R.string.title_choose_language)
         builder.setSingleChoiceItems(languages, -1) { dialog, which ->
             when(which){
                 0->{
@@ -319,6 +318,18 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
                     setLocale("it")
                     recreate()
                 }
+                5->{
+                    setLocaleWithRegion("pt","BR")
+                    recreate()
+                }
+                6->{
+                    setLocaleWithRegion("pt", "PT")
+                    recreate()
+                }
+                7->{
+                    setLocale("zh")
+                    recreate()
+                }
             }
             dialog.dismiss()
         }
@@ -338,6 +349,18 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
         editor.apply()
     }
 
+    private fun setLocaleWithRegion(lang: String, country: String) {
+        val locale = Locale(lang, country)
+        Locale.setDefault(locale)
+        val config = Configuration()
+        config.locale = locale
+        baseContext.resources.updateConfiguration(config, baseContext.resources.displayMetrics)
+
+        val editor = getSharedPreferences(SETTING, Context.MODE_PRIVATE).edit()
+        editor.putString(MY_LANG, lang)
+        editor.apply()
+    }
+
     private fun loadLocale() {
         val sharedPreferences = getSharedPreferences(SETTING, Activity.MODE_PRIVATE)
         val language = sharedPreferences.getString(MY_LANG, "")

app/src/main/res/values-de/strings.xml

@@ -10,6 +10,7 @@
     <string name="title_authentication">Login Daten prüfen</string>
     <string name="title_legal_terms">Legal Terms</string>
     <string name="title_chats">Chats</string>
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
     <string name="title_profile">Profil</string>
     <string name="title_members">Benutzer</string>
     <string name="title_counted_members">Benutzer (%d)</string>
@@ -75,6 +76,17 @@
         <item name="item_about">Über</item>
     </string-array>
 
+    <string-array name="languages">
+        <item>English</item> <!-- TODO Add translation -->
+        <item>Hindi</item> <!-- TODO Add translation -->
+        <item>Japanese</item> <!-- TODO Add translation -->
+        <item>Russian</item> <!-- TODO Add translation -->
+        <item>Italian</item> <!-- TODO Add translation -->
+        <item>Portuguese(BR)</item> <!-- TODO Add translation -->
+        <item>Portuguese(PT)</item> <!-- TODO Add translation -->
+        <item>Chinese</item> <!-- TODO Add translation -->
+    </string-array>
+
     <!-- Regular information messages -->
     <string name="msg_generic_error">Entschuldigung, ein Fehler ist aufgetreten, bitte versuchen Sie es noch einmal.</string>
     <string name="msg_no_data_to_display">Keine Anzeigedaten vorhanden</string>

app/src/main/res/values-es/strings.xml

@@ -21,6 +21,7 @@
     <string name="title_password">Cambia la contraseña</string>
     <string name="title_update_profile">Actualización del perfil</string>
     <string name="title_about">Acerca de</string>
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
     <string name="title_create_channel">Crear canal</string>
     <string name="title_licence">Licence</string> <!-- TODO Add translation -->
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
@@ -72,6 +73,17 @@
         <item name="item_about">About</item> <!-- TODO Add translation -->
     </string-array>
 
+    <string-array name="languages">
+        <item>English</item> <!-- TODO Add translation -->
+        <item>Hindi</item> <!-- TODO Add translation -->
+        <item>Japanese</item> <!-- TODO Add translation -->
+        <item>Russian</item> <!-- TODO Add translation -->
+        <item>Italian</item> <!-- TODO Add translation -->
+        <item>Portuguese(BR)</item> <!-- TODO Add translation -->
+        <item>Portuguese(PT)</item> <!-- TODO Add translation -->
+        <item>Chinese</item> <!-- TODO Add translation -->
+    </string-array>
+
     <!-- Regular information messages -->
     <string name="msg_generic_error">Lo sentimos, ha ocurrido un error, por favor intente de nuevo</string>
     <string name="msg_no_data_to_display">No hay información para mostrar</string>

app/src/main/res/values-fa/strings.xml

@@ -19,6 +19,7 @@
     <string name="title_rate_us">به ما امتیاز دهید</string>
     <string name="title_admin_panel">Admin panel</string> <!-- TODO Add translation -->
     <string name="title_password">تغییر گذرواژه</string>
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
     <string name="title_update_profile">به روزرسانی نمایه</string>
     <string name="title_about">درباره</string>
     <string name="title_create_channel">ایجاد کانال</string>
@@ -72,6 +73,17 @@
         <item name="item_about">درباره</item>
     </string-array>
 
+    <string-array name="languages">
+        <item>English</item> <!-- TODO Add translation -->
+        <item>Hindi</item> <!-- TODO Add translation -->
+        <item>Japanese</item> <!-- TODO Add translation -->
+        <item>Russian</item> <!-- TODO Add translation -->
+        <item>Italian</item> <!-- TODO Add translation -->
+        <item>Portuguese(BR)</item> <!-- TODO Add translation -->
+        <item>Portuguese(PT)</item> <!-- TODO Add translation -->
+        <item>Chinese</item> <!-- TODO Add translation -->
+    </string-array>
+
     <!-- Regular information messages -->
     <string name="msg_generic_error">متاسفانه مشکلی رخ داد، لطفا دوباره تلاش کنید</string>
     <string name="msg_no_data_to_display">اطلاعاتی برای نمایش وجود نداد</string>

app/src/main/res/values-fr/strings.xml

@@ -15,6 +15,7 @@
     <string name="title_counted_members">Membres (%d)</string>
     <string name="title_settings">Paramètres</string>
     <string name="title_preferences">Préférences</string>
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
     <string name="title_change_password">Changer le mot de passe</string>
     <string name="title_rate_us">évaluez nous</string>
     <string name="title_admin_panel">Administration</string>
@@ -72,6 +73,17 @@
         <item name="item_about">About</item> <!-- TODO Add translation -->
     </string-array>
 
+    <string-array name="languages">
+        <item>English</item> <!-- TODO Add translation -->
+        <item>Hindi</item> <!-- TODO Add translation -->
+        <item>Japanese</item> <!-- TODO Add translation -->
+        <item>Russian</item> <!-- TODO Add translation -->
+        <item>Italian</item> <!-- TODO Add translation -->
+        <item>Portuguese(BR)</item> <!-- TODO Add translation -->
+        <item>Portuguese(PT)</item> <!-- TODO Add translation -->
+        <item>Chinese</item> <!-- TODO Add translation -->
+    </string-array>
+
     <!-- Regular information messages -->
     <string name="msg_generic_error">Désolé, une erreur s\'est produite. Veuillez réessayer</string>
     <string name="msg_no_data_to_display">Aucune donnée à afficher</string>

app/src/main/res/values-hi-rIN/strings.xml

@@ -20,6 +20,7 @@
     <string name="title_admin_panel">एडमिन पैनल</string>
     <string name="title_password">पासवर्ड बदलें</string>
     <string name="title_update_profile">प्रोफ़ाइल अपडेट करें</string>
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
     <string name="title_about">परिचय</string>
     <string name="title_create_channel">चैनल बनाएं</string>
     <string name="title_licence">लाइसेंस</string>
@@ -72,6 +73,17 @@
         <item name="item_about">के बारे में</item>
     </string-array>
 
+    <string-array name="languages">
+        <item>English</item> <!-- TODO Add translation -->
+        <item>Hindi</item> <!-- TODO Add translation -->
+        <item>Japanese</item> <!-- TODO Add translation -->
+        <item>Russian</item> <!-- TODO Add translation -->
+        <item>Italian</item> <!-- TODO Add translation -->
+        <item>Portuguese(BR)</item> <!-- TODO Add translation -->
+        <item>Portuguese(PT)</item> <!-- TODO Add translation -->
+        <item>Chinese</item> <!-- TODO Add translation -->
+    </string-array>
+
     <!-- Regular information messages -->
     <string name="msg_generic_error">क्षमा करें, एक त्रुटि हुई है, कृपया पुनः प्रयास करें</string>
     <string name="msg_no_data_to_display">डेटा प्रदर्शित करने के लिए उपलब्ध नहीं हैं</string>

app/src/main/res/values-it/strings.xml

@@ -22,6 +22,7 @@
     <string name="title_update_profile">Aggiorna Profilo</string>
     <string name="title_about">Informazioni</string>
     <string name="title_create_channel">Crea Canale</string>
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
     <string name="title_licence">licenza</string>
     <string name="title_are_you_sure">Sei sicuro che vuoi uscire ?</string>
     <string name="title_channel_details">Allegare un file</string>
@@ -72,6 +73,17 @@
         <item name="item_about">Di</item>
     </string-array>
 
+    <string-array name="languages">
+        <item>English</item> <!-- TODO Add translation -->
+        <item>Hindi</item> <!-- TODO Add translation -->
+        <item>Japanese</item> <!-- TODO Add translation -->
+        <item>Russian</item> <!-- TODO Add translation -->
+        <item>Italian</item> <!-- TODO Add translation -->
+        <item>Portuguese(BR)</item> <!-- TODO Add translation -->
+        <item>Portuguese(PT)</item> <!-- TODO Add translation -->
+        <item>Chinese</item> <!-- TODO Add translation -->
+    </string-array>
+
     <!-- Regular information messages -->
     <string name="msg_generic_error">Mi dispiace, si è verificato un errore, per favore riprova</string>
     <string name="msg_no_data_to_display">Nessun dato da visualizzare</string>

app/src/main/res/values-ja/strings.xml

@@ -20,6 +20,7 @@
     <string name="title_admin_panel">管理パネル</string>
     <string name="title_password">パスワードの変更</string>
     <string name="title_update_profile">プロフィールの更新</string>
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
     <string name="title_about">About</string><!-- TODO Add translation -->
     <string name="title_licence">Licence</string> <!-- TODO Add translation -->
     <string name="title_create_channel">新しいチャネルを作成</string>
@@ -72,6 +73,17 @@
         <item name="item_about">About</item> <!-- TODO Add translation -->
     </string-array>
 
+    <string-array name="languages">
+        <item>English</item> <!-- TODO Add translation -->
+        <item>Hindi</item> <!-- TODO Add translation -->
+        <item>Japanese</item> <!-- TODO Add translation -->
+        <item>Russian</item> <!-- TODO Add translation -->
+        <item>Italian</item> <!-- TODO Add translation -->
+        <item>Portuguese(BR)</item> <!-- TODO Add translation -->
+        <item>Portuguese(PT)</item> <!-- TODO Add translation -->
+        <item>Chinese</item> <!-- TODO Add translation -->
+    </string-array>
+
     <!-- Regular information messages -->
     <string name="msg_generic_error">エラーが発生しました。もう一度お試しください。</string>
     <string name="msg_no_data_to_display">表示するデータがありません</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -17,6 +17,7 @@
     <string name="title_preferences">Preferencias</string>
     <string name="title_change_password">Alterar senha</string>
     <string name="title_rate_us">nos avalie</string>
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
     <string name="title_admin_panel">Painel administrativo</string>
     <string name="title_password">Alterar senha</string>
     <string name="title_update_profile">Editar perfil</string>
@@ -72,6 +73,17 @@
         <item name="item_about">Sobre</item>
     </string-array>
 
+    <string-array name="languages">
+        <item>English</item> <!-- TODO Add translation -->
+        <item>Hindi</item> <!-- TODO Add translation -->
+        <item>Japanese</item> <!-- TODO Add translation -->
+        <item>Russian</item> <!-- TODO Add translation -->
+        <item>Italian</item> <!-- TODO Add translation -->
+        <item>Portuguese(BR)</item> <!-- TODO Add translation -->
+        <item>Portuguese(PT)</item> <!-- TODO Add translation -->
+        <item>Chinese</item> <!-- TODO Add translation -->
+    </string-array>
+
     <!-- Regular information messages -->
     <string name="msg_generic_error">Desculpe, ocorreu um erro, tente novamente</string>
     <string name="msg_no_data_to_display">Nenhum dado para exibir</string>

app/src/main/res/values-pt-rPT/strings.xml

@@ -17,6 +17,7 @@
     <string name="title_preferences">Preferências</string>
     <string name="title_change_password">Alterar palavra-passe</string>
     <string name="title_rate_us">Avalie-nos</string>
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
     <string name="title_admin_panel">Painel de Administração</string>
     <string name="title_password">Alterar palavra-passe</string>
     <string name="title_update_profile">Actualizar perfil</string>
@@ -72,6 +73,17 @@
         <item name="item_about">Acerca</item>
     </string-array>
 
+    <string-array name="languages">
+        <item>English</item> <!-- TODO Add translation -->
+        <item>Hindi</item> <!-- TODO Add translation -->
+        <item>Japanese</item> <!-- TODO Add translation -->
+        <item>Russian</item> <!-- TODO Add translation -->
+        <item>Italian</item> <!-- TODO Add translation -->
+        <item>Portuguese(BR)</item> <!-- TODO Add translation -->
+        <item>Portuguese(PT)</item> <!-- TODO Add translation -->
+        <item>Chinese</item> <!-- TODO Add translation -->
+    </string-array>
+
     <!-- Regular information messages -->
     <string name="msg_generic_error">Lamentamos, ocorreu um erro, tente novamente</string>
     <string name="msg_no_data_to_display">Sem dados para mostrar</string>

app/src/main/res/values-ru-rRU/strings.xml

@@ -20,6 +20,7 @@
     <string name="title_admin_panel">Панель админа</string>
     <string name="title_password">Изменить пароль</string>
     <string name="title_update_profile">Обновить профиль</string>
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
     <string name="title_about">О программе</string>
     <string name="title_create_channel">Создать новый канал</string>
     <string name="title_channel_details">О канале</string>
@@ -72,6 +73,17 @@
         <item name="item_about">О программе</item>
     </string-array>
 
+    <string-array name="languages">
+        <item>English</item> <!-- TODO Add translation -->
+        <item>Hindi</item> <!-- TODO Add translation -->
+        <item>Japanese</item> <!-- TODO Add translation -->
+        <item>Russian</item> <!-- TODO Add translation -->
+        <item>Italian</item> <!-- TODO Add translation -->
+        <item>Portuguese(BR)</item> <!-- TODO Add translation -->
+        <item>Portuguese(PT)</item> <!-- TODO Add translation -->
+        <item>Chinese</item> <!-- TODO Add translation -->
+    </string-array>
+
     <!-- Regular information messages -->
     <string name="msg_generic_error">Произошла ошибка, повторите попытку.</string>
     <string name="msg_no_data_to_display">Нет данных для отображения</string>

app/src/main/res/values-tr/strings.xml

@@ -22,6 +22,7 @@
     <string name="title_update_profile">Profilinizi Düzenleyin</string>
     <string name="title_about">Hakkında</string>
     <string name="title_create_channel">Yeni Kanal Oluştur</string>
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
     <string name="title_licence">Licence</string> <!-- TODO Add translation -->
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
     <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
@@ -72,6 +73,17 @@
         <item name="item_about">About</item> <!-- TODO Add translation -->
     </string-array>
 
+    <string-array name="languages">
+        <item>English</item> <!-- TODO Add translation -->
+        <item>Hindi</item> <!-- TODO Add translation -->
+        <item>Japanese</item> <!-- TODO Add translation -->
+        <item>Russian</item> <!-- TODO Add translation -->
+        <item>Italian</item> <!-- TODO Add translation -->
+        <item>Portuguese(BR)</item> <!-- TODO Add translation -->
+        <item>Portuguese(PT)</item> <!-- TODO Add translation -->
+        <item>Chinese</item> <!-- TODO Add translation -->
+    </string-array>
+
     <!-- Regular information messages -->
     <string name="msg_generic_error">Üzgünüz! bir hata oluştu. Lütfen daha sonra tekrar deneyiniz.</string>
     <string name="msg_no_data_to_display">Görüntülenecek veri bulunmamaktadır.</string>

app/src/main/res/values-uk/strings.xml

@@ -22,6 +22,7 @@
     <string name="title_update_profile">Оновити профіль</string>
     <string name="title_about">"Про програму"</string>
     <string name="title_create_channel">Створити новий канал</string>
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
     <string name="title_licence">Licence</string> <!-- TODO Add translation -->
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
     <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
@@ -72,6 +73,17 @@
         <item name="item_about">About</item> <!-- TODO Add translation -->
     </string-array>
 
+    <string-array name="languages">
+        <item>English</item> <!-- TODO Add translation -->
+        <item>Hindi</item> <!-- TODO Add translation -->
+        <item>Japanese</item> <!-- TODO Add translation -->
+        <item>Russian</item> <!-- TODO Add translation -->
+        <item>Italian</item> <!-- TODO Add translation -->
+        <item>Portuguese(BR)</item> <!-- TODO Add translation -->
+        <item>Portuguese(PT)</item> <!-- TODO Add translation -->
+        <item>Chinese</item> <!-- TODO Add translation -->
+    </string-array>
+
     <!-- Regular information messages -->
     <string name="msg_generic_error">Сталася помилка, спробуйте ще раз.</string>
     <string name="msg_no_data_to_display">Немає даних для відображення</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -25,6 +25,7 @@
     <string name="title_licence">许可证</string>
     <string name="title_are_you_sure">你确定?</string>
     <string name="title_channel_details">频道信息</string>
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
     <string name="title_topic">主题</string>
     <string name="title_announcement">公告</string>
     <string name="title_description">描述</string>
@@ -72,6 +73,17 @@
         <item name="item_about">关于</item>
     </string-array>
 
+    <string-array name="languages">
+        <item>English</item> <!-- TODO Add translation -->
+        <item>Hindi</item> <!-- TODO Add translation -->
+        <item>Japanese</item> <!-- TODO Add translation -->
+        <item>Russian</item> <!-- TODO Add translation -->
+        <item>Italian</item> <!-- TODO Add translation -->
+        <item>Portuguese(BR)</item> <!-- TODO Add translation -->
+        <item>Portuguese(PT)</item> <!-- TODO Add translation -->
+        <item>Chinese</item> <!-- TODO Add translation -->
+    </string-array>
+
     <!-- Regular information messages -->
     <string name="msg_generic_error">对不起发生了错误，请重试</string>
     <string name="msg_no_data_to_display">没有数据显示</string>

app/src/main/res/values/strings.xml

@@ -36,6 +36,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="title_create_channel">Create Channel</string>
     <string name="title_licence">Licence</string>
     <string name="title_are_you_sure">Are you sure?</string>
+    <string name="title_choose_language">Choose Language</string>
     <string name="title_channel_details">Channel Details</string>
     <string name="title_topic">Topic</string>
     <string name="title_announcement">Announcement</string>
@@ -84,6 +85,17 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
         <item name="item_about">About</item>
     </string-array>
 
+    <string-array name="languages">
+        <item>English</item>
+        <item>Hindi</item>
+        <item>Japanese</item>
+        <item>Russian</item>
+        <item>Italian</item>
+        <item>Portuguese(BR)</item>
+        <item>Portuguese(PT)</item>
+        <item>Chinese</item>
+    </string-array>
+
     <!-- Regular information messages -->
     <string name="msg_generic_error">Sorry, an error has occurred, please try again</string>
     <string name="msg_no_data_to_display">No data to display</string>