From 98205de6757e53e4809e76b817b0ec45dcd59aab Mon Sep 17 00:00:00 2001
From: Scott Wu <scottcwwu@gmail.com>
Date: Tue, 25 Jul 2017 10:40:21 +0800
Subject: [PATCH] Bug 1375799 - (Part 2) [Form Autofill] Rename locale folder
 to locales. r=lchang

MozReview-Commit-ID: 2xF9vyE2tXi

--HG--
rename : browser/extensions/formautofill/locale/en-US/formautofill.properties => browser/extensions/formautofill/locales/en-US/formautofill.properties
rename : browser/extensions/formautofill/locale/jar.mn => browser/extensions/formautofill/locales/jar.mn
rename : browser/extensions/formautofill/locale/moz.build => browser/extensions/formautofill/locales/moz.build
extra : rebase_source : bbf1366e9d1442ce8679b78d0a87e5ff752bb89d
---
 .../{locale => locales}/en-US/formautofill.properties         | 0
 browser/extensions/formautofill/{locale => locales}/jar.mn    | 0
 browser/extensions/formautofill/{locale => locales}/moz.build | 0
 browser/extensions/formautofill/moz.build                     | 2 +-
 browser/locales/Makefile.in                                   | 4 ++--
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename browser/extensions/formautofill/{locale => locales}/en-US/formautofill.properties (100%)
 rename browser/extensions/formautofill/{locale => locales}/jar.mn (100%)
 rename browser/extensions/formautofill/{locale => locales}/moz.build (100%)

diff --git a/browser/extensions/formautofill/locale/en-US/formautofill.properties b/browser/extensions/formautofill/locales/en-US/formautofill.properties
similarity index 100%
rename from browser/extensions/formautofill/locale/en-US/formautofill.properties
rename to browser/extensions/formautofill/locales/en-US/formautofill.properties
diff --git a/browser/extensions/formautofill/locale/jar.mn b/browser/extensions/formautofill/locales/jar.mn
similarity index 100%
rename from browser/extensions/formautofill/locale/jar.mn
rename to browser/extensions/formautofill/locales/jar.mn
diff --git a/browser/extensions/formautofill/locale/moz.build b/browser/extensions/formautofill/locales/moz.build
similarity index 100%
rename from browser/extensions/formautofill/locale/moz.build
rename to browser/extensions/formautofill/locales/moz.build
diff --git a/browser/extensions/formautofill/moz.build b/browser/extensions/formautofill/moz.build
index 9f0d5ed9a657..d67a497f814a 100644
--- a/browser/extensions/formautofill/moz.build
+++ b/browser/extensions/formautofill/moz.build
@@ -7,7 +7,7 @@
 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'
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
index 3301ea5ae2d4..9d2cc77180a3 100644
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -99,7 +99,7 @@ libs-%:
 	@$(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-$*
@@ -120,7 +120,7 @@ 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