mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-20 07:21:40 +02:00
Code Issues Releases Wiki Activity

Make language default value non-empty

Browse Source
This commit is contained in:
Erik Johansson
2018-04-14 23:03:27 +02:00
parent b3f7fbd61e
commit ef77bc0b5d
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android_app/app/src/main/java/com/health/openscale/gui/activities/BaseAppCompatActivity.java
View File

@@ -36,7 +36,7 @@ public class BaseAppCompatActivity extends AppCompatActivity {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
String language = prefs.getString(PREFERENCE_LANGUAGE, "");
if (language.isEmpty()) {
if (language.isEmpty() || language.equals("default")) {
return context;
}

2
android_app/app/src/main/res/values/arrays.xml
View File

@@ -19,7 +19,7 @@
</string-array>
<string-array name="language_values">
<item />
<item>default</item>
<item>pt-BR</item>
<item>ca</item>
<item>cs</item>

2
android_app/app/src/main/res/xml/general_preferences.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<ListPreference
android:defaultValue=""
android:defaultValue="default"
android:entries="@array/language_entries"
android:entryValues="@array/language_values"
android:key="language"