Bug 1637207 - Port bug 1636909: Update the Master Password OS authentication prompt string on Windows. r=mkmelin
authorRichard Marti <richard.marti@gmail.com>
Tue, 12 May 2020 13:29:56 +0200
changeset 39131 7ae3a50f2816e6508e1e2f806a480ce6c3eebd07
parent 39130 0b9a9d6280be4f4d6b7a902acc26b6aa326719af
child 39132 d57944ea052e2e067d7ee2b096e0613e8d86b074
push id402
push userclokep@gmail.com
push dateMon, 29 Jun 2020 20:48:04 +0000
reviewersmkmelin
bugs1637207, 1636909
Bug 1637207 - Port bug 1636909: Update the Master Password OS authentication prompt string on Windows. r=mkmelin Port of https://hg.mozilla.org/mozilla-central/rev/af9db2d66556
mail/components/preferences/privacy.js
mail/locales/en-US/messenger/preferences/preferences.ftl
--- a/mail/components/preferences/privacy.js
+++ b/mail/components/preferences/privacy.js
@@ -325,24 +325,23 @@ var gPrivacyPane = {
     }
     this._initMasterPasswordUI();
   },
 
   /**
    * Displays a dialog in which the master password may be changed.
    */
   async changeMasterPassword() {
-    // Require OS authentication before the user can set a Master Password
-    if (!LoginHelper.isMasterPasswordSet()) {
-      let messageId = "master-password-os-auth-dialog-message";
-      if (AppConstants.platform == "macosx") {
-        // MacOS requires a special format of this dialog string.
-        // See preferences.ftl for more information.
-        messageId += "-macosx";
-      }
+    // OS reauthenticate functionality is not available on Linux yet (bug 1527745)
+    if (
+      !LoginHelper.isMasterPasswordSet() &&
+      AppConstants.platform != "linux"
+    ) {
+      let messageId =
+        "master-password-os-auth-dialog-message-" + AppConstants.platform;
       let [messageText, captionText] = await L10n.formatMessages([
         {
           id: messageId,
         },
         {
           id: "master-password-os-auth-dialog-caption",
         },
       ]);
--- a/mail/locales/en-US/messenger/preferences/preferences.ftl
+++ b/mail/locales/en-US/messenger/preferences/preferences.ftl
@@ -82,17 +82,17 @@ update-in-progress-message = Do you want
 update-in-progress-ok-button = &Discard
 # Continue is the cancel button so pressing escape or using a platform standard
 # method of closing the UI will not discard the update.
 update-in-progress-cancel-button = &Continue
 
 ## OS Authentication dialog
 
 # This message can be seen by trying to add a Master Password.
-master-password-os-auth-dialog-message = Verify your identity to create a Master Password.
+master-password-os-auth-dialog-message-win = To create a Master Password, enter your Windows login credentials. This helps protect the security of your accounts.
 
 # This message can be seen by trying to add a Master Password.
 # The macOS strings are preceded by the operating system with "Thunderbird is trying to "
 # and includes subtitle of "Enter password for the user "xxx" to allow this." These
 # notes are only valid for English. Please test in your locale.
 master-password-os-auth-dialog-message-macosx = create a Master Password
 
 # Don't change this label.