* luci/i18n: rename *.pt_br.* to *.pt-br.*, extend luci.i18n to convert "_" to "-" in language tags

41 files changed, 5 insertions, 5 deletions

diff --git a/applications/luci-ddns/luasrc/i18n/ddns.pt_br.lua b/applications/luci-ddns/luasrc/i18n/ddns.pt-br.lua
index 58375c28a..58375c28a 100644
--- a/applications/luci-ddns/luasrc/i18n/ddns.pt_br.lua
+++ b/applications/luci-ddns/luasrc/i18n/ddns.pt-br.lua
diff --git a/applications/luci-ddns/luasrc/i18n/ddns.pt_br.xml b/applications/luci-ddns/luasrc/i18n/ddns.pt-br.xml
index c77ff3eb5..c77ff3eb5 100644
--- a/applications/luci-ddns/luasrc/i18n/ddns.pt_br.xml
+++ b/applications/luci-ddns/luasrc/i18n/ddns.pt-br.xml
diff --git a/applications/luci-fw/luasrc/i18n/luci-fw.pt_br.lua b/applications/luci-fw/luasrc/i18n/luci-fw.pt-br.lua
index dc65599dd..dc65599dd 100644
--- a/applications/luci-fw/luasrc/i18n/luci-fw.pt_br.lua
+++ b/applications/luci-fw/luasrc/i18n/luci-fw.pt-br.lua
diff --git a/applications/luci-fw/luasrc/i18n/luci-fw.pt_br.xml b/applications/luci-fw/luasrc/i18n/luci-fw.pt-br.xml
index 10dca8a90..10dca8a90 100644
--- a/applications/luci-fw/luasrc/i18n/luci-fw.pt_br.xml
+++ b/applications/luci-fw/luasrc/i18n/luci-fw.pt-br.xml
diff --git a/applications/luci-hd_idle/luasrc/i18n/hd_idle.pt_br.lua b/applications/luci-hd_idle/luasrc/i18n/hd_idle.pt-br.lua
index 856523a24..856523a24 100644
--- a/applications/luci-hd_idle/luasrc/i18n/hd_idle.pt_br.lua
+++ b/applications/luci-hd_idle/luasrc/i18n/hd_idle.pt-br.lua
diff --git a/applications/luci-hd_idle/luasrc/i18n/hd_idle.pt_br.xml b/applications/luci-hd_idle/luasrc/i18n/hd_idle.pt-br.xml
index b4ce7228a..b4ce7228a 100644
--- a/applications/luci-hd_idle/luasrc/i18n/hd_idle.pt_br.xml
+++ b/applications/luci-hd_idle/luasrc/i18n/hd_idle.pt-br.xml
diff --git a/applications/luci-initmgr/luasrc/i18n/initmgr.pt_br.lua b/applications/luci-initmgr/luasrc/i18n/initmgr.pt-br.lua
index 9831948b6..9831948b6 100644
--- a/applications/luci-initmgr/luasrc/i18n/initmgr.pt_br.lua
+++ b/applications/luci-initmgr/luasrc/i18n/initmgr.pt-br.lua
diff --git a/applications/luci-initmgr/luasrc/i18n/initmgr.pt_br.xml b/applications/luci-initmgr/luasrc/i18n/initmgr.pt-br.xml
index 26686dc34..26686dc34 100644
--- a/applications/luci-initmgr/luasrc/i18n/initmgr.pt_br.xml
+++ b/applications/luci-initmgr/luasrc/i18n/initmgr.pt-br.xml
diff --git a/applications/luci-ntpc/luasrc/i18n/ntpc.pt_br.lua b/applications/luci-ntpc/luasrc/i18n/ntpc.pt-br.lua
index be3ce5b70..be3ce5b70 100644
--- a/applications/luci-ntpc/luasrc/i18n/ntpc.pt_br.lua
+++ b/applications/luci-ntpc/luasrc/i18n/ntpc.pt-br.lua
diff --git a/applications/luci-ntpc/luasrc/i18n/ntpc.pt_br.xml b/applications/luci-ntpc/luasrc/i18n/ntpc.pt-br.xml
index ed5e719b1..ed5e719b1 100644
--- a/applications/luci-ntpc/luasrc/i18n/ntpc.pt_br.xml
+++ b/applications/luci-ntpc/luasrc/i18n/ntpc.pt-br.xml
diff --git a/applications/luci-p910nd/luasrc/i18n/p910nd.pt_br.lua b/applications/luci-p910nd/luasrc/i18n/p910nd.pt-br.lua
index 3ec3ec0f3..3ec3ec0f3 100644
--- a/applications/luci-p910nd/luasrc/i18n/p910nd.pt_br.lua
+++ b/applications/luci-p910nd/luasrc/i18n/p910nd.pt-br.lua
diff --git a/applications/luci-p910nd/luasrc/i18n/p910nd.pt_br.xml b/applications/luci-p910nd/luasrc/i18n/p910nd.pt-br.xml
index 141b5809a..141b5809a 100644
--- a/applications/luci-p910nd/luasrc/i18n/p910nd.pt_br.xml
+++ b/applications/luci-p910nd/luasrc/i18n/p910nd.pt-br.xml
diff --git a/applications/luci-qos/luasrc/i18n/qos.pt_br.lua b/applications/luci-qos/luasrc/i18n/qos.pt-br.lua
index 582e7aa94..582e7aa94 100644
--- a/applications/luci-qos/luasrc/i18n/qos.pt_br.lua
+++ b/applications/luci-qos/luasrc/i18n/qos.pt-br.lua
diff --git a/applications/luci-qos/luasrc/i18n/qos.pt_br.xml b/applications/luci-qos/luasrc/i18n/qos.pt-br.xml
index ff32e2259..ff32e2259 100644
--- a/applications/luci-qos/luasrc/i18n/qos.pt_br.xml
+++ b/applications/luci-qos/luasrc/i18n/qos.pt-br.xml
diff --git a/applications/luci-samba/luasrc/i18n/samba.pt_br.lua b/applications/luci-samba/luasrc/i18n/samba.pt-br.lua
index 9129ef6f4..9129ef6f4 100644
--- a/applications/luci-samba/luasrc/i18n/samba.pt_br.lua
+++ b/applications/luci-samba/luasrc/i18n/samba.pt-br.lua
diff --git a/applications/luci-samba/luasrc/i18n/samba.pt_br.xml b/applications/luci-samba/luasrc/i18n/samba.pt-br.xml
index 288a50dbe..288a50dbe 100644
--- a/applications/luci-samba/luasrc/i18n/samba.pt_br.xml
+++ b/applications/luci-samba/luasrc/i18n/samba.pt-br.xml
diff --git a/applications/luci-statistics/luasrc/i18n/rrdtool.pt_br.lua b/applications/luci-statistics/luasrc/i18n/rrdtool.pt-br.lua
index 708f34c5a..708f34c5a 100644
--- a/applications/luci-statistics/luasrc/i18n/rrdtool.pt_br.lua
+++ b/applications/luci-statistics/luasrc/i18n/rrdtool.pt-br.lua
diff --git a/applications/luci-statistics/luasrc/i18n/rrdtool.pt_br.xml.hide b/applications/luci-statistics/luasrc/i18n/rrdtool.pt-br.xml.hide
index 7f369c1bf..7f369c1bf 100644
--- a/applications/luci-statistics/luasrc/i18n/rrdtool.pt_br.xml.hide
+++ b/applications/luci-statistics/luasrc/i18n/rrdtool.pt-br.xml.hide
diff --git a/applications/luci-statistics/luasrc/i18n/statistics.pt_br.lua b/applications/luci-statistics/luasrc/i18n/statistics.pt-br.lua
index 9aca2020f..9aca2020f 100644
--- a/applications/luci-statistics/luasrc/i18n/statistics.pt_br.lua
+++ b/applications/luci-statistics/luasrc/i18n/statistics.pt-br.lua
diff --git a/applications/luci-statistics/luasrc/i18n/statistics.pt_br.xml b/applications/luci-statistics/luasrc/i18n/statistics.pt-br.xml
index ed51ebfe2..ed51ebfe2 100644
--- a/applications/luci-statistics/luasrc/i18n/statistics.pt_br.xml
+++ b/applications/luci-statistics/luasrc/i18n/statistics.pt-br.xml
diff --git a/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.pt_br.lua b/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.pt-br.lua
index 03e0bc63e..03e0bc63e 100644
--- a/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.pt_br.lua
+++ b/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.pt-br.lua
diff --git a/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.pt_br.xml b/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.pt-br.xml
index 65d52ce97..65d52ce97 100644
--- a/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.pt_br.xml
+++ b/applications/luci-tinyproxy/luasrc/i18n/tinyproxy.pt-br.xml
diff --git a/applications/luci-upnp/luasrc/i18n/upnp.pt_br.lua b/applications/luci-upnp/luasrc/i18n/upnp.pt-br.lua
index 9170a311d..9170a311d 100644
--- a/applications/luci-upnp/luasrc/i18n/upnp.pt_br.lua
+++ b/applications/luci-upnp/luasrc/i18n/upnp.pt-br.lua
diff --git a/applications/luci-upnp/luasrc/i18n/upnp.pt_br.xml b/applications/luci-upnp/luasrc/i18n/upnp.pt-br.xml
index 9b5788364..9b5788364 100644
--- a/applications/luci-upnp/luasrc/i18n/upnp.pt_br.xml
+++ b/applications/luci-upnp/luasrc/i18n/upnp.pt-br.xml
diff --git a/applications/luci-ushare/luasrc/i18n/ushare.pt_br.lua b/applications/luci-ushare/luasrc/i18n/ushare.pt-br.lua
index 492c4cefb..492c4cefb 100644
--- a/applications/luci-ushare/luasrc/i18n/ushare.pt_br.lua
+++ b/applications/luci-ushare/luasrc/i18n/ushare.pt-br.lua
diff --git a/applications/luci-ushare/luasrc/i18n/ushare.pt_br.xml b/applications/luci-ushare/luasrc/i18n/ushare.pt-br.xml
index 729e05691..729e05691 100644
--- a/applications/luci-ushare/luasrc/i18n/ushare.pt_br.xml
+++ b/applications/luci-ushare/luasrc/i18n/ushare.pt-br.xml
diff --git a/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt_br.lua b/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt-br.lua
index f07765d19..f07765d19 100644
--- a/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt_br.lua
+++ b/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt-br.lua
diff --git a/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt_br.xml b/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt-br.xml
index 14fa4fdcc..14fa4fdcc 100644
--- a/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt_br.xml
+++ b/applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt-br.xml
diff --git a/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt_br.lua b/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua
index c7e5cfd0c..c7e5cfd0c 100644
--- a/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt_br.lua
+++ b/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua
diff --git a/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt_br.xml b/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml
index 0f8b59bdb..0f8b59bdb 100644
--- a/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt_br.xml
+++ b/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml
diff --git a/i18n/portuguese_brazilian/luasrc/i18n/cbi.pt_br.lua b/i18n/portuguese_brazilian/luasrc/i18n/cbi.pt-br.lua
index 45136810d..45136810d 100644
--- a/i18n/portuguese_brazilian/luasrc/i18n/cbi.pt_br.lua
+++ b/i18n/portuguese_brazilian/luasrc/i18n/cbi.pt-br.lua
diff --git a/i18n/portuguese_brazilian/luasrc/i18n/cbi.pt_br.xml b/i18n/portuguese_brazilian/luasrc/i18n/cbi.pt-br.xml
index 53dca0e40..53dca0e40 100644
--- a/i18n/portuguese_brazilian/luasrc/i18n/cbi.pt_br.xml
+++ b/i18n/portuguese_brazilian/luasrc/i18n/cbi.pt-br.xml
diff --git a/i18n/portuguese_brazilian/luasrc/i18n/default.pt_br.lua b/i18n/portuguese_brazilian/luasrc/i18n/default.pt-br.lua
index 1a43c0786..1a43c0786 100644
--- a/i18n/portuguese_brazilian/luasrc/i18n/default.pt_br.lua
+++ b/i18n/portuguese_brazilian/luasrc/i18n/default.pt-br.lua
diff --git a/i18n/portuguese_brazilian/luasrc/i18n/default.pt_br.xml b/i18n/portuguese_brazilian/luasrc/i18n/default.pt-br.xml
index 9f44e8926..9f44e8926 100644
--- a/i18n/portuguese_brazilian/luasrc/i18n/default.pt_br.xml
+++ b/i18n/portuguese_brazilian/luasrc/i18n/default.pt-br.xml
diff --git a/i18n/portuguese_brazilian/luasrc/i18n/sysauth.pt_br.lua b/i18n/portuguese_brazilian/luasrc/i18n/sysauth.pt-br.lua
index 9df9c6a62..9df9c6a62 100644
--- a/i18n/portuguese_brazilian/luasrc/i18n/sysauth.pt_br.lua
+++ b/i18n/portuguese_brazilian/luasrc/i18n/sysauth.pt-br.lua
diff --git a/i18n/portuguese_brazilian/luasrc/i18n/sysauth.pt_br.xml b/i18n/portuguese_brazilian/luasrc/i18n/sysauth.pt-br.xml
index d63433ea6..d63433ea6 100644
--- a/i18n/portuguese_brazilian/luasrc/i18n/sysauth.pt_br.xml
+++ b/i18n/portuguese_brazilian/luasrc/i18n/sysauth.pt-br.xml
diff --git a/i18n/portuguese_brazilian/luasrc/i18n/wifi.pt_br.lua b/i18n/portuguese_brazilian/luasrc/i18n/wifi.pt-br.lua
index ab6bceafd..ab6bceafd 100644
--- a/i18n/portuguese_brazilian/luasrc/i18n/wifi.pt_br.lua
+++ b/i18n/portuguese_brazilian/luasrc/i18n/wifi.pt-br.lua
diff --git a/i18n/portuguese_brazilian/luasrc/i18n/wifi.pt_br.xml b/i18n/portuguese_brazilian/luasrc/i18n/wifi.pt-br.xml
index c722b1b00..c722b1b00 100644
--- a/i18n/portuguese_brazilian/luasrc/i18n/wifi.pt_br.xml
+++ b/i18n/portuguese_brazilian/luasrc/i18n/wifi.pt-br.xml
diff --git a/libs/uvl/luasrc/i18n/uvl.pt_br.lua b/libs/uvl/luasrc/i18n/uvl.pt-br.lua
index baf789a78..baf789a78 100644
--- a/libs/uvl/luasrc/i18n/uvl.pt_br.lua
+++ b/libs/uvl/luasrc/i18n/uvl.pt-br.lua
diff --git a/libs/uvl/luasrc/i18n/uvl.pt_br.xml b/libs/uvl/luasrc/i18n/uvl.pt-br.xml
index a209fede6..a209fede6 100644
--- a/libs/uvl/luasrc/i18n/uvl.pt_br.xml
+++ b/libs/uvl/luasrc/i18n/uvl.pt-br.xml
diff --git a/libs/web/luasrc/i18n.lua b/libs/web/luasrc/i18n.lua
index 84a869539..4b3adf7eb 100644
--- a/libs/web/luasrc/i18n.lua
+++ b/libs/web/luasrc/i18n.lua
@@ -12,9 +12,9 @@ Copyright 2008 Steven Barth <steven@midlink.org>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
-You may obtain a copy of the License at 
+You may obtain a copy of the License at
 
-	http://www.apache.org/licenses/LICENSE-2.0 
+	http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -45,7 +45,7 @@ end
 -- @param force	Force reload even if already loaded (optional)
 -- @return		Success status
 function load(file, lang, force)
-	lang = lang or ""
+	lang = lang and lang:gsub("_", "-") or ""
 	if force or not loaded[lang] or not loaded[lang][file] then
 		local f = loadfile(i18ndir .. file .. "." .. lang .. ".lua")
 		if f then
@@ -75,7 +75,7 @@ end
 --- Set the context default translation language.
 -- @param lang	Two-letter language code
 function setlanguage(lang)
-	context.lang = lang
+	context.lang = lang:gsub("_", "-")
 end
 
 --- Return the translated value for a specific translation key.
@@ -95,4 +95,4 @@ end
 -- @return			Translated and formatted string
 function translatef(key, default, ...)
 	return translate(key, default):format(...)
-end
\ No newline at end of file
+end