From 5f443fbd312abfc5b59b4b550f251d866ddd1d3f Mon Sep 17 00:00:00 2001
From: "bsmedberg%covad.net"
 <bsmedberg%covad.net@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 4 Dec 2004 18:37:31 +0000
Subject: [PATCH] Start hitting up the gecko locale files, bug 271324. They are
 all going to live under dom/locales. Right now I'm not changing the *shipped*
 locations, only the source locations.

git-svn-id: svn://10.0.0.236/trunk@166248 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/dom/Makefile.in                       |  2 +-
 mozilla/dom/jar.mn                            |  3 --
 mozilla/dom/locales/Makefile.in               | 47 +++++++++++++++++++
 .../en-US/chrome/dom}/dom.properties          |  0
 mozilla/dom/locales/jar.mn                    |  4 ++
 5 files changed, 52 insertions(+), 4 deletions(-)
 delete mode 100644 mozilla/dom/jar.mn
 create mode 100644 mozilla/dom/locales/Makefile.in
 rename mozilla/dom/{resources/locale => locales/en-US/chrome/dom}/dom.properties (100%)
 create mode 100644 mozilla/dom/locales/jar.mn

diff --git a/mozilla/dom/Makefile.in b/mozilla/dom/Makefile.in
index adfc9f0b897..d0fc041b476 100644
--- a/mozilla/dom/Makefile.in
+++ b/mozilla/dom/Makefile.in
@@ -43,7 +43,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dom
-DIRS		= public src
+DIRS		= public src locales
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/dom/jar.mn b/mozilla/dom/jar.mn
deleted file mode 100644
index 0bae48150a5..00000000000
--- a/mozilla/dom/jar.mn
+++ /dev/null
@@ -1,3 +0,0 @@
-en-US.jar:
-        locale/en-US/communicator/dom/dom.properties          (resources/locale/dom.properties)
-
diff --git a/mozilla/dom/locales/Makefile.in b/mozilla/dom/locales/Makefile.in
new file mode 100644
index 00000000000..28c9d60da39
--- /dev/null
+++ b/mozilla/dom/locales/Makefile.in
@@ -0,0 +1,47 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Mozilla Browser code.
+#
+# The Initial Developer of the Original Code is
+# Benjamin Smedberg <benjamin@smedbergs.us>
+# Portions created by the Initial Developer are Copyright (C) 2004
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH          = ../..
+topsrcdir      = @top_srcdir@
+srcdir         = @srcdir@
+VPATH          = @srcdir@
+relativesrcdir = dom/locales
+
+include $(DEPTH)/config/autoconf.mk
+
+DEFINES += -DAB_CD=$(AB_CD)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/dom/resources/locale/dom.properties b/mozilla/dom/locales/en-US/chrome/dom/dom.properties
similarity index 100%
rename from mozilla/dom/resources/locale/dom.properties
rename to mozilla/dom/locales/en-US/chrome/dom/dom.properties
diff --git a/mozilla/dom/locales/jar.mn b/mozilla/dom/locales/jar.mn
new file mode 100644
index 00000000000..92a35cb0ee6
--- /dev/null
+++ b/mozilla/dom/locales/jar.mn
@@ -0,0 +1,4 @@
+#filter substitution
+
+@AB_CD@.jar:
+  locale/@AB_CD@/communicator/dom/dom.properties (%chrome/dom/dom.properties)