luci-0.10: Merge r6993

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index f93ea192547517cafe24cbef6e4f94643a5aa227..c8865cebe86a00a42903468bf898dbbbb6e8a277 100644 (file)
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -500,6 +500,7 @@ $(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,chinese,chinese (by zjhzzyf)))
 $(eval $(call translation,japanese,Japanese (by Tsukasa Hamano)))
 $(eval $(call translation,greek,Greek (by Vasilis Tsiligiannis)))
 $(eval $(call translation,catalan,Catalan (by Eduard Duran)))

diff --git a/i18n/chinese/Makefile b/i18n/chinese/Makefile
new file mode 100644 (file)
index 0000000..bb1480e
--- /dev/null
+++ b/i18n/chinese/Makefile
@@ -0,0 +1,5 @@
+PO = base
+PO_LANG = zh-cn
+
+include ../../build/config.mk
+include ../../build/module.mk

diff --git a/i18n/chinese/ipkg/postinst b/i18n/chinese/ipkg/postinst
new file mode 100644 (file)
index 0000000..9fbec28
--- /dev/null
+++ b/i18n/chinese/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+       ( . /etc/uci-defaults/luci-i18n-chinese ) &&    rm -f /etc/uci-defaults/luci-i18n-chinese
+}

diff --git a/i18n/chinese/root/etc/uci-defaults/luci-i18n-chinese b/i18n/chinese/root/etc/uci-defaults/luci-i18n-chinese
new file mode 100644 (file)
index 0000000..aee25e6
--- /dev/null
+++ b/i18n/chinese/root/etc/uci-defaults/luci-i18n-chinese
@@ -0,0 +1,5 @@
+#!/bin/sh
+uci batch <<-EOF
+       set luci.languages.zh_cn=chinese
+       commit luci
+EOF