diff --git a/mail/base/content/messenger.xhtml b/mail/base/content/messenger.xhtml index 6e981b737b..44c476b993 100644 --- a/mail/base/content/messenger.xhtml +++ b/mail/base/content/messenger.xhtml @@ -91,7 +91,7 @@ #ifdef NIGHTLY_BUILD - + #endif &titledefault.label;@PRE_RELEASE_SUFFIX@ diff --git a/mail/base/content/sync.js b/mail/base/content/sync.js index 2a53e10856..8d5e73fe7c 100644 --- a/mail/base/content/sync.js +++ b/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", - "fxa-signout-dialog-body", - "fxa-signout-dialog-button", + "sync-signout-dialog-title", + "sync-signout-dialog-body", + "sync-signout-dialog-button", ]); } else { [title, body, button] = await document.l10n.formatValues([ diff --git a/mail/components/preferences/preferences.xhtml b/mail/components/preferences/preferences.xhtml index 8092f1af97..ed81b83989 100644 --- a/mail/components/preferences/preferences.xhtml +++ b/mail/components/preferences/preferences.xhtml @@ -60,7 +60,7 @@ #ifdef NIGHTLY_BUILD - + #endif diff --git a/mail/components/preferences/sync.js b/mail/components/preferences/sync.js index d8336c6e23..e361a8445c 100644 --- a/mail/components/preferences/sync.js +++ b/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", - "fxa-verification-not-sent-body", + "sync-verification-not-sent-title", + "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", - { id: "fxa-verification-sent-body", args: { userEmail: data.email } }, + "sync-verification-sent-title", + { + id: "sync-verification-sent-body", + args: { userEmail: data.email }, + }, ]); new Notification(title, { body }); } else { diff --git a/mail/locales/en-US/messenger/firefoxAccounts.ftl b/mail/locales/en-US/messenger/firefoxAccounts.ftl deleted file mode 100644 index 669fd166f3..0000000000 --- a/mail/locales/en-US/messenger/firefoxAccounts.ftl +++ /dev/null @@ -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 diff --git a/mail/locales/en-US/messenger/syncAccounts.ftl b/mail/locales/en-US/messenger/syncAccounts.ftl new file mode 100644 index 0000000000..e6d3790832 --- /dev/null +++ b/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 diff --git a/python/l10n/tb_fluent_migrations/bug_1857555_unbrand_firefox_account.py b/python/l10n/tb_fluent_migrations/bug_1857555_unbrand_firefox_account.py new file mode 100644 index 0000000000..a13c839031 --- /dev/null +++ b/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", + ), + )