Bug 1517519 - Migrated aboutTabCrashed dtd files to ftl files with migration script, r=jaws,flod

Differential Revision: https://phabricator.services.mozilla.com/D16789

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Avery Berninger 2019-01-30 14:12:39 +00:00
parent b4cdfc9841
commit c4951880ce
5 changed files with 161 additions and 70 deletions

View File

@ -4,20 +4,7 @@
- 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/. -->
<!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 % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
%brandDTD;
<!ENTITY % tabCrashedDTD
SYSTEM "chrome://browser/locale/aboutTabCrashed.dtd">
%tabCrashedDTD;
]>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@ -28,71 +15,69 @@
href="chrome://browser/content/aboutTabCrashed.css"/>
<link rel="stylesheet" type="text/css" media="all"
href="chrome://browser/skin/aboutTabCrashed.css"/>
<link rel="localization" href="browser/aboutTabCrashed.ftl"/>
<title>&tabCrashed.title;</title>
<title data-l10n-id="crashed-title"></title>
</head>
<body dir="&locale.dir;">
<body>
<div id="main" class="container" multiple="false">
<div class="title">
<h1 class="title-text">&tabCrashed.header2;</h1>
<h1 class="title-text" data-l10n-id="crashed-header"></h1>
</div>
<div class="offers">
<h2>&tabCrashed.offerHelp2;</h2>
<p id="offerHelpMessageSingle">&tabCrashed.single.offerHelpMessage2;</p>
<p id="offerHelpMessageMultiple">&tabCrashed.multiple.offerHelpMessage2;</p>
<h2 data-l10n-id="crashed-offer-help"></h2>
<p id="offerHelpMessageSingle" data-l10n-id="crashed-single-offer-help-message"></p>
<p id="offerHelpMessageMultiple" data-l10n-id="crashed-multiple-offer-help-message"></p>
</div>
<div id="reportBox">
<h2>&tabCrashed.requestHelp;</h2>
<p>&tabCrashed.requestHelpMessage;</p>
<h2 data-l10n-id="crashed-request-help"></h2>
<p data-l10n-id="crashed-request-help-message"></p>
<h2>&tabCrashed.requestReport;</h2>
<h2 data-l10n-id="crashed-request-report-title"></h2>
<div class="checkbox-with-label">
<input type="checkbox" id="sendReport" role="checkbox"/>
<label for="sendReport">&tabCrashed.sendReport3;</label>
<label for="sendReport" data-l10n-id="crashed-send-report"></label>
</div>
<ul id="options">
<li>
<textarea id="comments" placeholder="&tabCrashed.commentPlaceholder2;" rows="4"></textarea>
<textarea id="comments" data-l10n-id="crashed-comment" rows="4"></textarea>
</li>
<li class="checkbox-with-label">
<input type="checkbox" id="includeURL" role="checkbox"/>
<label for="includeURL">&tabCrashed.includeURL3;</label>
<label for="includeURL" data-l10n-id="crashed-include-URL"></label>
</li>
<li id="requestEmail" hidden="true">
<div class="checkbox-with-label">
<input type="checkbox" id="emailMe" role="checkbox"/>
<label for="emailMe">&tabCrashed.emailMe;</label>
<label for="emailMe" data-l10n-id="crashed-email-me"></label>
</div>
<input type="text" id="email" placeholder="&tabCrashed.emailPlaceholder;"/>
<input type="text" id="email" data-l10n-id="crashed-email-placeholder"/>
</li>
</ul>
<div id="requestAutoSubmit" hidden="true">
<h2>&tabCrashed.requestAutoSubmit2;</h2>
<h2 data-l10n-id="crashed-request-auto-submit-title"></h2>
<div class="checkbox-with-label">
<input type="checkbox" id="autoSubmit" role="checkbox"/>
<label for="autoSubmit">&tabCrashed.autoSubmit3;</label>
<label for="autoSubmit" data-l10n-id="crashed-auto-submit-checkbox"></label>
</div>
</div>
</div>
<p id="reportSent">&tabCrashed.reportSent;</p>
<p id="reportSent" data-l10n-id="crashed-report-sent"></p>
<div class="button-container">
<button id="closeTab">
&tabCrashed.closeTab2;</button>
<button id="restoreTab" class="primary">
&tabCrashed.restoreTab;</button>
<button id="restoreAll" autofocus="true" class="primary">
&tabCrashed.restoreAll;</button>
<button id="closeTab" data-l10n-id="crashed-close-tab-button"></button>
<button id="restoreTab" class="primary" data-l10n-id="crashed-restore-tab-button"></button>
<button id="restoreAll" autofocus="true" class="primary" data-l10n-id="crashed-restore-all-button"></button>
</div>
</div>
</body>

