Bug 1363100 - change aboutdebugging links text to "Learn more";r=flod, ochameau draft
authorJulian Descottes <jdescottes@mozilla.com>
Mon, 08 May 2017 22:42:10 +0200
changeset 574419 25c1ba91555d905c7910ca2a367ef36b7053a84c
parent 574259 38f862749aed4e9a874182a9019e0671289088b0
child 627591 27189188eca9947930928fc1f23806514012437b
push id57705
push userjdescottes@mozilla.com
push dateMon, 08 May 2017 20:52:43 +0000
reviewersflod, ochameau
bugs1363100
milestone55.0a1
Bug 1363100 - change aboutdebugging links text to "Learn more";r=flod, ochameau MozReview-Commit-ID: jOWDb17tsv
devtools/client/aboutdebugging/aboutdebugging.css
devtools/client/aboutdebugging/components/addons/controls.js
devtools/client/aboutdebugging/components/addons/panel.js
devtools/client/aboutdebugging/components/workers/panel.js
devtools/client/locales/en-US/aboutdebugging.properties
--- a/devtools/client/aboutdebugging/aboutdebugging.css
+++ b/devtools/client/aboutdebugging/aboutdebugging.css
@@ -192,16 +192,17 @@ button {
   to a black icon. */
   filter: brightness(0%);
 }
 
 .addons-options {
   flex: 1;
 }
 
+.service-worker-disabled-label,
 .addons-debugging-label,
 .addons-web-ext-tip {
   display: inline-block;
   margin-inline-end: 1ch;
 }
 
 .addons-tip {
   display: flex;
--- a/devtools/client/aboutdebugging/components/addons/controls.js
+++ b/devtools/client/aboutdebugging/components/addons/controls.js
@@ -78,21 +78,20 @@ module.exports = createClass({
             checked: !debugDisabled,
             onChange: this.onEnableAddonDebuggingChange,
             role: "checkbox",
           }),
           dom.label({
             className: "addons-debugging-label",
             htmlFor: "enable-addon-debugging",
             title: Strings.GetStringFromName("addonDebugging.tooltip")
-          }, Strings.GetStringFromName("addonDebugging.label")),
-          "(",
+          }, Strings.GetStringFromName("addonDebugging.label2")),
           dom.a({ href: MORE_INFO_URL, target: "_blank" },
-            Strings.GetStringFromName("moreInfo")),
-          ")"
+            Strings.GetStringFromName("addonDebugging.learnMore")
+          ),
         ),
         dom.button({
           id: "load-addon-from-file",
           onClick: this.loadAddonFromFile,
         }, Strings.GetStringFromName("loadTemporaryAddon"))
       ),
       AddonsInstallError({ error: this.state.installError }));
   }
