Bug 1517919, put Fluent files into right subdirectory for chrome-%, r=nalexander
authorAxel Hecht <axel@pike.org>
Wed, 09 Jan 2019 00:34:45 +0000
changeset 512979 a9422d15a9f5
parent 512956 a36388b88fcc
child 512980 b0858dddedf9
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1517919
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1517919, put Fluent files into right subdirectory for chrome-%, r=nalexander Differential Revision: https://phabricator.services.mozilla.com/D15883
mobile/android/locales/jar.mn
--- a/mobile/android/locales/jar.mn
+++ b/mobile/android/locales/jar.mn
@@ -62,20 +62,25 @@ relativesrcdir dom/locales:
   locale/@AB_CD@/browser/overrides/dom/dom.properties          (%chrome/dom/dom.properties)
 #about:plugins
   locale/@AB_CD@/browser/overrides/plugins.properties          (%chrome/plugins.properties)
 
 # Fluent files
 # Note: All rules must be wildcards, as localized files are optional
 # Only run this if we're not en-US, as en-US is already built
 # by toolkit/locales/jar.mn.
+# If you're including files from a subdirectory, ensure that you're
+# putting them into the corresponding subdirectory in the target.
+# The wildcard ** does that for us in toolkit.
 
 #define EN_US en-US
 #if AB_CD != EN_US
 [localization] @AB_CD@.jar:
 relativesrcdir toolkit/locales:
 #about:crashes
   crashreporter                                    (%crashreporter/**/*.ftl)
+#about:about
+  toolkit/about                                    (%toolkit/about/*About.ftl)
+#about:support
+  toolkit/about                                    (%toolkit/about/*Support.ftl)
 #endif
-#about:about
-  toolkit                                          (%toolkit/about/*About.ftl)
-#about:support
-  toolkit                                          (%toolkit/about/*Support.ftl)
+# Do not add files below the endif. Reviewers, expand more context above
+# for comments.