Bug 1453480 - Migrate Fluent resources to use DOM Overlays v2. r=flod

MozReview-Commit-ID: IsaYQFyPAxd

--HG--
extra : source : 46a634d6853c680bbee9d2be12bab971058ba281
This commit is contained in:
Zibi Braniecki 2018-04-11 16:09:31 -07:00
parent b4b2c33b2d
commit 2dc52ab911
6 changed files with 148 additions and 18 deletions

View File

@ -458,7 +458,7 @@ var gMainPane = {
document.l10n.setAttributes(
document.getElementById("updateAppInfo"),
"update-application-info",
"update-application-version",
{ version }
);

View File

@ -442,7 +442,7 @@
<hbox align="center">
<vbox flex="1">
<description id="updateAppInfo">
<html:a id="releasenotes" class="learnMore text-link" hidden="true"/>
<html:a id="releasenotes" data-l10n-name="learn-more" class="learnMore text-link" hidden="true"/>
</description>
<description id="distribution" class="text-blurb" hidden="true"/>
<description id="distributionId" class="text-blurb" hidden="true"/>
@ -615,8 +615,8 @@
</menulist>
</hbox>
<description id="contentProcessCountEnabledDescription" class="tip-caption" data-l10n-id="performance-limit-content-process-enabled-desc"/>
<description id="contentProcessCountDisabledDescription" class="tip-caption" data-l10n-id="performance-limit-content-process-disabled-desc">
<html:a class="text-link" href="https://wiki.mozilla.org/Electrolysis"/>
<description id="contentProcessCountDisabledDescription" class="tip-caption" data-l10n-id="performance-limit-content-process-blocked-desc">
<html:a class="text-link" data-l10n-name="learn-more" href="https://wiki.mozilla.org/Electrolysis"/>
</description>
</vbox>
</groupbox>

View File

@ -281,8 +281,8 @@
<vbox>
<hbox align="start">
<vbox flex="1">
<description data-l10n-id="tracking-description">
<a id="trackingProtectionLearnMore" target="_blank" class="learnMore text-link"/>
<description data-l10n-id="tracking-desc">
<a id="trackingProtectionLearnMore" data-l10n-name="learn-more" target="_blank" class="learnMore text-link"/>
</description>
</vbox>
<spacer flex="1"/>

View File

@ -15,11 +15,11 @@
data-category="paneSearchResults"
hidden="true">
<vbox class="no-results-container">
<label id="sorry-message" data-l10n-id="search-results-sorry-message">
<html:span id="sorry-message-query"/>
<label id="sorry-message" data-l10n-id="search-results-empty-message">
<html:span data-l10n-name="query" id="sorry-message-query"/>
</label>
<label id="need-help" data-l10n-id="search-results-need-help">
<a class="text-link" target="_blank"></a>
<label id="need-help" data-l10n-id="search-results-help-link">
<a class="text-link" data-l10n-name="url" target="_blank"></a>
</label>
</vbox>
<vbox class="no-results-container" align="center">

View File

@ -80,14 +80,14 @@ restart-later = Restart Later
search-results-header = Search Results
# `<span></span>` will be replaced by the search term.
search-results-sorry-message =
# `<span data-l10n-name="query"></span>` will be replaced by the search term.
search-results-empty-message =
{ PLATFORM() ->
[windows] Sorry! There are no results in Options for “<span></span>”.
*[other] Sorry! There are no results in Preferences for “<span></span>”.
[windows] Sorry! There are no results in Options for “<span data-l10n-name="query"></span>”.
*[other] Sorry! There are no results in Preferences for “<span data-l10n-name="query"></span>”.
}
search-results-need-help = Need help? Visit <a>{ -brand-short-name } Support</a>
search-results-help-link = Need help? Visit <a data-l10n-name="url">{ -brand-short-name } Support</a>
## General Section
@ -267,7 +267,7 @@ update-application-title = { -brand-short-name } Updates
update-application-description = Keep { -brand-short-name } up to date for the best performance, stability, and security.
update-application-info = Version { $version } <a>What's new</a>
update-application-version = Version { $version } <a data-l10n-name="learn-more">Whats new</a>
update-history =
.label = Show Update History…
@ -315,7 +315,7 @@ performance-limit-content-process-option = Content process limit
.accesskey = l
performance-limit-content-process-enabled-desc = Additional content processes can improve performance when using multiple tabs, but will also use more memory.
performance-limit-content-process-disabled-desc = Modifying the number of content processes is only possible with multiprocess { -brand-short-name }. <a>Learn how to check if multiprocess is enabled</a>
performance-limit-content-process-blocked-desc = Modifying the number of content processes is only possible with multiprocess { -brand-short-name }. <a data-l10n-name="learn-more">Learn how to check if multiprocess is enabled</a>
# Variables:
# $num - default value of the `dom.ipc.processCount` pref.
@ -698,7 +698,7 @@ addressbar-suggestions-settings = Change preferences for search engine suggestio
tracking-header = Tracking Protection
tracking-description = Tracking Protection blocks online trackers that collect your browsing data across multiple websites. <a>Learn more about Tracking Protection and your privacy</a>
tracking-desc = Tracking Protection blocks online trackers that collect your browsing data across multiple websites. <a data-l10n-name="learn-more">Learn more about Tracking Protection and your privacy</a>
tracking-mode-label = Use Tracking Protection to block known trackers

View File

@ -0,0 +1,130 @@
# 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 MESSAGE_REFERENCE, EXTERNAL_ARGUMENT
from fluent.migrate import COPY, CONCAT, REPLACE
def migrate(ctx):
"""Bug 1453480 - Migrate Fluent resources to use DOM Overlays, part {index}."""
ctx.add_transforms(
'browser/browser/preferences/preferences.ftl',
'browser/browser/preferences/preferences.ftl',
[
FTL.Message(
id=FTL.Identifier('search-results-empty-message'),
value=FTL.Pattern(
elements=[
FTL.Placeable(
expression=FTL.SelectExpression(
expression=FTL.CallExpression(
callee=FTL.Function('PLATFORM')
),
variants=[
FTL.Variant(
key=FTL.VariantName('windows'),
default=False,
value=REPLACE(
'browser/chrome/browser/preferences/preferences.properties',
'searchResults.sorryMessageWin',
{
'%S': FTL.TextElement('<span data-l10n-name="query"></span>')
}
)
),
FTL.Variant(
key=FTL.VariantName('other'),
default=True,
value=REPLACE(
'browser/chrome/browser/preferences/preferences.properties',
'searchResults.sorryMessageUnix',
{
'%S': FTL.TextElement('<span data-l10n-name="query"></span>')
}
)
)
]
)
)
]
)
),
FTL.Message(
id=FTL.Identifier('search-results-help-link'),
value=REPLACE(
'browser/chrome/browser/preferences/preferences.properties',
'searchResults.needHelp3',
{
'%S': CONCAT(
FTL.TextElement('<a data-l10n-name="url">'),
REPLACE(
'browser/chrome/browser/preferences/preferences.properties',
'searchResults.needHelpSupportLink',
{
'%S': MESSAGE_REFERENCE('-brand-short-name'),
}
),
FTL.TextElement('</a>')
)
}
)
),
FTL.Message(
id=FTL.Identifier('update-application-version'),
value=CONCAT(
COPY(
'browser/chrome/browser/preferences/advanced.dtd',
'updateApplication.version.pre'
),
EXTERNAL_ARGUMENT('version'),
COPY(
'browser/chrome/browser/preferences/advanced.dtd',
'updateApplication.version.post'
),
FTL.TextElement(' <a data-l10n-name="learn-more">'),
COPY(
'browser/chrome/browser/aboutDialog.dtd',
'releaseNotes.link'
),
FTL.TextElement('</a>')
)
),
FTL.Message(
id=FTL.Identifier('performance-limit-content-process-blocked-desc'),
value=CONCAT(
REPLACE(
'browser/chrome/browser/preferences/advanced.dtd',
'limitContentProcessOption.disabledDescription',
{
'&brandShortName;': MESSAGE_REFERENCE('-brand-short-name')
}
),
FTL.TextElement(' <a data-l10n-name="learn-more">'),
COPY(
'browser/chrome/browser/preferences/advanced.dtd',
'limitContentProcessOption.disabledDescriptionLink'
),
FTL.TextElement('</a>')
)
),
FTL.Message(
id=FTL.Identifier('tracking-desc'),
value=CONCAT(
COPY(
'browser/chrome/browser/preferences/privacy.dtd',
'trackingProtection3.description'
),
FTL.TextElement(' <a data-l10n-name="learn-more">'),
COPY(
'browser/chrome/browser/preferences/privacy.dtd',
'trackingProtectionLearnMore2.label'
),
FTL.TextElement('</a>')
)
),
]
)