Backed out changeset 24aae04385e0 (bug 1621633) for breaking cross-channel generation
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Mon, 16 Mar 2020 08:57:24 +0200
changeset 38495 c84838d1d59664681b4abd35f5ee9f7c0dad6769
parent 38494 98aa0bf2e719d22931edfe3e942f66d32ee0e80f
child 38496 2891d703d7591ad5492211961c7bfc1593ab8193
push id400
push userclokep@gmail.com
push dateMon, 04 May 2020 18:56:09 +0000
bugs1621633
backs out24aae04385e0ae4b1a7c71ff5eaef5248174b51c
Backed out changeset 24aae04385e0 (bug 1621633) for breaking cross-channel generation
build/virtualenv_packages.txt
mail/locales/l10n.toml
--- a/build/virtualenv_packages.txt
+++ b/build/virtualenv_packages.txt
@@ -1,2 +1,1 @@
 comm.pth:comm/testing/marionette
-comm.pth:comm/python/l10n
--- a/mail/locales/l10n.toml
+++ b/mail/locales/l10n.toml
@@ -1,13 +1,13 @@
 # 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/.
 
-basepath = "../../.."
+basepath = "../.."
 
 locales = [
     "af",
     "ar",
     "ast",
     "be",
     "bg",
     "br",
@@ -67,46 +67,57 @@ locales = [
     "uz",
     "vi",
     "zh-CN",
     "zh-TW",
 ]
 
 [env]
     l = "{l10n_base}/{locale}/"
+    mozilla = "mozilla"
+
 
 [[paths]]
-    reference = "comm/mail/locales/en-US/**"
+    reference = "mail/locales/en-US/**"
     l10n = "{l}mail/**"
 
 [[paths]]
-    reference = "comm/chat/locales/en-US/**"
+    reference = "chat/locales/en-US/**"
     l10n = "{l}chat/**"
 
 [[paths]]
-    reference = "comm/other-licenses/branding/thunderbird/locales/en-US/**"
+    reference = "editor/ui/locales/en-US/**"
+    l10n = "{l}editor/ui/**"
+
+[[paths]]
+    reference = "other-licenses/branding/thunderbird/locales/en-US/**"
     l10n = "{l}other-licenses/branding/thunderbird/**"
 
 [[paths]]
-    reference = "comm/mail/branding/thunderbird/locales/en-US/**"
+    reference = "mail/branding/thunderbird/locales/en-US/**"
     l10n = "{l}mail/branding/thunderbird/**"
 
 [[includes]]
-    path = "devtools/client/locales/l10n.toml"
+    path = "{mozilla}/devtools/client/locales/l10n.toml"
 
 [[includes]]
-    path = "toolkit/locales/l10n.toml"
+    path = "{mozilla}/toolkit/locales/l10n.toml"
 
 [[includes]]
-    path = "comm/calendar/locales/l10n.toml"
+    path = "calendar/locales/l10n.toml"
 
 [[paths]]
-    reference = "devtools/startup/locales/en-US/**"
+    reference = "{mozilla}/devtools/startup/locales/en-US/**"
     l10n = "{l}devtools/startup/**"
 
+# for Gecko 60 and older and cross-channel
+[[paths]]
+    reference = "{mozilla}/devtools/shim/locales/en-US/**"
+    l10n = "{l}devtools/shim/**"
+
 # ignore MOZ_LANGPACK_CONTRIBUTORS
 [[filters]]
     path = "{l}mail/defines.inc"
     key = "MOZ_LANGPACK_CONTRIBUTORS"
     action = "ignore"
 
 # defines.inc and all-l10n.js can be missing completely
 [[filters]]