Bug 1408369 - move back aboutdevtools.dtd to devtools/shim/locales;r=flod

Add localization notes to aboutdevtools.dtd and move it back to the locales folder where it can be picked up by localization teams. MozReview-Commit-ID: 8fDimFwdBXv --HG-- rename : devtools/shim/aboutdevtools/tmp-locale/aboutdevtools.dtd => devtools/shim/locales/en-US/aboutdevtools.dtd extra : rebase_source : a39410806d2fc930eaaf74c7894371aa041b0dfe
2017-11-06 15:36:28 +01:00 · 2017-11-06 15:36:28 +01:00 · f55b078bf6
--- a/browser/base/content/test/static/browser_misused_characters_in_strings.js
+++ b/browser/base/content/test/static/browser_misused_characters_in_strings.js
@ -148,6 +148,10 @@ let gWhitelist = [{
    file: "preferences.properties",
    key: "searchResults.needHelp2",
    type: "double-quote"
+  }, {
+    file: "aboutdevtools.dtd",
+    key: "aboutDevtools.newsletter.privacy.label",
+    type: "single-quote"
  }
 ];

--- a/devtools/shim/aboutdevtools/aboutdevtools.xhtml
+++ b/devtools/shim/aboutdevtools/aboutdevtools.xhtml
@ -5,7 +5,7 @@
 <!DOCTYPE html [
 <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> %htmlDTD;
 <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> %globalDTD;
-<!ENTITY % aboutdevtoolsDTD SYSTEM "chrome://devtools-shim/content/aboutdevtools/tmp-locale/aboutdevtools.dtd"> %aboutdevtoolsDTD;
+<!ENTITY % aboutdevtoolsDTD SYSTEM "chrome://devtools-shim/locale/aboutdevtools.dtd"> %aboutdevtoolsDTD;
 ]>

 <html xmlns="http://www.w3.org/1999/xhtml" dir="&locale.dir;">
@ -36,7 +36,7 @@
        <p>&aboutDevtools.enable.commonMessage;</p>
        <a class="external installpage-link" href="https://developer.mozilla.org/docs/Tools" target="_blank">&aboutDevtools.enable.learnMoreLink;</a>
        <div class="buttons-container">
-          <button class="primary-button" id="install">&aboutDevtools.enable.installButton;</button>
+          <button class="primary-button" id="install">&aboutDevtools.enable.enableButton;</button>
          <button class="default-button" id="close">&aboutDevtools.enable.closeButton;</button>
        </div>
      </div>
@ -72,7 +72,7 @@
              <input type="checkbox" id="privacy" name="privacy" required="true" />
              <label for="privacy">&aboutDevtools.newsletter.privacy.label;</label>
            </section>
-            <button type="submit" id="newsletter-submit" class="primary-button">&aboutDevtools.newsletter.subscribe.label;</button>
+            <button type="submit" id="newsletter-submit" class="primary-button">&aboutDevtools.newsletter.subscribeButton;</button>
          </form>
          <div id="newsletter-thanks">
            <h2>&aboutDevtools.newsletter.thanks.title;</h2>
@ -92,12 +92,11 @@
           src="chrome://devtools-shim/content/aboutdevtools/images/dev-edition-logo.svg"
           alt="Firefox Developer Edition logo"/>
      <div class="footer-message">
-        <h1 class="footer-message-title">Firefox Developer Edition</h1>
-        <p>
-          Looking for more than just Developer Tools?
-          Check out the Firefox browser that is built specifically for developers and modern workflows.
-        </p>
-        <a class="external footer-link" href="https://www.mozilla.org/en-US/firefox/developer/" target="_blank">Learn more</a>
+        <h1 class="footer-message-title">&aboutDevtools.footer.title;</h1>
+        <p>&aboutDevtools.footer.message;</p>
+        <a class="external footer-link"
+           href="https://www.mozilla.org/firefox/developer/"
+           target="_blank">&aboutDevtools.footer.learnMoreLink;</a>
      </div>
    </footer>
  </div>
