Merge pull request #17004 from wordpress-mobile/issue/16483-add-curre…

…nt-locale-label-to-appsettings Add label with the current app language to the App Settings screen
wordpress-mobile · Aug 5, 2022 · 6fb4a46 · 6fb4a46
2 parents 46fd124 + a5985da
commit 6fb4a46
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -5,6 +5,7 @@
 * [*] Use larger thumbnail previews for recommended themes during site creation [https://github.com/wordpress-mobile/WordPress-Android/pull/16848]
 * [***] [internal] Block Editor: List block: Adds support for V2 behind a feature flag [https://github.com/WordPress/gutenberg/pull/42702]
 * [*] Jetpack App: Use the Jetpack green color for the skip buttons text in site creation [https://github.com/wordpress-mobile/WordPress-Android/pull/16994]
+* [**] App Settings: Show a label with the current language of the app under "Interface Language". [https://github.com/wordpress-mobile/WordPress-Android/pull/17004]
 
 20.4
 -----

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppSettingsFragment.java
@@ -59,6 +59,7 @@
 import org.wordpress.android.util.JetpackBrandingUtils;
 import org.wordpress.android.util.JetpackBrandingUtils.Screen;
 import org.wordpress.android.util.LocaleManager;
+import org.wordpress.android.util.LocaleProvider;
 import org.wordpress.android.util.NetworkUtils;
 import org.wordpress.android.util.ToastUtils;
 import org.wordpress.android.util.WPActivityUtils;
@@ -106,6 +107,7 @@ public class AppSettingsFragment extends PreferenceFragment
     @Inject UnifiedAboutFeatureConfig mUnifiedAboutFeatureConfig;
     @Inject MySiteDashboardTabsFeatureConfig mMySiteDashboardTabsFeatureConfig;
     @Inject JetpackBrandingUtils mJetpackBrandingUtils;
+    @Inject LocaleProvider mLocaleProvider;
 
     private static final String TRACK_STYLE = "style";
     private static final String TRACK_ENABLED = "enabled";
@@ -144,6 +146,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
         mLanguagePreference = (WPPreference) findPreference(getString(R.string.pref_key_language));
         mLanguagePreference.setOnPreferenceChangeListener(this);
         mLanguagePreference.setOnPreferenceClickListener(this);
+        mLanguagePreference.setSummary(mLocaleProvider.getAppLanguageDisplayString());
 
         mAppThemePreference = (ListPreference) findPreference(getString(R.string.pref_key_app_theme));
         mAppThemePreference.setOnPreferenceChangeListener(this);

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/language/LocalePickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/prefs/language/LocalePickerViewModel.kt
@@ -141,7 +141,7 @@ class LocalePickerViewModel @Inject constructor(
     private fun loadLocales() {
         val appLocale = localeProvider.getAppLocale()
 
-        val displayLabel = localeProvider.getLanguageDisplayString(appLocale.toString(), appLocale)
+        val displayLabel = localeProvider.getAppLanguageDisplayString()
         _suggestedLocale.postValue(CurrentLocale(displayLabel, appLocale.toString()))
 
         val availableLocales = resourceProvider.getStringArray(array.available_languages).distinct()

diff --git a/WordPress/src/main/java/org/wordpress/android/util/LocaleProvider.kt b/WordPress/src/main/java/org/wordpress/android/util/LocaleProvider.kt
@@ -8,8 +8,8 @@ class LocaleProvider @Inject constructor() {
         return LanguageUtils.getCurrentDeviceLanguage()
     }
 
-    fun getLanguageDisplayString(languageCode: String, displayLocale: Locale): String {
-        return LocaleManager.getLanguageString(languageCode, displayLocale)
+    fun getAppLanguageDisplayString(): String {
+        return LocaleManager.getLanguageString(getAppLocale().toString(), getAppLocale())
     }
 
     fun createSortedLocalizedLanguageDisplayStrings(

diff --git a/WordPress/src/test/java/org/wordpress/android/ui/prefs/locale/LocalePickerViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/prefs/locale/LocalePickerViewModelTest.kt
@@ -60,7 +60,7 @@ class LocalePickerViewModelTest : BaseUnitTest() {
 
         whenever(currentLocale.toString()).thenReturn("en_US")
         whenever(localeProvider.getAppLocale()).thenReturn(currentLocale)
-        whenever(localeProvider.getLanguageDisplayString(any(), any())).thenReturn("English (United States)")
+        whenever(localeProvider.getAppLanguageDisplayString()).thenReturn("English (United States)")
         whenever(localeProvider.createSortedLocalizedLanguageDisplayStrings(any(), any())).thenReturn(dummyLocales)
         whenever(resourceProvider.getStringArray(any())).thenReturn(languageCodes)