Bug 1375799 - (Part 2) [Form Autofill] Rename locale folder to locales. r=lchang draft
authorScott Wu <scottcwwu@gmail.com>
Tue, 25 Jul 2017 10:40:21 +0800
changeset 616803 f3c79ca7e3d6708e97967cf07649d438324ad83f
parent 616674 5a06550a2759ec6e715b0d3e431ad06aee496de7
child 639598 0c575e3734a1989b60f05c814a78d2b7eb627fb7
push id70816
push userbmo:scwwu@mozilla.com
push dateThu, 27 Jul 2017 14:14:52 +0000
reviewerslchang
bugs1375799
milestone56.0a1
Bug 1375799 - (Part 2) [Form Autofill] Rename locale folder to locales. r=lchang MozReview-Commit-ID: 2xF9vyE2tXi
browser/extensions/formautofill/locale/en-US/formautofill.properties
browser/extensions/formautofill/locale/jar.mn
browser/extensions/formautofill/locale/moz.build
browser/extensions/formautofill/locales/en-US/formautofill.properties
browser/extensions/formautofill/locales/jar.mn
browser/extensions/formautofill/locales/moz.build
browser/extensions/formautofill/moz.build
browser/locales/Makefile.in
rename from browser/extensions/formautofill/locale/en-US/formautofill.properties
rename to browser/extensions/formautofill/locales/en-US/formautofill.properties
rename from browser/extensions/formautofill/locale/jar.mn
rename to browser/extensions/formautofill/locales/jar.mn
rename from browser/extensions/formautofill/locale/moz.build
rename to browser/extensions/formautofill/locales/moz.build
--- a/browser/extensions/formautofill/moz.build
+++ b/browser/extensions/formautofill/moz.build
@@ -2,17 +2,17 @@
 # vim: set filetype=python:
 # 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/.
 
 DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
 DEFINES['MOZ_APP_MAXVERSION'] = CONFIG['MOZ_APP_MAXVERSION']
 
-DIRS += ['locale']
+DIRS += ['locales']
 
 FINAL_TARGET_FILES.features['formautofill@mozilla.org'] += [
   'bootstrap.js'
 ]
 
 FINAL_TARGET_PP_FILES.features['formautofill@mozilla.org'] += [
   'install.rdf.in'
 ]
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -94,17 +94,17 @@ searchplugins:: $(list-json)
 DEFINES += -DBOOKMARKS_INCLUDE_DIR=$(dir $(call MERGE_FILE,profile/bookmarks.inc))
 
 libs-%:
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C ../../toolkit/locales libs-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
 	@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
 ifndef RELEASE_OR_BETA
-	@$(MAKE) -C ../extensions/formautofill/locale AB_CD=$* XPI_NAME=locale-$*
+	@$(MAKE) -C ../extensions/formautofill/locales AB_CD=$* XPI_NAME=locale-$*
 endif
 	@$(MAKE) -C ../extensions/onboarding/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C ../extensions/pocket/locale AB_CD=$* XPI_NAME=locale-$*
 ifndef RELEASE_OR_BETA
 	@$(MAKE) -C ../extensions/presentation/locale AB_CD=$* XPI_NAME=locale-$*
 endif
 ifneq '$(or $(MOZ_DEV_EDITION),$(NIGHTLY_BUILD))' ''
 	@$(MAKE) -C ../extensions/webcompat-reporter/locales AB_CD=$* XPI_NAME=locale-$*
@@ -115,17 +115,17 @@ endif
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
 
 chrome-%:
 	@$(MAKE) -C ../../toolkit/locales chrome-$*
 	@$(MAKE) -C ../../services/sync/locales chrome AB_CD=$*
 	@$(MAKE) -C ../../extensions/spellcheck/locales chrome AB_CD=$*
 ifndef RELEASE_OR_BETA
-	@$(MAKE) -C ../extensions/formautofill/locale chrome AB_CD=$*
+	@$(MAKE) -C ../extensions/formautofill/locales chrome AB_CD=$*
 endif
 	@$(MAKE) -C ../extensions/pocket/locale chrome AB_CD=$*
 ifndef RELEASE_OR_BETA
 	@$(MAKE) -C ../extensions/presentation/locale chrome AB_CD=$*
 endif
 	@$(MAKE) -C ../../intl/locales chrome AB_CD=$*
 	@$(MAKE) -C ../../devtools/client/locales chrome AB_CD=$*
 	@$(MAKE) chrome AB_CD=$*