Backed out changeset 494efc7d8c29 (bug 1486934) for build bustage at chrome/global/aboutAbout.dtd on a CLOSED TREE
authorCoroiu Cristina <ccoroiu@mozilla.com>
Thu, 20 Sep 2018 18:45:28 +0300
changeset 437474 81200ae33c9a1d91760535cce9120b619ae3946e
parent 437473 e762b63c9af793617fca37cc260025e411e315ac
child 437475 7066f941ce99a3230f0bcd8e14d9bbfcd3cc6b06
push id69679
push userccoroiu@mozilla.com
push dateThu, 20 Sep 2018 15:45:53 +0000
treeherderautoland@81200ae33c9a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1486934
milestone64.0a1
backs out494efc7d8c29163ac544a584055329ce2d32d0b5
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 494efc7d8c29 (bug 1486934) for build bustage at chrome/global/aboutAbout.dtd on a CLOSED TREE
python/l10n/fluent_migrations/bug_1486934_aboutAbout.py
toolkit/content/aboutAbout.xhtml
toolkit/locales/en-US/chrome/global/aboutAbout.dtd
toolkit/locales/en-US/toolkit/about/aboutAbout.ftl
toolkit/locales/jar.mn
deleted file mode 100644
--- a/python/l10n/fluent_migrations/bug_1486934_aboutAbout.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# coding=utf8
-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-from __future__ import absolute_import
-import fluent.syntax.ast as FTL
-from fluent.migrate.helpers import transforms_from
-
-def migrate(ctx):
-    """Bug 1486934 - Modify about:about to use fluent for localization, part {index}."""
-
-    ctx.add_transforms(
-        "toolkit/toolkit/about/aboutAbout.ftl",
-        "toolkit/toolkit/about/aboutAbout.ftl",
-        transforms_from(
-"""
-about-about-title = { COPY("toolkit/chrome/global/aboutAbout.dtd", "aboutAbout.title") }
-about-about-note = { TRIM_COPY("toolkit/chrome/global/aboutAbout.dtd", "aboutAbout.note") }
-""")
-)
--- a/toolkit/content/aboutAbout.xhtml
+++ b/toolkit/content/aboutAbout.xhtml
@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" [
+<!ENTITY % aboutAboutDTD SYSTEM "chrome://global/locale/aboutAbout.dtd" >
+%aboutAboutDTD;
+<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
+%globalDTD;
+]>
 
 <!-- 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/. -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-  <title data-l10n-id="about-about-title"></title>
+  <title>&aboutAbout.title;</title>
   <link rel="stylesheet" href="chrome://global/skin/in-content/info-pages.css" type="text/css"/>
-  <link rel="localization" href="toolkit/about/aboutAbout.ftl"/>
   <script type="application/javascript" src="chrome://global/content/aboutAbout.js"></script>
-
 </head>
 
-<body>
+<body dir="&locale.dir;">
   <div class="container">
-    <h1 data-l10n-id="about-about-title"></h1>
-    <p><em data-l10n-id="about-about-note"></em></p>
+    <h1>&aboutAbout.title;</h1>
+    <p><em>&aboutAbout.note;</em></p>
     <ul id="abouts" class="columns"></ul>
   </div>
 </body>
 </html>
new file mode 100644
--- /dev/null
+++ b/toolkit/locales/en-US/chrome/global/aboutAbout.dtd
@@ -0,0 +1,8 @@
+<!-- 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 aboutAbout.title  "About About">
+<!ENTITY aboutAbout.note   "This is a list of “about” pages for your convenience.<br/>
+                            Some of them might be confusing. Some are for diagnostic purposes only.<br/>
+                            And some are omitted because they require query strings.">
deleted file mode 100644
--- a/toolkit/locales/en-US/toolkit/about/aboutAbout.ftl
+++ /dev/null
@@ -1,9 +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/.
-
-about-about-title = About About
-about-about-note =
-    This is a list of “about” pages for your convenience.<br/>
-    Some of them might be confusing. Some are for diagnostic purposes only.<br/>
-    And some are omitted because they require query strings.
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -4,16 +4,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 [localization] @AB_CD@.jar:
   crashreporter                                    (%crashreporter/**/*.ftl)
   toolkit                                          (%toolkit/**/*.ftl)
 
 @AB_CD@.jar:
 % locale global @AB_CD@ %locale/@AB_CD@/global/
+  locale/@AB_CD@/global/aboutAbout.dtd                  (%chrome/global/aboutAbout.dtd)
   locale/@AB_CD@/global/aboutReader.properties          (%chrome/global/aboutReader.properties)
   locale/@AB_CD@/global/aboutRights.dtd                 (%chrome/global/aboutRights.dtd)
   locale/@AB_CD@/global/aboutNetworking.dtd             (%chrome/global/aboutNetworking.dtd)
 #ifndef ANDROID
   locale/@AB_CD@/global/aboutProfiles.dtd               (%chrome/global/aboutProfiles.dtd)
   locale/@AB_CD@/global/aboutProfiles.properties        (%chrome/global/aboutProfiles.properties)
 #endif
   locale/@AB_CD@/global/aboutStudies.properties         (%chrome/global/aboutStudies.properties)