Follow system locale

Setting is not ready, so riot was choosing and persisting the locale
during initial setup. For debugging purposes, it is useful to be able to
change the language without wiping data, too.
This commit is contained in:
SpiritCroc 2020-05-14 12:28:56 +02:00
parent 98d7a90f73
commit 7b6a1ed2e7
2 changed files with 2 additions and 1 deletions

View file

@ -58,7 +58,7 @@ object VectorLocale {
fun init(context: Context) {
val preferences = PreferenceManager.getDefaultSharedPreferences(context)
if (preferences.contains(APPLICATION_LOCALE_LANGUAGE_KEY)) {
if (false && preferences.contains(APPLICATION_LOCALE_LANGUAGE_KEY)) {
applicationLocale = Locale(preferences.getString(APPLICATION_LOCALE_LANGUAGE_KEY, "")!!,
preferences.getString(APPLICATION_LOCALE_COUNTRY_KEY, "")!!,
preferences.getString(APPLICATION_LOCALE_VARIANT_KEY, "")!!

View file

@ -9,6 +9,7 @@
<im.vector.riotx.core.preference.VectorPreference
android:dialogTitle="@string/settings_select_language"
android:key="SETTINGS_INTERFACE_LANGUAGE_PREFERENCE_KEY"
android:enabled="false"
android:title="@string/settings_interface_language" />
<im.vector.riotx.core.preference.VectorListPreference