sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-18 20:04:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix language override

Browse source
This commit is contained in:
Phillip Thelen 2019-01-07 15:57:24 +01:00
parent 5629020d0e
commit 94180ed6bd
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/AndroidManifest.xml
View file

@ -24,7 +24,7 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:label="@string/app_name"
android:theme="@style/AppTheme"
tools:replace="android:name"
tools:replace="android:name"
android:fullBackupContent="@xml/backup_descriptor">
<activity
android:name=".ui.activities.MainActivity"

2
Habitica/res/values/values.xml
View file

@ -77,6 +77,7 @@
<item>Türk</item>
<item>中文（简体）</item>
<item>中文（正體）</item>
<item>한국어</item>
</string-array>
<string-array name="LanguageValues">
@ -99,6 +100,7 @@
<item>tr</item>
<item>zh</item>
<item>zh_TW</item>
<item>ko</item>
</string-array>

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
View file

@ -175,8 +175,6 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
@SuppressLint("ObsoleteSdkInt")
public override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
val languageHelper = LanguageHelper(sharedPreferences.getString("language", "en"))
Locale.setDefault(languageHelper.locale)
@ -190,7 +188,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
@Suppress("Deprecation")
resources.updateConfiguration(configuration,
resources.displayMetrics)
super.onCreate(savedInstanceState)
if (!HabiticaBaseApplication.checkUserAuthentication(this, hostConfig)) {
return