Bug 1594025 - move 'this site is not deceptive' string into markup to allow help hamburger menu to copy it, r=flod,fluent-reviewers
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Tue, 05 Nov 2019 17:40:47 +0000
changeset 12410 cf68f4383f8eb066638eb9bb247574d957e36c8f
parent 12409 7b0eeb51fa72f9f3868835460c45bdb3c5d8c389
child 12411 27811e5be47f9dd4a97e723b951f2e9feb2014dd
push id196
push userflodolo@mozilla.com
push dateWed, 06 Nov 2019 08:15:48 +0000
reviewersflod, fluent-reviewers
bugs1594025
Bug 1594025 - move 'this site is not deceptive' string into markup to allow help hamburger menu to copy it, r=flod,fluent-reviewers The help view copies strings from the main menubar. When we moved the original DTD string to ftl, there were performance implications for using it in browser.xhtml, so it was only added once needed. The help view copies attributes from the items in the main menubar's help menu, and so didn't copy the label for this item, resulting in the broken behaviour. To fix this, it's enough to have the string in the markup. As we've moved the other strings into menubar.ftl, I'm taking the opportunity to move this string there, too, next to its sibling string to report deceptive sites. Differential Revision: https://phabricator.services.mozilla.com/D51850 X-Channel-Repo: mozilla-central X-Channel-Converted-Revision: 489afa3eb121ff1ab70f405880acd757502d1e38 X-Channel-Repo: releases/mozilla-beta X-Channel-Revision: abe7cbe63f04be2e33810e6fa757fa73e257c4d0 X-Channel-Repo: releases/mozilla-release X-Channel-Revision: 0eae18af659f087056bce0f62a325e5e595fff72 X-Channel-Repo: releases/mozilla-esr68 X-Channel-Revision: 2eed5fdce27200f4596a1ce5cf7e7eaebcab160d
browser/browser/menubar.ftl
--- a/browser/browser/menubar.ftl
+++ b/browser/browser/menubar.ftl
@@ -279,13 +279,15 @@ menu-help-feedback-page =
     .accesskey = S
 menu-help-safe-mode-without-addons =
     .label = Restart with Add-ons Disabled…
     .accesskey = R
 menu-help-safe-mode-with-addons =
     .label = Restart with Add-ons Enabled
     .accesskey = R
 # Label of the Help menu item. Either this or
-# safeb.palm.notdeceptive.label from
-# phishing-afterload-warning-message.dtd is shown.
+# menu-help-notdeceptive is shown.
 menu-help-report-deceptive-site =
     .label = Report Deceptive Site…
     .accesskey = D
+menu-help-not-deceptive =
+    .label = This isn’t a deceptive site…
+    .accesskey = d