--- a/devtools/shim/aboutdevtools/tmp-locale/aboutdevtools.dtd
+++ b/devtools/shim/aboutdevtools/tmp-locale/aboutdevtools.dtd
@ -1,34 +0,0 @@
-<!-- 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  aboutDevtools.headTitle "About Developer Tools">
-<!ENTITY  aboutDevtools.enable.title "Enable Firefox Developer Tools">
-<!ENTITY  aboutDevtools.enable.inspectElementTitle "Enable Firefox Developer Tools to use Inspect Element">
-
-<!ENTITY  aboutDevtools.enable.aboutDebuggingMessage
-          "Develop and debug WebExtensions, web workers, service workers and more with Firefox DevTools.">
-<!ENTITY  aboutDevtools.enable.inspectElementMessage
-          "Examine and edit HTML and CSS with the DevTools Inspector.">
-<!ENTITY  aboutDevtools.enable.keyShortcutMessage
-          "You activated a Developer Tools shortcut. If that was a mistake, you can close this tab.">
-<!ENTITY  aboutDevtools.enable.menuMessage
-          "Examine, edit and debug HTML, CSS, and JavaScript with tools like Inspector and Debugger.">
-
-<!ENTITY  aboutDevtools.enable.commonMessage
-          "As of Firefox 58, Developer Tools are disabled by default to give you more control over your browser.">
-
-<!ENTITY  aboutDevtools.enable.learnMoreLink "Learn more about DevTools">
-<!ENTITY  aboutDevtools.enable.installButton "Enable Developer Tools">
-<!ENTITY  aboutDevtools.enable.closeButton "Close this page">
-<!ENTITY  aboutDevtools.welcome.title "Welcome to Firefox Developer Tools!">
-
-<!ENTITY  aboutDevtools.newsletter.title "Mozilla Developer Newsletter">
-<!ENTITY  aboutDevtools.newsletter.message "Get developer news, tricks and resources sent straight to your inbox.">
-<!ENTITY  aboutDevtools.newsletter.email.placeholder "Email">
-<!ENTITY  aboutDevtools.newsletter.privacy.label "I’m okay with Mozilla handling my info as explained in this <a class=&#x0022;external&#x0022; href=&#x0022;https://www.mozilla.org/privacy/&#x0022;>Privacy Policy</a>.">
-<!ENTITY  aboutDevtools.newsletter.subscribe.label "Subscribe">
-
-<!ENTITY  aboutDevtools.newsletter.thanks.title "Thanks!">
-<!ENTITY  aboutDevtools.newsletter.thanks.message "If you haven’t previously confirmed a subscription to a Mozilla-related newsletter you may have to do so. Please check your inbox or your spam filter for an email from us.">
-
--- a/devtools/shim/jar.mn
+++ b/devtools/shim/jar.mn
@ -12,10 +12,6 @@ devtools-shim.jar:

    content/aboutdevtools/images/otter.svg (aboutdevtools/images/otter.svg)

-    # Temporary localisation file, move back to devtools/shim/locales/en-US when ready for localization
-    # See https://bugzilla.mozilla.org/show_bug.cgi?id=1408369
-    content/aboutdevtools/tmp-locale/aboutdevtools.dtd (aboutdevtools/tmp-locale/aboutdevtools.dtd)
-
    content/aboutdevtools/images/dev-edition-logo.svg (aboutdevtools/images/dev-edition-logo.svg)
    content/aboutdevtools/images/external-link.svg (aboutdevtools/images/external-link.svg)
    content/aboutdevtools/images/feature-inspector.svg (aboutdevtools/images/feature-inspector.svg)
