luci-0.10: merge r8220

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 17f485b..362f2ac 100644 (file)
--- 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 (file)
index 0000000..9749c9d
--- /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 (executable)
index 0000000..fc33156
--- /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 (executable)
index 0000000..1554c1e
--- /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 (file)
index 9749c9d..0000000
--- 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 (executable)
index fc33156..0000000
--- 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 (executable)
index 1554c1e..0000000
--- 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