From 94447657c4833b993441eb523561f8aa3a6d8218 Mon Sep 17 00:00:00 2001
From: Sawyer Blatz <sdblatz@gmail.com>
Date: Wed, 29 Jan 2020 09:34:41 +0100
Subject: [PATCH] No issue: Fixes strings for data migration

---
 .../toolbar/BrowserToolbarController.kt       |  7 ++++-
 .../migration/MigrationProgressActivity.kt    | 15 ++++++++---
 .../fenix/settings/logins/SavedLoginsView.kt  |  8 ++++++
 .../main/res/layout/activity_migration.xml    |  2 +-
 app/src/main/res/values/strings.xml           | 26 +++++++++----------
 5 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
index 152bcbb08..77ad05f06 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
@@ -148,8 +148,13 @@ class DefaultBrowserToolbarController(
                     }
 
                     activity.getRootView()?.let {
+
+                        val appName = it.context.getString(R.string.app_name)
                         FenixSnackbar.makeWithToolbarPadding(it, Snackbar.LENGTH_SHORT)
-                            .setText(it.context.getString(R.string.snackbar_added_to_firefox_home))
+                            .setText(it.context.getString(
+                                R.string.snackbar_added_to_firefox_home,
+                                appName
+                            ))
                             .show()
                     }
                 }
