From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 6 Feb 2012 21:28:06 +0000 (+0000)
Subject: luci-0.10: merge r8220
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=66ecb8d42e0fe1f06cb99e39e53b1860796abaf2;p=oweals%2Fluci.git

luci-0.10: merge r8220
---

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 17f485b18..362f2ac54 100644
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -545,7 +545,7 @@ $(eval $(call translation,english,English))
 $(eval $(call translation,french,French (by Florian Fainelli)))
 $(eval $(call translation,italian,Italian (by Matteo Croce)))
 $(eval $(call translation,russian,Russian (by Skryabin Dmitry)))
-$(eval $(call translation,portuguese_brazilian,Portuguese (Brazilian) (by Carlos Cesario)))
+$(eval $(call translation,portuguese-brazilian,Portuguese (Brazilian) (by Carlos Cesario)))
 $(eval $(call translation,chinese,Chinese (by Chinese Translators)))
 $(eval $(call translation,japanese,Japanese (by Tsukasa Hamano)))
 $(eval $(call translation,greek,Greek (by Vasilis Tsiligiannis)))
diff --git a/i18n/portuguese-brazilian/Makefile b/i18n/portuguese-brazilian/Makefile
new file mode 100644
index 000000000..9749c9d50
--- /dev/null
+++ b/i18n/portuguese-brazilian/Makefile
@@ -0,0 +1,5 @@
+PO = base
+PO_LANG = pt-br
+
+include ../../build/config.mk
+include ../../build/module.mk
diff --git a/i18n/portuguese-brazilian/ipkg/postinst b/i18n/portuguese-brazilian/ipkg/postinst
new file mode 100755
index 000000000..fc3315663
--- /dev/null
+++ b/i18n/portuguese-brazilian/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-i18n-portuguese_brazilian ) &&	rm -f /etc/uci-defaults/luci-i18n-portuguese_brazilian
+}
diff --git a/i18n/portuguese-brazilian/root/etc/uci-defaults/luci-i18n-portuguese_brazilian b/i18n/portuguese-brazilian/root/etc/uci-defaults/luci-i18n-portuguese_brazilian
new file mode 100755
index 000000000..1554c1ec8
--- /dev/null
+++ b/i18n/portuguese-brazilian/root/etc/uci-defaults/luci-i18n-portuguese_brazilian
@@ -0,0 +1,5 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.languages.pt_br="Português (Brasil)"
+        commit luci
+EOF
diff --git a/i18n/portuguese_brazilian/Makefile b/i18n/portuguese_brazilian/Makefile
deleted file mode 100644
index 9749c9d50..000000000
--- a/i18n/portuguese_brazilian/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-PO = base
-PO_LANG = pt-br
-
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/i18n/portuguese_brazilian/ipkg/postinst b/i18n/portuguese_brazilian/ipkg/postinst
deleted file mode 100755
index fc3315663..000000000
--- a/i18n/portuguese_brazilian/ipkg/postinst
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-[ -n "${IPKG_INSTROOT}" ] || {
-	( . /etc/uci-defaults/luci-i18n-portuguese_brazilian ) &&	rm -f /etc/uci-defaults/luci-i18n-portuguese_brazilian
-}
diff --git a/i18n/portuguese_brazilian/root/etc/uci-defaults/luci-i18n-portuguese_brazilian b/i18n/portuguese_brazilian/root/etc/uci-defaults/luci-i18n-portuguese_brazilian
deleted file mode 100755
index 1554c1ec8..000000000
--- a/i18n/portuguese_brazilian/root/etc/uci-defaults/luci-i18n-portuguese_brazilian
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-uci batch <<-EOF
-	set luci.languages.pt_br="Português (Brasil)"
-        commit luci
-EOF