From f55b078bf67b0de556db586726c125ff89804eb6 Mon Sep 17 00:00:00 2001 From: Julian Descottes Date: Mon, 6 Nov 2017 15:36:28 +0100 Subject: [PATCH] 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 --- .../browser_misused_characters_in_strings.js | 4 + .../shim/aboutdevtools/aboutdevtools.xhtml | 17 ++-- .../tmp-locale/aboutdevtools.dtd | 34 -------- devtools/shim/jar.mn | 4 - devtools/shim/locales/en-US/aboutdevtools.dtd | 78 +++++++++++++++++++ 5 files changed, 90 insertions(+), 47 deletions(-) delete mode 100644 devtools/shim/aboutdevtools/tmp-locale/aboutdevtools.dtd create mode 100644 devtools/shim/locales/en-US/aboutdevtools.dtd diff --git a/browser/base/content/test/static/browser_misused_characters_in_strings.js b/browser/base/content/test/static/browser_misused_characters_in_strings.js index 5f5fc36e3e32..5445f84ebf9e 100644 --- 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" } ]; diff --git a/devtools/shim/aboutdevtools/aboutdevtools.xhtml b/devtools/shim/aboutdevtools/aboutdevtools.xhtml index 997c8892e810..fcae7d415e7d 100644 --- a/devtools/shim/aboutdevtools/aboutdevtools.xhtml +++ b/devtools/shim/aboutdevtools/aboutdevtools.xhtml @@ -5,7 +5,7 @@ %htmlDTD; %globalDTD; - %aboutdevtoolsDTD; + %aboutdevtoolsDTD; ]> @@ -36,7 +36,7 @@

&aboutDevtools.enable.commonMessage;

&aboutDevtools.enable.learnMoreLink;
- +
@@ -72,7 +72,7 @@ - +

&aboutDevtools.newsletter.thanks.title;

@@ -92,12 +92,11 @@ src="chrome://devtools-shim/content/aboutdevtools/images/dev-edition-logo.svg" alt="Firefox Developer Edition logo"/>
-

Firefox Developer Edition

-

- Looking for more than just Developer Tools? - Check out the Firefox browser that is built specifically for developers and modern workflows. -

- Learn more +

&aboutDevtools.footer.title;

+

&aboutDevtools.footer.message;

+ &aboutDevtools.footer.learnMoreLink;
diff --git a/devtools/shim/aboutdevtools/tmp-locale/aboutdevtools.dtd b/devtools/shim/aboutdevtools/tmp-locale/aboutdevtools.dtd deleted file mode 100644 index c4e0d302c2de..000000000000 --- a/devtools/shim/aboutdevtools/tmp-locale/aboutdevtools.dtd +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - -Privacy Policy."> - - - - - diff --git a/devtools/shim/jar.mn b/devtools/shim/jar.mn index 3affffcd940b..e44d5ed6c4bb 100644 --- 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) diff --git a/devtools/shim/locales/en-US/aboutdevtools.dtd b/devtools/shim/locales/en-US/aboutdevtools.dtd new file mode 100644 index 000000000000..9a6e18701ae0 --- /dev/null +++ b/devtools/shim/locales/en-US/aboutdevtools.dtd @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Privacy Policy."> + + + + + + + + + +