diff --git a/browser/branding/aurora/locales/en-US/brand.ftl b/browser/branding/aurora/locales/en-US/brand.ftl new file mode 100644 index 000000000000..ee621167d1a5 --- /dev/null +++ b/browser/branding/aurora/locales/en-US/brand.ftl @@ -0,0 +1,15 @@ +# 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/. + +## Firefox Brand +## +## Firefox must be treated as a brand, and kept in English. +## It cannot be: +## - Declined to adapt to grammatical case. +## - Transliterated. +## - Translated. +## +## Reference: https://www.mozilla.org/styleguide/communications/translation/ + +-brand-short-name = Firefox Developer Edition diff --git a/browser/branding/aurora/locales/jar.mn b/browser/branding/aurora/locales/jar.mn index 24880ad7d272..b509dabcd4f2 100644 --- a/browser/branding/aurora/locales/jar.mn +++ b/browser/branding/aurora/locales/jar.mn @@ -3,6 +3,8 @@ # 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/. +[localization] @AB_CD@.jar: + branding (en-US/**/*.ftl) @AB_CD@.jar: % locale branding @AB_CD@ %locale/branding/ diff --git a/browser/branding/nightly/locales/en-US/brand.ftl b/browser/branding/nightly/locales/en-US/brand.ftl new file mode 100644 index 000000000000..c782a73b7fc5 --- /dev/null +++ b/browser/branding/nightly/locales/en-US/brand.ftl @@ -0,0 +1,15 @@ +# 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/. + +## Firefox Brand +## +## Firefox must be treated as a brand, and kept in English. +## It cannot be: +## - Declined to adapt to grammatical case. +## - Transliterated. +## - Translated. +## +## Reference: https://www.mozilla.org/styleguide/communications/translation/ + +-brand-short-name = Nightly diff --git a/browser/branding/nightly/locales/jar.mn b/browser/branding/nightly/locales/jar.mn index 63af8f6f9637..b58100a6da47 100644 --- a/browser/branding/nightly/locales/jar.mn +++ b/browser/branding/nightly/locales/jar.mn @@ -3,6 +3,8 @@ # 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/. +[localization] @AB_CD@.jar: + branding (en-US/**/*.ftl) @AB_CD@.jar: % locale branding @AB_CD@ %locale/branding/ diff --git a/browser/branding/official/locales/en-US/brand.ftl b/browser/branding/official/locales/en-US/brand.ftl new file mode 100644 index 000000000000..e111e6662306 --- /dev/null +++ b/browser/branding/official/locales/en-US/brand.ftl @@ -0,0 +1,15 @@ +# 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/. + +## Firefox Brand +## +## Firefox must be treated as a brand, and kept in English. +## It cannot be: +## - Declined to adapt to grammatical case. +## - Transliterated. +## - Translated. +## +## Reference: https://www.mozilla.org/styleguide/communications/translation/ + +-brand-short-name = Firefox diff --git a/browser/branding/official/locales/jar.mn b/browser/branding/official/locales/jar.mn index 9fdfe578b49a..c78c82947acd 100644 --- a/browser/branding/official/locales/jar.mn +++ b/browser/branding/official/locales/jar.mn @@ -3,6 +3,8 @@ # 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/. +[localization] @AB_CD@.jar: + branding (%*.ftl) @AB_CD@.jar: % locale branding @AB_CD@ %locale/branding/ diff --git a/browser/branding/unofficial/locales/en-US/brand.ftl b/browser/branding/unofficial/locales/en-US/brand.ftl new file mode 100644 index 000000000000..c782a73b7fc5 --- /dev/null +++ b/browser/branding/unofficial/locales/en-US/brand.ftl @@ -0,0 +1,15 @@ +# 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/. + +## Firefox Brand +## +## Firefox must be treated as a brand, and kept in English. +## It cannot be: +## - Declined to adapt to grammatical case. +## - Transliterated. +## - Translated. +## +## Reference: https://www.mozilla.org/styleguide/communications/translation/ + +-brand-short-name = Nightly diff --git a/browser/branding/unofficial/locales/jar.mn b/browser/branding/unofficial/locales/jar.mn index 8515d5cc04a1..ccba7043f906 100644 --- a/browser/branding/unofficial/locales/jar.mn +++ b/browser/branding/unofficial/locales/jar.mn @@ -3,6 +3,8 @@ # 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/. +[localization] @AB_CD@.jar: + branding (en-US/**/*.ftl) @AB_CD@.jar: % locale branding @AB_CD@ %locale/branding/ diff --git a/python/l10n/fluent_migrations/bug_1424683_brand_short_name.py b/python/l10n/fluent_migrations/bug_1424683_brand_short_name.py new file mode 100644 index 000000000000..845b33db6827 --- /dev/null +++ b/python/l10n/fluent_migrations/bug_1424683_brand_short_name.py @@ -0,0 +1,26 @@ +# 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 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', + [ + FTL.Term( + id=FTL.Identifier('-brand-short-name'), + value=COPY( + 'browser/branding/official/brand.dtd', + 'brandShortName' + ) + ), + ] + )