TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-05-02 19:10:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix locale when using country codes.

Browse Source
This commit is contained in:
3xo 2014-03-11 18:47:35 +01:00 committed by Moxie Marlinspike
parent ad54d2a05f
commit 64711771f0
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/org/thoughtcrime/securesms/util/DynamicLanguage.java
View File

@ -4,6 +4,7 @@ import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Build; import android.os.Build;
import android.text.TextUtils;
import java.util.Locale; import java.util.Locale;
@ -19,7 +20,7 @@ public class DynamicLanguage {
} }
public void onResume(Activity activity) { public void onResume(Activity activity) {
if (!currentLocale.getLanguage().equalsIgnoreCase(getSelectedLocale(activity).getLanguage())) { if (!currentLocale.equals(getSelectedLocale(activity))) {
Intent intent = activity.getIntent(); Intent intent = activity.getIntent();
intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION); intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
@ -38,7 +39,7 @@ public class DynamicLanguage {
private static void setActivityLocale(Activity activity, Locale selectedLocale) { private static void setActivityLocale(Activity activity, Locale selectedLocale) {
Configuration configuration = activity.getResources().getConfiguration(); Configuration configuration = activity.getResources().getConfiguration();
if (!configuration.locale.getLanguage().equalsIgnoreCase(selectedLocale.getLanguage())) { if (!configuration.locale.equals(selectedLocale)) {
configuration.locale = selectedLocale; configuration.locale = selectedLocale;
activity.getResources().updateConfiguration(configuration, activity.getResources().updateConfiguration(configuration,
activity.getResources().getDisplayMetrics()); activity.getResources().getDisplayMetrics());
@ -50,10 +51,15 @@ public class DynamicLanguage {
} }
private static Locale getSelectedLocale(Activity activity) { private static Locale getSelectedLocale(Activity activity) {
String language = TextSecurePreferences.getLanguage(activity); String language[] = TextUtils.split(TextSecurePreferences.getLanguage(activity), "_");
if (language.equals(DEFAULT)) return Locale.getDefault(); if (language[0].equals(DEFAULT)) {
else return new Locale(language); return Locale.getDefault();
} else if (language.length == 2) {
return new Locale(language[0], language[1]);
} else {
return new Locale(language[0]);
}
} }
private static final class OverridePendingTransition { private static final class OverridePendingTransition {