diff options
| author | Mark H Weaver <mhw@netris.org> | 2019-11-20 12:54:56 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2019-11-20 21:23:22 -0500 |
| commit | 7a0276f06a6858c04b3d8007e4e0e3eda6f76368 (patch) | |
| tree | 920d31b78bdfea73a14f94d887dcb4f13cc63ca0 | |
| parent | b711432c5d5fd121f339e28fa2d6392316d01a90 (diff) | |
Fix about:rights page.
* data/aboutRights.xhtml: Update for version 68.
* makeicecat: Remove code to modify aboutRights.dtd files, which no
longer exist in version 68. Apply terminology changes to *.ftl files.
| -rw-r--r-- | data/aboutRights.xhtml | 31 | ||||
| -rwxr-xr-x | makeicecat | 7 |
2 files changed, 19 insertions, 19 deletions
diff --git a/data/aboutRights.xhtml b/data/aboutRights.xhtml index 5435a11..db5282c 100644 --- a/data/aboutRights.xhtml +++ b/data/aboutRights.xhtml @@ -2,10 +2,6 @@ <!DOCTYPE html [ <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> %htmlDTD; - <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> - %brandDTD; - <!ENTITY % aboutRightsDTD SYSTEM "chrome://global/locale/aboutRights.dtd"> - %aboutRightsDTD; ]> <!-- This Source Code Form is subject to the terms of the Mozilla Public @@ -15,19 +11,28 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>&rights.pagetitle;</title> - <link rel="stylesheet" href="chrome://global/skin/about.css" type="text/css"/> + <meta http-equiv="Content-Security-Policy" content="default-src chrome:" /> + <title data-l10n-id="rights-title"></title> + <link rel="stylesheet" href="chrome://global/skin/in-content/info-pages.css" type="text/css"/> + <link rel="stylesheet" href="chrome://global/skin/aboutRights.css" type="text/css"/> + <link rel="localization" href="branding/brand.ftl"/> + <link rel="localization" href="toolkit/about/aboutRights.ftl"/> </head> -<body id="your-rights" dir="&rights.locale-direction;" class="aboutPageWideContainer"> +<body id="your-rights"> +<div class="container"> + <div class="rights-header"> + <div> + <h1 data-l10n-id="rights-title"></h1> -<h1>&rights.intro-header;</h1> + <p data-l10n-id="rights-intro"></p> + </div> + </div> -<p>&rights.intro;</p> - -<ul> - <li>&rights.intro-point1a;<a href="http://www.mozilla.org/MPL/">&rights.intro-point1b;</a>&rights.intro-point1c;</li> -</ul> + <ul> + <li data-l10n-id="rights-intro-point-1"><a href="http://www.mozilla.org/MPL/" data-l10n-name="mozilla-public-license-link"></a></li> + </ul> +</div> </body> </html> @@ -240,11 +240,6 @@ cp $DATA/bookmarks.html.in browser/locales/generic/profile/bookmarks.html.in find l10n -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "The IceCat logo is Copyright 2008-2015 Free Software Foundation, released under the terms of the GNU Lesser General Public License, version 3 or any later version.">/' -i find l10n -wholename '*/brand.ftl' |xargs /bin/sed 's/^trademarkInfo = .*/trademarkInfo = The IceCat logo is Copyright 2008-2015 Free Software Foundation, released under the terms of the GNU Lesser General Public License, version 3 or any later version./' -i -for STRING in rights.intro-point3-unbranded rights.intro-point4a-unbranded rights.intro-point4b-unbranded rights.intro-point4c-unbranded -do - find -name aboutRights.dtd | xargs sed -i "s/ENTITY $STRING.*/ENTITY $STRING \"\">/" -done - for STRING in rights-intro-point-2 rights-intro-point-3 rights-intro-point-4 rights-intro-point-5 rights-intro-point-6 rights-webservices rights-safebrowsing do find -name aboutRights.ftl | xargs sed -i "s/^$STRING.*/$STRING = /" @@ -337,7 +332,7 @@ s/opensource/Free Software/g; s/OpenSource/Free Software/g; " -for extension in dtd inc properties; do +for extension in dtd ftl inc properties; do find . -type f -name "*$extension" -execdir /bin/sed --follow-symlinks -i "$SEDSCRIPT" '{}' ';' done |