From 6c3d2483412ce671af6094b2c11b34957b7cab75 Mon Sep 17 00:00:00 2001 From: Alexandru2909 Date: Thu, 3 Nov 2022 19:26:15 +0200 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/27691 - Replace 'Pocket' word in all strings with placeholder --- .../mozilla/fenix/home/pocket/PocketStoriesComposables.kt | 5 ++++- .../org/mozilla/fenix/settings/HomeSettingsFragment.kt | 4 ++++ app/src/main/res/values/static_strings.xml | 2 ++ app/src/main/res/values/strings.xml | 8 +++++--- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/home/pocket/PocketStoriesComposables.kt b/app/src/main/java/org/mozilla/fenix/home/pocket/PocketStoriesComposables.kt index 9f14af698f..1041d96b92 100644 --- a/app/src/main/java/org/mozilla/fenix/home/pocket/PocketStoriesComposables.kt +++ b/app/src/main/java/org/mozilla/fenix/home/pocket/PocketStoriesComposables.kt @@ -457,7 +457,10 @@ fun PoweredByPocketHeader( Column { Text( - text = stringResource(R.string.pocket_stories_feature_title), + text = stringResource( + R.string.pocket_stories_feature_title_2, + LocalContext.current.getString(R.string.pocket_product_name), + ), color = textColor, style = FirefoxTheme.typography.caption, ) diff --git a/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt index 8565b3c86d..80ea4a8e30 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt @@ -104,6 +104,10 @@ class HomeSettingsFragment : PreferenceFragmentCompat() { requirePreference(R.string.pref_key_pocket_homescreen_recommendations).apply { isVisible = FeatureFlags.isPocketRecommendationsFeatureEnabled(context) isChecked = context.settings().showPocketRecommendationsFeature + summary = context.getString( + R.string.customize_toggle_pocket_summary, + context.getString(R.string.pocket_product_name), + ) onPreferenceChangeListener = object : SharedPreferenceUpdater() { override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean { CustomizeHome.preferenceToggled.record( diff --git a/app/src/main/res/values/static_strings.xml b/app/src/main/res/values/static_strings.xml index c11b7cb60a..a03a71c094 100644 --- a/app/src/main/res/values/static_strings.xml +++ b/app/src/main/res/values/static_strings.xml @@ -26,6 +26,8 @@ AC AS + + Pocket diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 07086f9648..c4d67edc10 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -447,8 +447,8 @@ Pocket Thought-provoking stories - - Articles powered by Pocket + + Articles powered by %s Sponsored stories @@ -1867,7 +1867,9 @@ Discover more - Powered by Pocket. + Powered by Pocket. + + Powered by %s. Part of the Firefox family. %s