View File

@ -0,0 +1,24 @@
# 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/.
crashed-title = Tab crash reporter
crashed-close-tab-button = Close Tab
crashed-restore-tab-button = Restore This Tab
crashed-restore-all-button = Restore All Crashed Tabs
crashed-header = Gah. Your tab just crashed.
crashed-offer-help = We can help!
crashed-single-offer-help-message = Choose { crashed-restore-tab-button } to reload the page.
crashed-multiple-offer-help-message = Choose { crashed-restore-tab-button } or { crashed-restore-all-button } to reload the page/pages.
crashed-request-help = Will you help us?
crashed-request-help-message = Crash reports help us diagnose problems and make { -brand-short-name } better.
crashed-request-report-title = Report this tab
crashed-send-report = Send an automated crash report so we can fix issues like this.
crashed-comment =
.placeholder = Optional comments (comments are publicly visible)
crashed-include-URL = Include the URLs of the sites you were on when { -brand-short-name } crashed.
crashed-email-placeholder = Enter your email address here
crashed-email-me = Email me when more information is available
crashed-report-sent = Crash report already submitted; thank you for helping make { -brand-short-name } better!
crashed-request-auto-submit-title = Report background tabs
crashed-auto-submit-checkbox = Update preferences to automatically submit reports when { -brand-short-name } crashes.

View File

@ -1,32 +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 tabCrashed.title "Tab crash reporter">
<!ENTITY tabCrashed.closeTab2 "Close Tab">
<!ENTITY tabCrashed.restoreTab "Restore This Tab">
<!ENTITY tabCrashed.restoreAll "Restore All Crashed Tabs">
<!-- LOCALIZATION NOTE (tabCrashed.header2): "Gah" is an English slang word
used to express surprise or frustration (or both at the same time). We
are using it to communicate in an informal way that it is both
frustrating that your tab crashed and a surprise that we didn't want to
happen. If you have a similar word or short phrase that is not profane or
vulgar, use it. If not, feel free to skip the word in your
translation. -->
<!ENTITY tabCrashed.header2 "Gah. Your tab just crashed.">
<!ENTITY tabCrashed.offerHelp2 "We can help!">
<!ENTITY tabCrashed.single.offerHelpMessage2 "Choose &tabCrashed.restoreTab; to reload the page.">
<!ENTITY tabCrashed.multiple.offerHelpMessage2 "Choose &tabCrashed.restoreTab; or &tabCrashed.restoreAll; to reload the page/pages.">
<!ENTITY tabCrashed.requestHelp "Will you help us?">
<!ENTITY tabCrashed.requestHelpMessage "Crash reports help us diagnose problems and make &brandShortName; better.">
<!ENTITY tabCrashed.requestReport "Report this tab">
<!ENTITY tabCrashed.sendReport3 "Send an automated crash report so we can fix issues like this.">
<!ENTITY tabCrashed.commentPlaceholder2 "Optional comments (comments are publicly visible)">
<!ENTITY tabCrashed.includeURL3 "Include the URLs of the sites you were on when &brandShortName; crashed.">
<!ENTITY tabCrashed.emailPlaceholder "Enter your email address here">
<!ENTITY tabCrashed.emailMe "Email me when more information is available">
<!ENTITY tabCrashed.reportSent "Crash report already submitted; thank you for helping make &brandShortName; better!">
<!ENTITY tabCrashed.requestAutoSubmit2 "Report background tabs">
<!ENTITY tabCrashed.autoSubmit3 "Update preferences to automatically submit reports when &brandShortName; crashes.">

View File

@ -16,7 +16,6 @@
locale/browser/bookmarks.html (bookmarks.html)
locale/browser/aboutPrivateBrowsing.dtd (%chrome/browser/aboutPrivateBrowsing.dtd)
locale/browser/accounts.properties (%chrome/browser/accounts.properties)
locale/browser/aboutTabCrashed.dtd (%chrome/browser/aboutTabCrashed.dtd)
locale/browser/browser.dtd (%chrome/browser/browser.dtd)
locale/browser/baseMenuOverlay.dtd (%chrome/browser/baseMenuOverlay.dtd)
locale/browser/browser.properties (%chrome/browser/browser.properties)

View File

