Merge remote-tracking branch 'origin/development' into development

# Conflicts:
#	fastlane/metadata/android/en-US/changelogs/133.txt
This commit is contained in:
jens committed 2023-07-02 00:33:59 +02:00
commit 6b9dbca7ab
12 files changed
+881 -3

No files matched your search

@@ -2014,7 +2014,16 @@ public class Miscellaneous extends Service
{
if(!Settings.displayLanguage.equals(Settings.default_displayLanguage))
{
Locale myLocale = new Locale(Settings.displayLanguage);
Locale myLocale;
if(Settings.displayLanguage.contains("_"))
{
String[] parts = Settings.displayLanguage.split("_");
myLocale = new Locale(parts[0], parts[1]);
}
else
myLocale = new Locale(Settings.displayLanguage);
Resources res = context.getResources();
DisplayMetrics dm = res.getDisplayMetrics();
Configuration conf = res.getConfiguration();