Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 05:09:53 +01:00
Code Issues Projects Releases Wiki Activity

Set Locale only once

Browse Source
This commit is contained in:
Julian Dehm
2018-10-29 13:50:35 +01:00
committed by akwizgran
parent 4415598d3d
commit b111abb484
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
briar-android/src/main/java/org/briarproject/briar/android/Localizer.java
View File

@@ -32,6 +32,7 @@ public class Localizer {
this.systemLocale = systemLocale; this.systemLocale = systemLocale;
if (userLocale == null) locale = systemLocale; if (userLocale == null) locale = systemLocale;
else locale = userLocale; else locale = userLocale;
setLocaleAndSystemConfiguration();
} }
// Instantiate the Localizer. // Instantiate the Localizer.
@@ -72,18 +73,11 @@ public class Localizer {
public Context setLocale(Context context) { public Context setLocale(Context context) {
Resources res = context.getResources(); Resources res = context.getResources();
Configuration conf = res.getConfiguration(); Configuration conf = res.getConfiguration();
Locale.setDefault(locale);
updateConfiguration(conf, locale); updateConfiguration(conf, locale);
Configuration systemConfiguration =
Resources.getSystem().getConfiguration();
updateConfiguration(systemConfiguration, locale);
// DateUtils uses the system resources, so we need to update them too.
// Apparently updateConfiguration is not deprecated here but is below.
Resources.getSystem().updateConfiguration(systemConfiguration,
Resources.getSystem().getDisplayMetrics());
if (SDK_INT >= 17) if (SDK_INT >= 17)
return context.createConfigurationContext(conf); return context.createConfigurationContext(conf);
//noinspection deprecation //noinspection deprecation
// Use the old API on < 17
res.updateConfiguration(conf, res.getDisplayMetrics()); res.updateConfiguration(conf, res.getDisplayMetrics());
return context; return context;
} }
@@ -94,4 +88,14 @@ public class Localizer {
} else } else
conf.locale = locale; conf.locale = locale;
} }
private void setLocaleAndSystemConfiguration() {
Locale.setDefault(locale);
Configuration systemConfiguration =
Resources.getSystem().getConfiguration();
updateConfiguration(systemConfiguration, locale);
// DateUtils uses the system resources, so we need to update them too.
Resources.getSystem().updateConfiguration(systemConfiguration,
Resources.getSystem().getDisplayMetrics());
}
} }