Skip to content

Commit

Permalink
Bug 1507441 - Replace FTL.VariantName with FTL.Identifier in existing…
Browse files Browse the repository at this point in the history 
… recipes and documentation, fix nits in recipes r=stas

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

--HG--
extra : moz-landing-system : lando
  • Loading branch information
@flodolo
flodolo committed Nov 15, 2018
1 parent d05f000 commit f502206
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion intl/l10n/docs/fluent_migrations.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ category used in plural forms. For these reasons, it’s not possible to use
)
),
FTL.Variant(
key=FTL.VariantName("other"),
key=FTL.Identifier("other"),
default=True,
value=COPY(
"browser/chrome/browser/preferences/main.dtd",
Expand Down
2 changes: 1 addition & 1 deletion python/l10n/fluent_migrations/bug_1486934_aboutAbout.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from fluent.migrate.helpers import transforms_from

def migrate(ctx):
"""Bug 1486934 - Modify about:about to use fluent for localization, part {index}."""
"""Bug 1486934 - Modify about:about to use Fluent for localization, part {index}."""

ctx.add_transforms(
"toolkit/toolkit/about/aboutAbout.ftl",
Expand Down
8 changes: 4 additions & 4 deletions python/l10n/fluent_migrations/bug_1486935_aboutprofiles.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@


def migrate(ctx):
""" Bug 1486935 - Migrate about:Profiles strings to FTL, part {index}. """
""" Bug 1486935 - Migrate about:profiles to Fluent, part {index}. """

ctx.add_transforms(
"toolkit/toolkit/about/aboutProfiles.ftl",
Expand Down Expand Up @@ -105,23 +105,23 @@ def migrate(ctx):
),
variants=[
FTL.Variant(
key=FTL.VariantName("macos"),
key=FTL.Identifier("macos"),
default=False,
value=COPY(
"toolkit/chrome/global/aboutProfiles.properties",
"macOpenDir"
)
),
FTL.Variant(
key=FTL.VariantName("windows"),
key=FTL.Identifier("windows"),
default=False,
value=COPY(
"toolkit/chrome/global/aboutProfiles.properties",
"winOpenDir2"
)
),
FTL.Variant(
key=FTL.VariantName("other"),
key=FTL.Identifier("other"),
default=True,
value=COPY(
"toolkit/chrome/global/aboutProfiles.properties",
Expand Down
2 changes: 1 addition & 1 deletion python/l10n/fluent_migrations/bug_1486937_abouturlclassifier.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@


def migrate(ctx):
"""Bug 1486937 - Use fluent for about:url-classifier"""
"""Bug 1486937 - Migrate about:url-classifier to Fluent, part {index}."""

ctx.add_transforms(
"toolkit/toolkit/about/url-classifier.ftl",
Expand Down
20 changes: 10 additions & 10 deletions python/l10n/fluent_migrations/bug_1491676_preferences_properties.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@


def migrate(ctx):
"""Bug 1486937 - Move strings from preferences.properties to Fluent"""
"""Bug 1491676 - Move strings from preferences.properties to Fluent"""

ctx.add_transforms(
"toolkit/toolkit/preferences/preferences.ftl",
Expand All @@ -23,9 +23,9 @@ def migrate(ctx):
failed-pw-change = { COPY(from_path, "failed_pw_change") }
incorrect-pw = { COPY(from_path, "incorrect_pw") }
pw-empty-warning = { COPY(from_path, "pw_empty_warning") }
pw-change-ok = { COPY(from_path, "pw_change_ok") } { -pw-empty-warning }
pw-erased-ok = { COPY(from_path, "pw_erased_ok") } { -pw-empty-warning }
pw-not-wanted = { COPY(from_path, "pw_not_wanted") }
pw-change-ok = { COPY(from_path, "pw_change_ok") }
pw-erased-ok = { COPY(from_path, "pw_erased_ok") } { pw-empty-warning }
pw-not-wanted = { COPY(from_path, "pw_not_wanted") } { pw-empty-warning }
pw-change2empty-in-fips-mode = { COPY(from_path, "pw_change2empty_in_fips_mode") }
pw-change-success-title = { COPY(from_path, "pw_change_success_title") }
pw-change-failed-title = { COPY(from_path, "pw_change_failed_title") }
Expand Down Expand Up @@ -79,15 +79,15 @@ def migrate(ctx):
),
variants=[
FTL.Variant(
key=FTL.VariantName("windows"),
key=FTL.Identifier("windows"),
default=False,
value=COPY(
"browser/chrome/browser/preferences/preferences.properties",
"spaceAlert.over5GB.prefButtonWin.label"
)
),
FTL.Variant(
key=FTL.VariantName("other"),
key=FTL.Identifier("other"),
default=True,
value=COPY(
"browser/chrome/browser/preferences/preferences.properties",
Expand All @@ -111,15 +111,15 @@ def migrate(ctx):
),
variants=[
FTL.Variant(
key=FTL.VariantName("windows"),
key=FTL.Identifier("windows"),
default=False,
value=COPY(
"browser/chrome/browser/preferences/preferences.properties",
"spaceAlert.over5GB.prefButtonWin.accesskey"
)
),
FTL.Variant(
key=FTL.VariantName("other"),
key=FTL.Identifier("other"),
default=True,
value=COPY(
"browser/chrome/browser/preferences/preferences.properties",
Expand All @@ -145,7 +145,7 @@ def migrate(ctx):
),
variants=[
FTL.Variant(
key=FTL.VariantName("windows"),
key=FTL.Identifier("windows"),
default=False,
value=REPLACE(
"browser/chrome/browser/preferences/preferences.properties",
Expand All @@ -158,7 +158,7 @@ def migrate(ctx):
)
),
FTL.Variant(
key=FTL.VariantName("other"),
key=FTL.Identifier("other"),
default=True,
value=REPLACE(
"browser/chrome/browser/preferences/preferences.properties",
Expand Down
24 changes: 12 additions & 12 deletions python/l10n/fluent_migrations/bug_1491677_extensions.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def migrate(ctx):
),
variants=[
FTL.Variant(
key=FTL.VariantName("windows"),
key=FTL.Identifier("windows"),
default=False,
value=REPLACE(
"toolkit/chrome/mozapps/extensions/extensions.dtd",
Expand All @@ -131,7 +131,7 @@ def migrate(ctx):
)
),
FTL.Variant(
key=FTL.VariantName("other"),
key=FTL.Identifier("other"),
default=True,
value=REPLACE(
"toolkit/chrome/mozapps/extensions/extensions.dtd",
Expand Down Expand Up @@ -161,15 +161,15 @@ def migrate(ctx):
),
variants=[
FTL.Variant(
key=FTL.VariantName("windows"),
key=FTL.Identifier("windows"),
default=False,
value=COPY(
"toolkit/chrome/mozapps/extensions/extensions.dtd",
"cmd.preferencesWin.label"
)
),
FTL.Variant(
key=FTL.VariantName("other"),
key=FTL.Identifier("other"),
default=True,
value=COPY(
"toolkit/chrome/mozapps/extensions/extensions.dtd",
Expand All @@ -193,15 +193,15 @@ def migrate(ctx):
),
variants=[
FTL.Variant(
key=FTL.VariantName("windows"),
key=FTL.Identifier("windows"),
default=False,
value=COPY(
"toolkit/chrome/mozapps/extensions/extensions.dtd",
"cmd.preferencesWin.accesskey"
)
),
FTL.Variant(
key=FTL.VariantName("other"),
key=FTL.Identifier("other"),
default=True,
value=COPY(
"toolkit/chrome/mozapps/extensions/extensions.dtd",
Expand Down Expand Up @@ -271,15 +271,15 @@ def migrate(ctx):
),
variants=[
FTL.Variant(
key=FTL.VariantName("windows"),
key=FTL.Identifier("windows"),
default=False,
value=COPY(
"toolkit/chrome/mozapps/extensions/extensions.dtd",
"detail.showPreferencesWin.label"
)
),
FTL.Variant(
key=FTL.VariantName("other"),
key=FTL.Identifier("other"),
default=True,
value=COPY(
"toolkit/chrome/mozapps/extensions/extensions.dtd",
Expand All @@ -303,15 +303,15 @@ def migrate(ctx):
),
variants=[
FTL.Variant(
key=FTL.VariantName("windows"),
key=FTL.Identifier("windows"),
default=False,
value=COPY(
"toolkit/chrome/mozapps/extensions/extensions.dtd",
"detail.showPreferencesWin.accesskey"
)
),
FTL.Variant(
key=FTL.VariantName("other"),
key=FTL.Identifier("other"),
default=True,
value=COPY(
"toolkit/chrome/mozapps/extensions/extensions.dtd",
Expand All @@ -335,15 +335,15 @@ def migrate(ctx):
),
variants=[
FTL.Variant(
key=FTL.VariantName("windows"),
key=FTL.Identifier("windows"),
default=False,
value=COPY(
"toolkit/chrome/mozapps/extensions/extensions.dtd",
"detail.showPreferencesWin.tooltip"
)
),
FTL.Variant(
key=FTL.VariantName("other"),
key=FTL.Identifier("other"),
default=True,
value=COPY(
"toolkit/chrome/mozapps/extensions/extensions.dtd",
Expand Down
2 changes: 1 addition & 1 deletion python/l10n/fluent_migrations/bug_1501900_aboutdevtools.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from fluent.migrate import CONCAT

def migrate(ctx):
"""Bug 1501900 - Migrate aboutdevtools to Fluent, part {index}"""
"""Bug 1501900 - Migrate about:devtools to Fluent, part {index}"""

ctx.add_transforms(
"devtools/startup/aboutDevTools.ftl",
Expand Down

0 comments on commit f502206

Please sign in to comment.