[tbb-commits] [tor-browser] branch tor-browser-102.3.0esr-12.0-2 updated: fixup! Bug 40926: Implemented the New Identity feature

[gitolite role]

This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch tor-browser-102.3.0esr-12.0-2
in repository tor-browser.

The following commit(s) were added to refs/heads/tor-browser-102.3.0esr-12.0-2 by this push:
     new 2bfef6cc3db2 fixup! Bug 40926: Implemented the New Identity feature
2bfef6cc3db2 is described below

commit 2bfef6cc3db2a31d7803e271638c0838295ad8a0
Author: Pier Angelo Vendrame <pierov at torproject.org>
AuthorDate: Thu Oct 13 19:36:46 2022 +0200

    fixup! Bug 40926: Implemented the New Identity feature
    
    Bug 41337: Add a title to the new identity confirmation
---
 browser/components/newidentity/content/newidentity.js     | 15 ++++++++++++---
 .../newidentity/locale/en-US/newIdentity.properties       |  2 ++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/browser/components/newidentity/content/newidentity.js b/browser/components/newidentity/content/newidentity.js
index 466cf437d90a..fac4c05e96a2 100644
--- a/browser/components/newidentity/content/newidentity.js
+++ b/browser/components/newidentity/content/newidentity.js
@@ -15,7 +15,9 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityStrings", () => {
   let strings = {
     new_identity: "New Identity",
     new_identity_sentence_case: "New identity",
+    new_identity_prompt_title: "Reset your identity?",
     new_identity_prompt: `${brandShortName} will close all windows and tabs. All website sessions will be lost. \nRestart ${brandShortName} now to reset your identity?`,
+    new_identity_restart: `${brandShortName}`,
     new_identity_ask_again: "Never ask me again",
     new_identity_menu_accesskey: "I",
   };
@@ -37,6 +39,10 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityStrings", () => {
       "%S",
       brandShortName
     );
+    strings.new_identity_restart = strings.new_identity_restart.replaceAll(
+      "%S",
+      brandShortName
+    );
   }
   return strings;
 });
@@ -523,15 +529,18 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => {
         const shouldConfirm = Services.prefs.getBoolPref(prefConfirm, true);
         if (shouldConfirm) {
           // Display two buttons, both with string titles.
-          const flags = Services.prompt.STD_YES_NO_BUTTONS;
+          const flags =
+            Services.prompt.BUTTON_TITLE_IS_STRING *
+              Services.prompt.BUTTON_POS_0 +
+            Services.prompt.BUTTON_TITLE_CANCEL * Services.prompt.BUTTON_POS_1;
           const askAgain = { value: false };
           const confirmed =
             Services.prompt.confirmEx(
               window,
-              "",
+              NewIdentityStrings.new_identity_prompt_title,
               NewIdentityStrings.new_identity_prompt,
               flags,
-              null,
+              NewIdentityStrings.new_identity_restart,
               null,
               null,
               NewIdentityStrings.new_identity_ask_again,
diff --git a/browser/components/newidentity/locale/en-US/newIdentity.properties b/browser/components/newidentity/locale/en-US/newIdentity.properties
index 54eeca135a5e..b44dd74c17df 100644
--- a/browser/components/newidentity/locale/en-US/newIdentity.properties
+++ b/browser/components/newidentity/locale/en-US/newIdentity.properties
@@ -2,7 +2,9 @@ new_identity = New Identity
 # This is the string for the hamburger menu
 new_identity_sentence_case = New identity
 # %S is the application name. Keep it as a placeholder
+new_identity_prompt_title = Reset your identity?
 new_identity_prompt = %S will close all windows and tabs. All website sessions will be lost. \nRestart %S now to reset your identity?
+new_identity_restart = Restart %S
 new_identity_ask_again = Never ask me again
 # Shown in the File menu (use Alt to show File, if you do not see)
 new_identity_menu_accesskey = I

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.