Bug 1396563 - Port bug 1386616 to C-C [Move devtools key-shortcuts.properties out of the devtools addon]. rs=bustage-fix draft
authorJorg K <jorgk@jorgk.com>
Mon, 02 Oct 2017 16:33:07 -0600
changeset 55181 d39e905f77aa1112fa12eaebd73d7b516377a638
parent 55180 163b864cb479e74d3c5247478a5f8664db84bce8
child 55182 2022b7b9475393397723b452f88e3d77180433f4
push id4997
push usermozilla@hocat.ca
push dateWed, 04 Oct 2017 18:24:21 +0000
treeherdertry-comm-central@2022b7b94753 [default view] [failures only]
reviewersbustage-fix
bugs1396563, 1386616
Bug 1396563 - Port bug 1386616 to C-C [Move devtools key-shortcuts.properties out of the devtools addon]. rs=bustage-fix MozReview-Commit-ID: K1neTfcTLPf
mail/locales/Makefile.in
mail/locales/filter.py
mail/locales/l10n.toml
--- a/mail/locales/Makefile.in
+++ b/mail/locales/Makefile.in
@@ -89,16 +89,17 @@ libs-%:
 # we need the current value of AB_CD.
 	$(if $(filter en-US,$(AB_CD)),, @$(MAKE) merge-$*)
 ifdef MOZ_CALENDAR
 	$(if $(filter en-US,$(AB_CD)),, @$(MAKE) -C ../../calendar/lightning merge-$*)
 endif
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C $(DEPTH)/toolkit/locales libs-$*  XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
 	@$(MAKE) -C $(DEPTH)/devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
+	@$(MAKE) -C $(DEPTH)/devtools/shim/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
 	@$(MAKE) -C ../../chat/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C ../../editor/ui/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C $(DEPTH)/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref
 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
 
 
--- a/mail/locales/filter.py
+++ b/mail/locales/filter.py
@@ -1,13 +1,13 @@
 def test(mod, path, entity=None):
   import re
   # ignore anything but Thunderbird
   if mod not in ("netwerk", "dom", "toolkit", "security/manager",
-                 "devtools/shared", "devtools/client",
+                 "devtools/shared", "devtools/client", "devtools/shim",
                  "mail", "chat", "editor/ui", "extensions/spellcheck",
                  "other-licenses/branding/thunderbird"):
     return "ignore"
 
   # ignore MOZ_LANGPACK_CONTRIBUTORS
   if mod == "mail" and path == "defines.inc" and \
      entity == "MOZ_LANGPACK_CONTRIBUTORS":
     return "ignore"
--- a/mail/locales/l10n.toml
+++ b/mail/locales/l10n.toml
@@ -90,16 +90,19 @@ locales = [
     l10n = "{l}other-licenses/branding/thunderbird/**"
 
 [[includes]]
     path = "{mozilla}/devtools/client/locales/l10n.toml"
 
 [[includes]]
     path = "{mozilla}/toolkit/locales/l10n.toml"
 
+[[paths]]
+    reference = "{mozilla}/devtools/shim/locales/en-US/**"
+    l10n = "{l}{mozilla}/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