--- a/devtools/client/aboutdebugging/components/addons/panel.js
+++ b/devtools/client/aboutdebugging/components/addons/panel.js
@@ -152,20 +152,19 @@ module.exports = createClass({
         dom.img({
           className: "addons-tip-icon",
           role: "presentation",
           src: "chrome://devtools/skin/images/help.svg",
         }),
         dom.span({
           className: "addons-web-ext-tip",
         }, Strings.GetStringFromName("webExtTip")),
-        "(",
         dom.a({ href: WEB_EXT_URL, target: "_blank" },
-          Strings.GetStringFromName("moreInfo")),
-        ")"
+          Strings.GetStringFromName("webExtTip.learnMore")
+        )
       )
     ),
     dom.div({ id: "addons" },
       TargetList({
         id: "extensions",
         name: installedName,
         targets: installedTargets,
         client,
--- a/devtools/client/aboutdebugging/components/workers/panel.js
+++ b/devtools/client/aboutdebugging/components/workers/panel.js
@@ -24,17 +24,18 @@ loader.lazyImporter(this, "PrivateBrowsi
 
 loader.lazyRequireGetter(this, "DebuggerClient",
   "devtools/shared/client/main", true);
 
 const Strings = Services.strings.createBundle(
   "chrome://devtools/locale/aboutdebugging.properties");
 
 const WorkerIcon = "chrome://devtools/skin/images/debugging-workers.svg";
-const MORE_INFO_URL = "https://developer.mozilla.org/en-US/docs/Tools/about%3Adebugging";
+const MORE_INFO_URL = "https://developer.mozilla.org/en-US/docs/Tools/about%3Adebugging" +
+                      "#Service_workers_not_compatible";
 const PROCESS_COUNT_PREF = "dom.ipc.processCount";
 const MULTI_OPTOUT_PREF = "dom.ipc.multiOptOut";
 
 module.exports = createClass({
   displayName: "WorkersPanel",
 
   propTypes: {
     client: PropTypes.instanceOf(DebuggerClient).isRequired,
@@ -180,26 +181,29 @@ module.exports = createClass({
     if (!isDisabled) {
       return "";
     }
     return dom.p(
       {
         className: "service-worker-disabled"
       },
       dom.div({ className: "warning" }),
-      Strings.GetStringFromName("configurationIsNotCompatible"),
-      " (",
+      dom.span(
+        {
+          className: "service-worker-disabled-label",
+        },
+        Strings.GetStringFromName("configurationIsNotCompatible.label")
+      ),
       dom.a(
         {
           href: MORE_INFO_URL,
           target: "_blank"
         },
-        Strings.GetStringFromName("moreInfo")
+        Strings.GetStringFromName("configurationIsNotCompatible.learnMore")
       ),
-      ")"
     );
   },
 
   render() {
     let { client, id } = this.props;
     let { workers, processCount } = this.state;
 
     let isE10S = Services.appinfo.browserTabsRemoteAutostart;
--- a/devtools/client/locales/en-US/aboutdebugging.properties
+++ b/devtools/client/locales/en-US/aboutdebugging.properties
@@ -32,48 +32,56 @@ listeningForFetchEvents = Listening for 
 # LOCALIZATION NOTE (notListeningForFetchEvents):
 # This is used to display the state of the SW in regard to fetch events.
 notListeningForFetchEvents = Not listening for fetch events.
 
 # LOCALIZATION NOTE (addons):
 # This string is displayed as a header of the about:debugging#addons page.
 addons = Add-ons
 
-# LOCALIZATION NOTE (addonDebugging.label):
+# LOCALIZATION NOTE (addonDebugging.label2):
 # This string is displayed next to a check box that enables the user to switch
 # addon debugging on/off.
-addonDebugging.label = Enable add-on debugging
+addonDebugging.label2 = Enable add-on debugging.
 
 # LOCALIZATION NOTE (addonDebugging.tooltip):
 # This string is displayed in a tooltip that appears when hovering over a check
 # box that switches addon debugging on/off.
 addonDebugging.tooltip = Turning this on will allow you to debug add-ons and various other parts of the browser chrome
 
-# LOCALIZATION NOTE (moreInfo):
-# This string is displayed next to addonDebugging.label as a link to a page
-# with documentation.
-moreInfo = more info
+# LOCALIZATION NOTE (addonDebugging.learnMore):
+# This string is displayed as a link next to addonDebugging.label and leads the user to
+# the MDN documentation page for about:debugging.
+# (https://developer.mozilla.org/docs/Tools/about:debugging#Enabling_add-on_debugging)
+addonDebugging.learnMore = Learn more
 
 # LOCALIZATION NOTE (loadTemporaryAddon):
 # This string is displayed as a label of a button that allows the user to
 # load additional add-ons.
 loadTemporaryAddon = Load Temporary Add-on
 
 # LOCALIZATION NOTE (extensions):
 # This string is displayed as a header above the list of loaded add-ons.
 extensions = Extensions
 
 # LOCALIZATION NOTE (temporaryExtensions):
 # This string is displayed as a header above the list of temporarily loaded add-ons.
 temporaryExtensions = Temporary Extensions
 
 # LOCALIZATION NOTE (webExtTip):
 # This string is displayed as a message below the list of temporarily loaded add-ons.
+# Web-ext is a command line tool for web-extensions developers.
+# See https://developer.mozilla.org/Add-ons/WebExtensions/Getting_started_with_web-ext
 webExtTip = You can use web-ext to load temporary WebExtensions from the command line.
 
+# LOCALIZATION NOTE (webExtTip.learnMore):
+# This string is displayed as a link next to webExtTip and leads the user to the MDN
+# documentation page for web-ext.
+# (https://developer.mozilla.org/Add-ons/WebExtensions/Getting_started_with_web-ext)
+webExtTip.learnMore = Learn more
 
 # LOCALIZATION NOTE (selectAddonFromFile2):
 # This string is displayed as the title of the file picker that appears when
 # the user clicks the 'Load Temporary Add-on' button
 selectAddonFromFile2 = Select Manifest File or Package (.xpi)
 
 # LOCALIZATION NOTE (reload):
 # This string is displayed as a label of the button that reloads a given addon.
@@ -122,17 +130,28 @@ pageNotFound = Page not found
 # This string is displayed as an error message when navigating to an invalid page
 # %S will be replaced by the name of the page at run-time.
 doesNotExist = #%S does not exist!
 
 # LOCALIZATION NOTE (nothing):
 # This string is displayed when the list of workers is empty.
 nothing = Nothing yet.
 
-configurationIsNotCompatible = Your browser configuration is not compatible with Service Workers
+# LOCALIZATION NOTE (configurationIsNotCompatible.label):
+# This string is displayed in about:debugging#workers if the current configuration of the
+# browser is incompatible with service workers. More details at
+# https://developer.mozilla.org/en-US/docs/Tools/about%3Adebugging#Service_workers_not_compatible
+configurationIsNotCompatible.label = Your browser configuration is not compatible with Service Workers.
+
+# LOCALIZATION NOTE (configurationIsNotCompatible.learnMore):
+# This string is displayed as a link next to configurationIsNotCompatible.label and leads
+# the user to the MDN documentation page for about:debugging, on the section explaining
+# why service workers might not be available.
+# (https://developer.mozilla.org/en-US/docs/Tools/about%3Adebugging#Service_workers_not_compatible)
+configurationIsNotCompatible.learnMore = Learn more
 
 # LOCALIZATION NOTE (multiProcessWarningTitle):
 # This string is displayed as a warning message on top of the about:debugging#workers
 # page when multi-e10s is enabled
 multiProcessWarningTitle = Service Worker debugging is not compatible with multiple content processes at the moment.
 
 # LOCALIZATION NOTE (multiProcessWarningMessage):
 # This string is displayed in the warning section for multi-e10s in