Bug 1448068 - Update Fluent migrations in mozilla-central to run against gecko-strings r?pike
Also remove temporary string from preferences.ftl (search-input). This was added
to avoid removing the string when running migrations against mozilla-central
MozReview-Commit-ID: IDgTNoANPyV
--- a/browser/locales/en-US/browser/preferences/preferences.ftl
+++ b/browser/locales/en-US/browser/preferences/preferences.ftl
@@ -11,21 +11,16 @@ do-not-track-option-always =
pref-page =
.title =
{ PLATFORM() ->
[windows] Options
*[other] Preferences
}
-# This string is currently used only in Firefox 60 and will be removed when not
-# needed for x-channel. See bug 1445686 for details.
-search-input =
- .style = width: 15.4em
-
# This is used to determine the width of the search field in about:preferences,
# in order to make the entire placeholder string visible
#
# Please keep the placeholder string short to avoid truncation.
#
# Notice: The value of the `.style` attribute is a CSS string, and the `width`
# is the name of the CSS property. It is intended only to adjust the element's width.
# Do not translate.
--- a/python/l10n/fluent_migrations/bug_1411012_preferences_do_not_track.py
+++ b/python/l10n/fluent_migrations/bug_1411012_preferences_do_not_track.py
@@ -8,17 +8,17 @@ import fluent.syntax.ast as FTL
from fluent.migrate import COPY
def migrate(ctx):
"""Bug 1411012 - Migrate Do Not Track preferences to Fluent, part {index}."""
ctx.add_transforms(
'browser/browser/preferences/preferences.ftl',
- 'browser/locales/en-US/browser/preferences/preferences.ftl',
+ 'browser/browser/preferences/preferences.ftl',
[
FTL.Message(
id=FTL.Identifier('do-not-track-description'),
value=COPY(
'browser/chrome/browser/preferences/privacy.dtd',
'doNotTrack.description'
)
),
--- a/python/l10n/fluent_migrations/bug_1415733_preferences_search.py
+++ b/python/l10n/fluent_migrations/bug_1415733_preferences_search.py
@@ -10,17 +10,17 @@ from fluent.migrate.transforms import RE
from fluent.migrate import COPY
def migrate(ctx):
"""Bug 1415733 - Migrate the "Search" section of Preferences to the new Localization API, part {index}"""
ctx.add_transforms(
'browser/browser/preferences/preferences.ftl',
- 'browser/locales/en-US/browser/preferences/preferences.ftl',
+ 'browser/browser/preferences/preferences.ftl',
[
FTL.Message(
id=FTL.Identifier('search-bar-header'),
value=COPY(
'browser/chrome/browser/preferences/search.dtd',
'searchBar.label'
)
),
--- a/python/l10n/fluent_migrations/bug_1419547_preferences_containers.py
+++ b/python/l10n/fluent_migrations/bug_1419547_preferences_containers.py
@@ -10,29 +10,29 @@ from fluent.migrate import COPY, CONCAT,
from fluent.migrate.transforms import PLURALS, REPLACE_IN_TEXT
def migrate(ctx):
"""Bug 1419547 - Migrate Preferences::Containers to Fluent, part {index}."""
ctx.add_transforms(
'browser/browser/preferences/preferences.ftl',
- 'browser/locales/en-US/browser/preferences/preferences.ftl',
+ 'browser/browser/preferences/preferences.ftl',
[
FTL.Message(
id=FTL.Identifier('containers-back-link'),
value=COPY(
'browser/chrome/browser/preferences/containers.dtd',
'backLink2.label'
)
),
FTL.Message(
id=FTL.Identifier('containers-header'),
value=COPY(
- 'browser/chrome/browser/preferences/containers.dtd',
+ 'browser/chrome/browser/preferences/preferences.dtd',
'paneContainers.title',
)
),
FTL.Message(
id=FTL.Identifier('containers-add-button'),
attributes=[
FTL.Attribute(
FTL.Identifier('label'),
@@ -74,17 +74,17 @@ def migrate(ctx):
),
]
),
]
)
ctx.add_transforms(
'browser/browser/preferences/containers.ftl',
- 'browser/locales/en-US/browser/preferences/containers.ftl',
+ 'browser/browser/preferences/containers.ftl',
[
FTL.Message(
id=FTL.Identifier('containers-window-new'),
attributes=[
FTL.Attribute(
FTL.Identifier('title'),
COPY(
'browser/chrome/browser/preferences/containers.dtd',
--- a/python/l10n/fluent_migrations/bug_1424682_preferences_chrome.py
+++ b/python/l10n/fluent_migrations/bug_1424682_preferences_chrome.py
@@ -10,17 +10,17 @@ from fluent.migrate.transforms import RE
from fluent.migrate import COPY, CONCAT
def migrate(ctx):
"""Bug 1424682 - Migrate the chrome of Preferences to Fluent, part {index}."""
ctx.add_transforms(
'browser/browser/preferences/preferences.ftl',
- 'browser/locales/en-US/browser/preferences/preferences.ftl',
+ 'browser/browser/preferences/preferences.ftl',
[
FTL.Message(
id=FTL.Identifier('pref-page'),
attributes=[
FTL.Attribute(
FTL.Identifier('title'),
FTL.Pattern(
elements=[
--- a/python/l10n/fluent_migrations/bug_1424683_brand_short_name.py
+++ b/python/l10n/fluent_migrations/bug_1424683_brand_short_name.py
@@ -8,17 +8,17 @@ import fluent.syntax.ast as FTL
from fluent.migrate import COPY
def migrate(ctx):
"""Bug 1424683 - Migrate brand-short-name to Fluent, part {index}."""
ctx.add_transforms(
'browser/branding/official/brand.ftl',
- 'browser/branding/official/locales/en-US/brand.ftl',
+ 'browser/branding/official/brand.ftl',
[
FTL.Term(
id=FTL.Identifier('-brand-short-name'),
value=COPY(
'browser/branding/official/brand.dtd',
'brandShortName'
)
),
--- a/python/l10n/fluent_migrations/bug_1432338_sync_brand.py
+++ b/python/l10n/fluent_migrations/bug_1432338_sync_brand.py
@@ -8,17 +8,17 @@ import fluent.syntax.ast as FTL
from fluent.migrate import COPY
def migrate(ctx):
"""Bug 1432338 - Introduce sync-brand.ftl, part {index}."""
ctx.add_transforms(
'browser/browser/branding/sync-brand.ftl',
- 'browser/locales/en-US/browser/branding/sync-brand.ftl',
+ 'browser/browser/branding/sync-brand.ftl',
[
FTL.Term(
id=FTL.Identifier('-sync-brand-short-name'),
value=COPY(
'browser/chrome/browser/syncBrand.dtd',
'syncBrand.shortName.label'
)
),
--- a/python/l10n/fluent_migrations/bug_1435912_preferences_general_xul.py
+++ b/python/l10n/fluent_migrations/bug_1435912_preferences_general_xul.py
@@ -10,17 +10,17 @@ from fluent.migrate.transforms import RE
from fluent.migrate import COPY, CONCAT
def migrate(ctx):
"""Bug 1435912 - Migrate Preferences::General XUL to Fluent, part {index}."""
ctx.add_transforms(
'browser/browser/preferences/preferences.ftl',
- 'browser/locales/en-US/browser/preferences/preferences.ftl',
+ 'browser/browser/preferences/preferences.ftl',
[
FTL.Message(
id=FTL.Identifier('startup-header'),
value=COPY(
'browser/chrome/browser/preferences/main.dtd',
'startup.label'
)
),
--- a/python/l10n/fluent_migrations/bug_1444508_preferences_search_results.py
+++ b/python/l10n/fluent_migrations/bug_1444508_preferences_search_results.py
@@ -9,17 +9,17 @@ from fluent.migrate.helpers import MESSA
from fluent.migrate import COPY, CONCAT, REPLACE
def migrate(ctx):
"""Bug 1445084 - Migrate search results pane of Preferences to Fluent, part {index}."""
ctx.add_transforms(
'browser/browser/preferences/preferences.ftl',
- 'browser/locales/en-US/browser/preferences/preferences.ftl',
+ 'browser/browser/preferences/preferences.ftl',
[
FTL.Message(
id=FTL.Identifier('search-input-box'),
attributes=[
FTL.Attribute(
FTL.Identifier('style'),
CONCAT(
FTL.TextElement('width: '),