diff --git a/app/src/main/java/org/mozilla/fenix/migration/MigrationProgressActivity.kt b/app/src/main/java/org/mozilla/fenix/migration/MigrationProgressActivity.kt
index 76819d6b2..ca2da1fab 100644
--- a/app/src/main/java/org/mozilla/fenix/migration/MigrationProgressActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/migration/MigrationProgressActivity.kt
@@ -40,11 +40,21 @@ class MigrationProgressActivity : AbstractMigrationProgressActivity() {
     }
 
     fun init() {
+        val appName = migration_description.context.getString(R.string.app_name)
+
+        migration_description.apply {
+            text = context.getString(R.string.migration_description, appName)
+        }
+
         migration_status_list.apply {
             layoutManager = LinearLayoutManager(this@MigrationProgressActivity)
             adapter = statusAdapter
         }
 
+        migration_welcome_title.apply {
+            text = context.getString(R.string.migration_title, appName)
+        }
+
         migration_button.apply {
             setOnClickListener {
                 finish()
@@ -56,10 +66,7 @@ class MigrationProgressActivity : AbstractMigrationProgressActivity() {
                     startActivity(intent)
                 }
             }
-            text = getString(
-                R.string.migration_updating_app_button_text,
-                getString(R.string.app_name)
-            )
+            text = getString(R.string.migration_updating_app_button_text, appName)
         }
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/SavedLoginsView.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/SavedLoginsView.kt
index 5835d0044..b19eafab5 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/logins/SavedLoginsView.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/logins/SavedLoginsView.kt
@@ -58,6 +58,14 @@ class SavedLoginsView(
             text = textWithLink
             setOnClickListener { interactor.onLearnMore() }
         }
+
+        with(view.saved_passwords_empty_message) {
+            val appName = context.getString(R.string.app_name)
+            text = context.getString(
+                R.string.preferences_passwords_saved_logins_description_empty_text,
+                appName
+            )
+        }
     }
 
     fun update(state: SavedLoginsFragmentState) {
diff --git a/app/src/main/res/layout/activity_migration.xml b/app/src/main/res/layout/activity_migration.xml
index 5aa10192c..8df5caede 100644
--- a/app/src/main/res/layout/activity_migration.xml
+++ b/app/src/main/res/layout/activity_migration.xml
@@ -21,7 +21,7 @@
                 android:id="@+id/migration_firefox_logo"
                 android:layout_width="67dp"
                 android:layout_height="67dp"
-                android:contentDescription="@string/firefox_logo_description"
+                android:importantForAccessibility="no"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/ic_firefox" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 272fc04aa..7688faf4f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -702,8 +702,8 @@
     <string name="snackbar_tab_closed">Tab closed</string>
     <!-- Text shown in snackbar when user closes all tabs -->
     <string name="snackbar_tabs_closed">Tabs closed</string>
-    <!-- Text shown in snackbar when user adds a site to Firefox home fragment -->
-    <string name="snackbar_added_to_firefox_home">Added to Firefox home!</string>
+    <!-- Text shown in snackbar when user adds a site to home fragment. Placeholder replaced with app name -->
+    <string name="snackbar_added_to_firefox_home">Added to %s home!</string>
     <!-- Text shown in snackbar when user closes a private tab -->
     <string name="snackbar_private_tab_closed">Private tab closed</string>
     <!-- Text shown in snackbar when user closes all private tabs -->
@@ -1046,8 +1046,8 @@
     <string name="preferences_passwords_sync_logins_sign_in">Sign in to Sync</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins">Saved logins</string>
-    <!-- Description of empty list of saved passwords  -->
-    <string name="preferences_passwords_saved_logins_description_empty_text">The logins you save or sync to Firefox will show up here.</string>
+    <!-- Description of empty list of saved passwords. Placeholder is replaced with app name.  -->
+    <string name="preferences_passwords_saved_logins_description_empty_text">The logins you save or sync to %s will show up here.</string>
     <!-- Preference to access list of saved logins -->
     <string name="preferences_passwords_saved_logins_description_empty_learn_more_link">Learn more about Sync.</string>
     <!-- Preference to access list of login exceptions that we never save logins for -->
@@ -1156,17 +1156,15 @@
     <!-- Text shown when a user successfully deletes a custom search engine -->
     <string name="search_delete_search_engine_success_message">Deleted %s</string>
 
-    <!-- Description text for the Firefox brand logo -->
-    <string name="firefox_logo_description">Firefox logo</string>
-    <!-- Title text shown for the migration screen to the new browser -->
-    <string name="migration_title">Welcome to an all-new Firefox</string>
-    <!-- Description text followed by a list of things migrating (e.g. Bookmarks, History) -->
-    <string name="migration_description">A completely redesigned browser awaits, with improved performance and features to help you do more online.\n\nPlease wait while we update Firefox with your</string>
-    <!-- Text on the disabled button while in progress -->
+    <!-- Title text shown for the migration screen to the new browser. Placeholder replaced with app name -->
+    <string name="migration_title">Welcome to an all-new %s</string>
+    <!-- Description text followed by a list of things migrating (e.g. Bookmarks, History). Placeholder replaced with app name-->
+    <string name="migration_description">A completely redesigned browser awaits, with improved performance and features to help you do more online.\n\nPlease wait while we update %s with your</string>
+    <!-- Text on the disabled button while in progress. Placeholder replaced with app name -->
     <string name="migration_updating_app_button_text">Updating %s…</string>
-    <!-- Text on the enabled button -->
+    <!-- Text on the enabled button. Placeholder replaced with app name-->
     <string name="migration_update_app_button">Start %s</string>
-    <!-- Accessibility description text for completed migration item (e.g. Bookmarks, History) -->
+    <!-- Accessibility description text for completed migration item (e.g. Bookmarks, History). Placeholder replaced with app name -->
     <string name="migration_icon_description">Migration status: %s</string>
 
     <!-- Site Permissions Preferences -->
@@ -1191,7 +1189,7 @@
     <string name="preference_category_phone_feature">Phone Feature</string>
     <!--Label that indicates that a user hasn't select a value for a site permission-->
     <string name="phone_feature_no_decision">No Decision</string>
-    <!-- Alternative explanation label that is shown when a permissions like (camera,location and microphone) is required, this indicate to the user how to enable the permission via Android settings %1$s indicate the name of the permission (camera,location and microphone)  -->
+    <!-- Explanation that is shown when a permissions like (camera,location and microphone) is required. Informs the user to enable the permission via Android settings. %1$s indicates the name of the permission (camera,location and microphone)  -->
     <string name="phone_feature_blocked_by_android_explanation"><![CDATA[
         To allow it: <br/><br/> 1. Go to Android Settings <br/><br/>2. Tap <b>Permissions</b> <br/><br/> 3. Toggle <b>%1$s</b> to ON
         ]]></string>