From fc446325e264712f47f9cee185823977b9603289 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 14 Feb 2022 16:14:27 +0100 Subject: [PATCH] Show reset to system language in system language --- .../main/java/eu/faircode/email/FragmentOptionsMisc.java | 8 +++++--- app/src/main/java/eu/faircode/email/Helper.java | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java index be6cd21992..a11e769ac7 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java @@ -28,6 +28,7 @@ import android.content.SharedPreferences; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PermissionInfo; +import android.content.res.Resources; import android.database.sqlite.SQLiteDatabaseCorruptException; import android.graphics.Paint; import android.graphics.Typeface; @@ -514,10 +515,11 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc ibResetLanguage.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new AlertDialog.Builder(view.getContext()) + Locale system = Resources.getSystem().getConfiguration().locale; + new AlertDialog.Builder(v.getContext()) .setIcon(R.drawable.twotone_help_24) - .setTitle(R.string.title_advanced_language_system) - .setMessage(R.string.title_advanced_english_hint) + .setTitle(system.getDisplayName(system)) + .setMessage(Helper.getString(v.getContext(), system, R.string.title_advanced_english_hint)) .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index 60b369d336..4047a88be2 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -1538,9 +1538,12 @@ public class Helper { static String getString(Context context, String language, int resid, Object... formatArgs) { if (language == null) return context.getString(resid, formatArgs); + return getString(context, new Locale(language), resid, formatArgs); + } + static String getString(Context context, Locale locale, int resid, Object... formatArgs) { Configuration configuration = new Configuration(context.getResources().getConfiguration()); - configuration.setLocale(new Locale(language)); + configuration.setLocale(locale); Resources res = context.createConfigurationContext(configuration).getResources(); return res.getString(resid, formatArgs); }