From f45285d461a6125a9ad1968130823f3d3e366090 Mon Sep 17 00:00:00 2001
From: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Date: Tue, 16 Oct 2012 15:09:34 +0200
Subject: [PATCH] Support for language aliases.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some languages have identifiers that gettext can't determine
automatically in all OS'es.  An example is Norwegian (no_NO, deprecated)
with its Bokmål (nb_NO) and Nynorsk (nn_NO) form.

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 Makefile         | 12 +++++++++---
 po/de_CH.aliases |  1 +
 po/de_DE.aliases |  1 +
 po/nb_NO.aliases |  1 +
 4 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 po/de_CH.aliases
 create mode 100644 po/de_DE.aliases
 create mode 100644 po/nb_NO.aliases

diff --git a/Makefile b/Makefile
index ee0cfe3f9..8ac198b17 100644
--- a/Makefile
+++ b/Makefile
@@ -157,9 +157,9 @@ install-macosx: $(NAME)
 	$(INSTALL) $(MACOSXFILES)/Info.plist $(MACOSXINSTALL)/Contents/
 	$(INSTALL) $(ICONFILE) $(MACOSXINSTALL)/Contents/Resources/
 	$(INSTALL) $(MACOSXFILES)/Subsurface.icns $(MACOSXINSTALL)/Contents/Resources/
-	$(INSTALL) -d -m 755 $(addprefix $(MACOSXINSTALL)/Contents/Resources/,$(dir $(MSGOBJS)))
-	for MSG in $(MSGOBJS); do\
-		install $$MSG  $(MACOSXINSTALL)/Contents/Resources/$$MSG;\
+	for LOC in $(wildcard locale/*/LC_MESSAGES); do \
+		$(INSTALL) -d -m 755 $(MACOSXINSTALL)/Contents/Resources/$$LOC; \
+		$(INSTALL) $$LOC/subsurface.mo $(MACOSXINSTALL)/Contents/Resources/$$LOC/subsurface.mo; \
 	done
 
 install-cross-windows: $(NAME)
@@ -235,6 +235,12 @@ $(OSSUPPORT).o: $(OSSUPPORT).c display-gtk.h
 locale/%.UTF-8/LC_MESSAGES/subsurface.mo: po/%.po
 	mkdir -p $(dir $@)
 	msgfmt -c -o $@ po/$*.po
+	if test -s po/$*.aliases; then \
+		for ALIAS in `cat po/$*.aliases`; do \
+			mkdir -p locale/$$ALIAS/LC_MESSAGES; \
+			cp $@ locale/$$ALIAS/LC_MESSAGES; \
+		done; \
+	fi
 
 doc:
 	$(MAKE) -C Documentation doc
diff --git a/po/de_CH.aliases b/po/de_CH.aliases
new file mode 100644
index 000000000..7b1b7b24f
--- /dev/null
+++ b/po/de_CH.aliases
@@ -0,0 +1 @@
+gsw
diff --git a/po/de_DE.aliases b/po/de_DE.aliases
new file mode 100644
index 000000000..7673daa94
--- /dev/null
+++ b/po/de_DE.aliases
@@ -0,0 +1 @@
+de
diff --git a/po/nb_NO.aliases b/po/nb_NO.aliases
new file mode 100644
index 000000000..430a88a75
--- /dev/null
+++ b/po/nb_NO.aliases
@@ -0,0 +1 @@
+nb nn no