--- a/devtools/shim/locales/en-US/aboutdevtools.dtd
+++ b/devtools/shim/locales/en-US/aboutdevtools.dtd
@ -0,0 +1,78 @@
+<!-- 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 : This file contains the strings used in aboutdevtools.xhtml,
+  -  displayed when going to about:devtools. UI depends on the value of the preference
+  -  "devtools.enabled".
+  -
+  -  "aboutDevtools.enable.*" and "aboutDevtools.newsletter.*" keys are used when DevTools
+     are disabled
+  -  "aboutDevtools.welcome.*" keys are used when DevTools are enabled
+  - -->
+
+<!-- LOCALIZATION NOTE (aboutDevtools.headTitle): Text of the title tag for about:devtools -->
+<!ENTITY  aboutDevtools.headTitle "About Developer Tools">
+
+<!-- LOCALIZATION NOTE (aboutDevtools.enable.title): Title of the top about:devtools
+  -  section displayed when DevTools are disabled. -->
+<!ENTITY  aboutDevtools.enable.title "Enable Firefox Developer Tools">
+
+<!-- LOCALIZATION NOTE (aboutDevtools.enable.inspectElementTitle): Title of the top
+  -  section displayed when devtools are disabled and the user triggered DevTools by using
+  -  the Inspect Element menu item. -->
+<!ENTITY  aboutDevtools.enable.inspectElementTitle "Enable Firefox Developer Tools to use Inspect Element">
+
+<!-- LOCALIZATION NOTE (aboutDevtools.enable.inspectElementMessage): Message displayed
+  -  when users come from using the Inspect Element menu item. -->
+<!ENTITY  aboutDevtools.enable.inspectElementMessage
+          "Examine and edit HTML and CSS with the Developer Tools’ Inspector.">
+
+<!-- LOCALIZATION NOTE (aboutDevtools.enable.aboutDebuggingMessage): Message displayed
+  -  when users come from about:debugging. -->
+<!ENTITY  aboutDevtools.enable.aboutDebuggingMessage
+          "Develop and debug WebExtensions, web workers, service workers and more with Firefox Developer Tools.">
+
+<!-- LOCALIZATION NOTE (aboutDevtools.enable.keyShortcutMessage): Message displayed when
+  -  users pressed a DevTools key shortcut. -->
+<!ENTITY  aboutDevtools.enable.keyShortcutMessage
+          "You activated a Developer Tools shortcut. If that was a mistake, you can close this tab.">
+
+<!-- LOCALIZATION NOTE (aboutDevtools.enable.menuMessage): Message displayed when users
+  -  clicked on a "Enable Developer Tools" menu item. -->
+<!ENTITY  aboutDevtools.enable.menuMessage
+          "Examine, edit and debug HTML, CSS, and JavaScript with tools like Inspector and Debugger.">
+
+<!-- LOCALIZATION NOTE (aboutDevtools.enable.commonMessage): Generic message displayed for
+  -  all possible entry points (keyshortcut, menu item etc…). -->
+<!ENTITY  aboutDevtools.enable.commonMessage
+          "Firefox Developer Tools are disabled by default to give you more control over your browser.">
+
+<!-- LOCALIZATION NOTE (aboutDevtools.enable.learnMoreLink): Text for the link to
+  -  https://developer.mozilla.org/docs/Tools displayed in the top section when DevTools
+  -  are disabled. -->
+<!ENTITY  aboutDevtools.enable.learnMoreLink "Learn more about Developer Tools">
+
+<!ENTITY  aboutDevtools.enable.enableButton "Enable Developer Tools">
+<!ENTITY  aboutDevtools.enable.closeButton "Close this page">
+
+<!ENTITY  aboutDevtools.welcome.title "Welcome to Firefox Developer Tools!">
+
+<!ENTITY  aboutDevtools.newsletter.title "Mozilla Developer Newsletter">
+<!-- LOCALIZATION NOTE (aboutDevtools.newsletter.message): Subscribe form message.
+  -  The newsletter is only available in english at the moment.
+  -  See Bug 1415273 for support of additional languages.-->
+<!ENTITY  aboutDevtools.newsletter.message "Get developer news, tricks and resources sent straight to your inbox.">
+<!ENTITY  aboutDevtools.newsletter.email.placeholder "Email">
+<!ENTITY  aboutDevtools.newsletter.privacy.label "I’m okay with Mozilla handling my info as explained in this <a class='external' href='https://www.mozilla.org/privacy/'>Privacy Policy</a>.">
+<!ENTITY  aboutDevtools.newsletter.subscribeButton "Subscribe">
+<!ENTITY  aboutDevtools.newsletter.thanks.title "Thanks!">
+<!ENTITY  aboutDevtools.newsletter.thanks.message "If you haven’t previously confirmed a subscription to a Mozilla-related newsletter you may have to do so. Please check your inbox or your spam filter for an email from us.">
+
+<!ENTITY  aboutDevtools.footer.title "Firefox Developer Edition">
+<!ENTITY  aboutDevtools.footer.message "Looking for more than just Developer Tools? Check out the Firefox browser that is built specifically for developers and modern workflows.">
+
+<!-- LOCALIZATION NOTE (aboutDevtools.footer.learnMoreLink): Text for the link to
+  -  https://www.mozilla.org/firefox/developer/ displayed in the footer. -->
+<!ENTITY  aboutDevtools.footer.learnMoreLink "Learn more">
+