Bug 1857555 - Remove reference to Firefox accounts in l10 strings. r=mkmelin,rjl

It should be fine to not specify which account we're dealing directly with in the string since the context should make this unambiguous - see https://bugzilla.mozilla.org/show_bug.cgi?id=1857555#c6

Differential Revision: https://phabricator.services.mozilla.com/D190324

--HG--
rename : mail/locales/en-US/messenger/firefoxAccounts.ftl => mail/locales/en-US/messenger/syncAccounts.ftl
extra : amend_source : 0ae55093e22552c09309ffa1f249642a114cce31

mail/base/content/messenger.xhtml

@@ -91,7 +91,7 @@
   <link rel="localization" href="messenger/unifiedToolbar.ftl" />
   <link rel="localization" href="messenger/unifiedToolbarItems.ftl" />
 #ifdef NIGHTLY_BUILD
-  <link rel="localization" href="messenger/firefoxAccounts.ftl" />
+  <link rel="localization" href="messenger/syncAccounts.ftl" />
 #endif
 
   <title>&titledefault.label;@PRE_RELEASE_SUFFIX@</title>

mail/base/content/sync.js

@@ -102,9 +102,9 @@ var gSync = {
       let title, body, button;
       if (disconnectAccount) {
         [title, body, button] = await document.l10n.formatValues([
-          "fxa-signout-dialog-title",
+          "sync-signout-dialog-title",
-          "fxa-signout-dialog-body",
+          "sync-signout-dialog-body",
-          "fxa-signout-dialog-button",
+          "sync-signout-dialog-button",
         ]);
       } else {
         [title, body, button] = await document.l10n.formatValues([

mail/components/preferences/preferences.xhtml

@@ -60,7 +60,7 @@
   <link rel="localization" href="security/certificates/deviceManager.ftl" />
 #ifdef NIGHTLY_BUILD
   <link rel="localization" href="messenger/preferences/sync-dialog.ftl" />
-  <link rel="localization" href="messenger/firefoxAccounts.ftl" />
+  <link rel="localization" href="messenger/syncAccounts.ftl" />
 #endif
 
   <script defer="defer" src="chrome://global/content/preferencesBindings.js"></script>

mail/components/preferences/sync.js

@@ -294,8 +294,8 @@ var gSyncPane = {
   verifyFirefoxAccount() {
     let onError = async () => {
       let [title, body] = await document.l10n.formatValues([
-        "fxa-verification-not-sent-title",
+        "sync-verification-not-sent-title",
-        "fxa-verification-not-sent-body",
+        "sync-verification-not-sent-body",
       ]);
       new Notification(title, { body });
     };
@@ -303,8 +303,11 @@ var gSyncPane = {
     let onSuccess = async data => {
       if (data) {
         let [title, body] = await document.l10n.formatValues([
-          "fxa-verification-sent-title",
+          "sync-verification-sent-title",
-          { id: "fxa-verification-sent-body", args: { userEmail: data.email } },
+          {
+            id: "sync-verification-sent-body",
+            args: { userEmail: data.email },
+          },
         ]);
         new Notification(title, { body });
       } else {

mail/locales/en-US/messenger/firefoxAccounts.ftl

@@ -1,32 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, you can obtain one at http://mozilla.org/MPL/2.0/.
-
-# “Account” can be localized, “Firefox” must be treated as a brand,
-# and kept in English.
--fxaccount-brand-name =
-    { $capitalization ->
-        [sentence] Firefox account
-       *[title] Firefox Account
-    }
-
-## These strings are shown in a desktop notification after the user requests we resend a verification email.
-
-fxa-verification-sent-title = Verification Sent
-# Variables:
-# $userEmail (String) - Email address of user's Firefox Account.
-fxa-verification-sent-body = A verification link has been sent to { $userEmail }.
-fxa-verification-not-sent-title = Unable to Send Verification
-fxa-verification-not-sent-body = We are unable to send a verification mail at this time, please try again later.
-
-## These strings are shown in a confirmation dialog when the user chooses to sign out.
-
-fxa-signout-dialog-title = Sign out of { -fxaccount-brand-name(capitalization: "sentence") }?
-fxa-signout-dialog-body = Synced data will remain in your account.
-fxa-signout-dialog-button = Sign out
-
-## These strings are shown in a confirmation dialog when the user chooses to stop syncing.
-
-sync-disconnect-dialog-title = Disconnect?
-sync-disconnect-dialog-body = { -brand-product-name } will stop syncing but won’t delete any of your data on this device.
-sync-disconnect-dialog-button = Disconnect

mail/locales/en-US/messenger/syncAccounts.ftl

@@ -0,0 +1,26 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, you can obtain one at http://mozilla.org/MPL/2.0/.
+
+# The strings in this file relate to the configuration of Mozilla accounts for sync.
+
+## These strings are shown in a desktop notification after the user requests we resend a verification email.
+
+sync-verification-sent-title = Verification Sent
+# Variables:
+# $userEmail (String) - Email address of the account used for sync.
+sync-verification-sent-body = A verification link has been sent to { $userEmail }.
+sync-verification-not-sent-title = Unable to Send Verification
+sync-verification-not-sent-body = We are unable to send a verification mail at this time, please try again later.
+
+## These strings are shown in a confirmation dialog when the user chooses to sign out.
+
+sync-signout-dialog-title = Sign out of account?
+sync-signout-dialog-body = Synced data will remain in your account.
+sync-signout-dialog-button = Sign out
+
+## These strings are shown in a confirmation dialog when the user chooses to stop syncing.
+
+sync-disconnect-dialog-title = Disconnect?
+sync-disconnect-dialog-body = { -brand-product-name } will stop syncing but won’t delete any of your data on this device.
+sync-disconnect-dialog-button = Disconnect

python/l10n/tb_fluent_migrations/bug_1857555_unbrand_firefox_account.py

@@ -0,0 +1,25 @@
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+from fluent.migratetb.helpers import transforms_from
+from fluent.migratetb import COPY_PATTERN
+
+
+def migrate(ctx):
+    """Bug 1857555 - Remove any mention of Firefox accounts in l10n strings, part {index}"""
+
+    ctx.add_transforms(
+        "mail/messenger/syncAccounts.ftl",
+        "mail/messenger/syncAccounts.ftl",
+        transforms_from(
+            """
+sync-verification-sent-title = { COPY_PATTERN(from_path, "fxa-verification-sent-title") }
+sync-verification-sent-body = { COPY_PATTERN(from_path, "fxa-verification-sent-body") }
+sync-verification-not-sent-title = { COPY_PATTERN(from_path, "fxa-verification-not-sent-title") }
+sync-verification-not-sent-body = { COPY_PATTERN(from_path, "fxa-verification-not-sent-body") }
+sync-signout-dialog-body = { COPY_PATTERN(from_path, "fxa-signout-dialog-body") }
+sync-signout-dialog-button = { COPY_PATTERN(from_path, "fxa-signout-dialog-button") }
+            """,
+            from_path="mail/messenger/firefoxAccounts.ftl",
+        ),
+    )