Bug 1266166 - Menuitems to report as phishing attempt or as a false positive/non-phishing attempt should use different accesskeys. r?francois draft
authorSebastian Hengst <archaeopteryx@coole-files.de>
Wed, 20 Apr 2016 22:47:11 +0200
changeset 354426 7d9419db44e4d46691ea8fdebc11e643227b8226
parent 354406 30c5dbcee7ddeafcaffa50e01429c45d459bb8fc
child 519000 acb6385c96a831d4b675d3c37700397adda40790
push id16074
push userarchaeopteryx@coole-files.de
push dateWed, 20 Apr 2016 20:49:27 +0000
reviewersfrancois
bugs1266166
milestone48.0a1
Bug 1266166 - Menuitems to report as phishing attempt or as a false positive/non-phishing attempt should use different accesskeys. r?francois MozReview-Commit-ID: HBoewKU3LS
browser/base/content/report-phishing-overlay.xul
browser/locales/en-US/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
browser/locales/en-US/chrome/browser/safebrowsing/report-phishing.dtd
--- a/browser/base/content/report-phishing-overlay.xul
+++ b/browser/base/content/report-phishing-overlay.xul
@@ -21,15 +21,15 @@
               label="&reportDeceptiveSiteMenu.title;"
               accesskey="&reportDeceptiveSiteMenu.accesskey;"
               insertbefore="aboutSeparator"
               observes="reportPhishingBroadcaster"
               oncommand="openUILink(gSafeBrowsing.getReportURL('Phish'), event);"
               onclick="checkForMiddleClick(this, event);"/>
     <menuitem id="menu_HelpPopup_reportPhishingErrortoolmenu"
               label="&safeb.palm.notdeceptive.label;"
-              accesskey="&reportDeceptiveSiteMenu.accesskey;"
+              accesskey="&safeb.palm.notdeceptive.accesskey;"
               insertbefore="aboutSeparator"
               observes="reportPhishingErrorBroadcaster"
               oncommand="openUILinkIn(gSafeBrowsing.getReportURL('PhishMistake'), 'tab');"
               onclick="checkForMiddleClick(this, event);"/>
   </menupopup>
 </overlay>
--- a/browser/locales/en-US/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
+++ b/browser/locales/en-US/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
@@ -1,16 +1,23 @@
 <!-- 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/. -->
 
 <!ENTITY safeb.palm.accept.label "Get me out of here!">
 <!ENTITY safeb.palm.decline.label "Ignore this warning">
-<!-- Localization note (safeb.palm.notdeceptive.label) - Label of the Help menu item. -->
+<!-- Localization note (safeb.palm.notdeceptive.label) - Label of the Help menu
+  item. Either this or reportDeceptiveSiteMenu.label from report-phishing.dtd is
+  shown. -->
 <!ENTITY safeb.palm.notdeceptive.label "This isn’t a deceptive site…">
+<!-- Localization note (safeb.palm.notdeceptive.accesskey) - Because
+  safeb.palm.notdeceptive.label and reportDeceptiveSiteMenu.title from
+  report-phishing.dtd are never shown at the same time, the same accesskey can
+  be used for them. -->
+<!ENTITY safeb.palm.notdeceptive.accesskey "d">
 <!ENTITY safeb.palm.reportPage.label "Why was this page blocked?">
 <!ENTITY safeb.palm.whyForbidden.label "Why was this page blocked?">
 
 <!ENTITY safeb.blocked.malwarePage.title "Reported Attack Page!">
 <!-- Localization note (safeb.blocked.malwarePage.shortDesc) - Please don't translate the contents of the <span id="malware_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
 <!ENTITY safeb.blocked.malwarePage.shortDesc "This web page at <span id='malware_sitename'/> has been reported as an attack page and has been blocked based on your security preferences.">
 <!ENTITY safeb.blocked.malwarePage.longDesc "<p>Attack pages try to install programs that steal private information, use your computer to attack others, or damage your system.</p><p>Some attack pages intentionally distribute harmful software, but many are compromised without the knowledge or permission of their owners.</p>">
 
--- a/browser/locales/en-US/chrome/browser/safebrowsing/report-phishing.dtd
+++ b/browser/locales/en-US/chrome/browser/safebrowsing/report-phishing.dtd
@@ -1,6 +1,13 @@
 <!-- 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/. -->
 
+<!-- Localization note (reportDeceptiveSiteMenu.title) - Label of the Help menu
+  item. Either this or safeb.palm.notdeceptive.label from
+  phishing-afterload-warning-message.dtd is shown. -->
 <!ENTITY reportDeceptiveSiteMenu.title      "Report deceptive site…">
+<!-- Localization note (reportDeceptiveSiteMenu.accesskey) - Because
+  safeb.palm.notdeceptive.label from phishing-afterload-warning-message.dtd and
+  reportDeceptiveSiteMenu.title are never shown at the same time, the same
+  accesskey can be used for them. -->
 <!ENTITY reportDeceptiveSiteMenu.accesskey  "D">