@ -0,0 +1,115 @@
# -*- coding: utf-8 -*-
from __future__ import absolute_import
import fluent.syntax.ast as FTL
from fluent.migrate import REPLACE
from fluent.migrate import COPY
from fluent.migrate import CONCAT
from fluent.migrate.helpers import transforms_from
from fluent.migrate.helpers import TERM_REFERENCE
from fluent.migrate.helpers import MESSAGE_REFERENCE
def migrate(ctx):
"""Bug 1517519 - Migrate aboutTabCrashed to Fluent, part {index}."""
ctx.add_transforms(
"browser/browser/aboutTabCrashed.ftl",
"browser/browser/aboutTabCrashed.ftl",
transforms_from(
"""
crashed-title = { COPY("browser/chrome/browser/aboutTabCrashed.dtd", "tabCrashed.title")}
crashed-close-tab-button = { COPY("browser/chrome/browser/aboutTabCrashed.dtd", "tabCrashed.closeTab2")}
crashed-restore-tab-button = { COPY("browser/chrome/browser/aboutTabCrashed.dtd", "tabCrashed.restoreTab")}
crashed-restore-all-button = { COPY("browser/chrome/browser/aboutTabCrashed.dtd", "tabCrashed.restoreAll")}
crashed-header ={ COPY("browser/chrome/browser/aboutTabCrashed.dtd", "tabCrashed.header2")}
crashed-offer-help = { COPY("browser/chrome/browser/aboutTabCrashed.dtd", "tabCrashed.offerHelp2")}
crashed-request-help = { COPY("browser/chrome/browser/aboutTabCrashed.dtd", "tabCrashed.requestHelp")}
crashed-request-report-title = { COPY("browser/chrome/browser/aboutTabCrashed.dtd", "tabCrashed.requestReport")}
crashed-send-report = { COPY("browser/chrome/browser/aboutTabCrashed.dtd", "tabCrashed.sendReport3")}
crashed-email-placeholder = { COPY("browser/chrome/browser/aboutTabCrashed.dtd", "tabCrashed.emailPlaceholder")}
crashed-email-me = { COPY("browser/chrome/browser/aboutTabCrashed.dtd", "tabCrashed.emailMe")}
crashed-request-auto-submit-title = { COPY("browser/chrome/browser/aboutTabCrashed.dtd", "tabCrashed.requestAutoSubmit2")}
crashed-comment =
.placeholder = { COPY("browser/chrome/browser/aboutTabCrashed.dtd", "tabCrashed.commentPlaceholder2")}
"""
)
)
ctx.add_transforms(
"browser/browser/aboutTabCrashed.ftl",
"browser/browser/aboutTabCrashed.ftl",
[
FTL.Message(
id=FTL.Identifier("crashed-single-offer-help-message"),
value=REPLACE(
"browser/chrome/browser/aboutTabCrashed.dtd",
"tabCrashed.single.offerHelpMessage2",
{
"&tabCrashed.restoreTab;" : MESSAGE_REFERENCE("crashed-restore-tab-button")
}
)
),
FTL.Message(
id=FTL.Identifier("crashed-multiple-offer-help-message"),
value=REPLACE(
"browser/chrome/browser/aboutTabCrashed.dtd",
"tabCrashed.multiple.offerHelpMessage2",
{
"&tabCrashed.restoreTab;" : MESSAGE_REFERENCE("crashed-restore-tab-button"),
"&tabCrashed.restoreAll;" : MESSAGE_REFERENCE("crashed-restore-all-button")
}
)
),
FTL.Message(
id=FTL.Identifier("crashed-request-help-message"),
value=REPLACE(
"browser/chrome/browser/aboutTabCrashed.dtd",
"tabCrashed.requestHelpMessage",
{
"&brandShortName;" : TERM_REFERENCE("brand-short-name")
}
)
),
FTL.Message(
id=FTL.Identifier("crashed-include-URL"),
value=REPLACE(
"browser/chrome/browser/aboutTabCrashed.dtd",
"tabCrashed.includeURL3",
{
"&brandShortName;" : TERM_REFERENCE("brand-short-name")
}
)
),
FTL.Message(
id=FTL.Identifier("crashed-report-sent"),
value=REPLACE(
"browser/chrome/browser/aboutTabCrashed.dtd",
"tabCrashed.reportSent",
{
"&brandShortName;" : TERM_REFERENCE("brand-short-name")
}
)
),
FTL.Message(
id=FTL.Identifier("crashed-auto-submit-checkbox"),
value=REPLACE(
"browser/chrome/browser/aboutTabCrashed.dtd",
"tabCrashed.autoSubmit3",
{
"&brandShortName;" : TERM_REFERENCE("brand-short-name")
}
)
)
]
)