Bug 1703164 - convert mail/components/preferences/notifications.xhtml to top level <html>. r=aleca

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

--HG--
extra : rebase_source : aea6b94bfe554e8bf3c6d8dbb33612a41c3f150a
extra : amend_source : aefd50173d6a3f774fb8052772f71c9482d1b594
This commit is contained in:
Magnus Melin 2023-11-24 08:00:48 +02:00
Родитель c4cfb59919
Коммит 7d5af90145
4 изменённых файлов: 88 добавлений и 62 удалений

Просмотреть файл

@ -449,7 +449,7 @@
oncommand="gGeneralPane.customizeMailAlert();"
data-l10n-id="customize-alert-label"
search-l10n-ids="
notifications-dialog-window.title,
notifications-dialog-title,
customize-alert-description,
preview-text-checkbox.label,
subject-checkbox.label,

Просмотреть файл

@ -3,69 +3,75 @@
- 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 window>
<window
type="child"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
<!DOCTYPE html>
<html
xmlns="http://www.w3.org/1999/xhtml"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
data-l10n-id="notifications-dialog-window"
type="child"
scrolling="false"
>
<dialog id="NotificationsDialog" dlgbuttons="accept,cancel">
<linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<head>
<title data-l10n-id="notifications-dialog-title"></title>
<link rel="stylesheet" href="chrome://global/skin/global.css" />
<link rel="localization" href="messenger/preferences/notifications.ftl" />
<script
defer="defer"
src="chrome://global/content/preferencesBindings.js"
></script>
<script
defer="defer"
src="chrome://messenger/content/preferences/notifications.js"
></script>
</head>
<html:body
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
>
<dialog id="NotificationsDialog">
<description data-l10n-id="customize-alert-description" />
<html:link
rel="localization"
href="messenger/preferences/notifications.ftl"
<checkbox
id="previewText"
class="indent"
data-l10n-id="preview-text-checkbox"
preference="mail.biff.alert.show_preview"
/>
</linkset>
<description data-l10n-id="customize-alert-description" />
<checkbox
id="previewText"
class="indent"
data-l10n-id="preview-text-checkbox"
preference="mail.biff.alert.show_preview"
/>
<checkbox
id="subject"
class="indent"
data-l10n-id="subject-checkbox"
preference="mail.biff.alert.show_subject"
/>
<checkbox
id="sender"
class="indent"
data-l10n-id="sender-checkbox"
preference="mail.biff.alert.show_sender"
/>
<separator />
<hbox align="center">
<label
id="totalOpenTimeBefore"
control="totalOpenTime"
data-l10n-id="open-time-label-before"
<checkbox
id="subject"
class="indent"
data-l10n-id="subject-checkbox"
preference="mail.biff.alert.show_subject"
/>
<html:input
id="totalOpenTime"
type="number"
class="size3"
min="1"
max="3600"
preference="alerts.totalOpenTime"
<checkbox
id="sender"
class="indent"
data-l10n-id="sender-checkbox"
preference="mail.biff.alert.show_sender"
/>
<label
id="totalOpenTimeEnd"
data-l10n-id="open-time-label-after"
class="startSpacing"
/>
</hbox>
<separator />
<script src="chrome://global/content/preferencesBindings.js" />
<script src="chrome://messenger/content/preferences/notifications.js" />
</dialog>
</window>
<separator />
<hbox align="center">
<label
id="totalOpenTimeBefore"
control="totalOpenTime"
data-l10n-id="open-time-label-before"
/>
<html:input
id="totalOpenTime"
type="number"
class="size3"
min="1"
max="3600"
preference="alerts.totalOpenTime"
/>
<label
id="totalOpenTimeEnd"
data-l10n-id="open-time-label-after"
class="startSpacing"
/>
</hbox>
<separator />
</dialog>
</html:body>
</html>

Просмотреть файл

@ -2,8 +2,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/.
notifications-dialog-window =
.title = Customize New Mail Alert
notifications-dialog-title = Customize New Mail Alert
customize-alert-description = Choose which fields to show in the alert notification:

Просмотреть файл

@ -0,0 +1,21 @@
# Any copyright is dedicated to the Public Domain.
# http://creativecommons.org/publicdomain/zero/1.0/
from fluent.migratetb import COPY_PATTERN
from fluent.migratetb.helpers import transforms_from
def migrate(ctx):
"""Bug 1703164 - mail/components/preferences/notifications.xhtml to top level html part {index}"""
target = reference = "mail/messenger/preferences/notifications.ftl"
ctx.add_transforms(
target,
reference,
transforms_from(
"""
notifications-dialog-title = {{COPY_PATTERN(from_path, "notifications-dialog-window.title")}}
""",
from_path="mail/messenger/preferences/notifications.ftl",
),
)