* luci/i18n: rename *.pt_br.* to *.pt-br.*, extend luci.i18n to convert "_" to "...
authorJo-Philipp Wich <redacted>
Sun, 5 Oct 2008 16:08:33 +0000 (16:08 +0000)
committerJo-Philipp Wich <redacted>
Sun, 5 Oct 2008 16:08:33 +0000 (16:08 +0000)
41 files changed:
applications/luci-ddns/luasrc/i18n/ddns.pt-br.lua [moved from applications/luci-ddns/luasrc/i18n/ddns.pt_br.lua with 100% similarity]
applications/luci-ddns/luasrc/i18n/ddns.pt-br.xml [moved from applications/luci-ddns/luasrc/i18n/ddns.pt_br.xml with 100% similarity]
applications/luci-fw/luasrc/i18n/luci-fw.pt-br.lua [moved from applications/luci-fw/luasrc/i18n/luci-fw.pt_br.lua with 100% similarity]
applications/luci-fw/luasrc/i18n/luci-fw.pt-br.xml [moved from applications/luci-fw/luasrc/i18n/luci-fw.pt_br.xml with 100% similarity]
applications/luci-hd_idle/luasrc/i18n/hd_idle.pt-br.lua [moved from applications/luci-hd_idle/luasrc/i18n/hd_idle.pt_br.lua with 100% similarity]
applications/luci-hd_idle/luasrc/i18n/hd_idle.pt-br.xml [moved from applications/luci-hd_idle/luasrc/i18n/hd_idle.pt_br.xml with 100% similarity]
applications/luci-initmgr/luasrc/i18n/initmgr.pt-br.lua [moved from applications/luci-initmgr/luasrc/i18n/initmgr.pt_br.lua with 100% similarity]
applications/luci-initmgr/luasrc/i18n/initmgr.pt-br.xml [moved from applications/luci-initmgr/luasrc/i18n/initmgr.pt_br.xml with 100% similarity]
applications/luci-ntpc/luasrc/i18n/ntpc.pt-br.lua [moved from applications/luci-ntpc/luasrc/i18n/ntpc.pt_br.lua with 100% similarity]
applications/luci-ntpc/luasrc/i18n/ntpc.pt-br.xml [moved from applications/luci-ntpc/luasrc/i18n/ntpc.pt_br.xml with 100% similarity]
applications/luci-p910nd/luasrc/i18n/p910nd.pt-br.lua [moved from applications/luci-p910nd/luasrc/i18n/p910nd.pt_br.lua with 100% similarity]
applications/luci-p910nd/luasrc/i18n/p910nd.pt-br.xml [moved from applications/luci-p910nd/luasrc/i18n/p910nd.pt_br.xml with 100% similarity]
applications/luci-qos/luasrc/i18n/qos.pt-br.lua [moved from applications/luci-qos/luasrc/i18n/qos.pt_br.lua with 100% similarity]
applications/luci-qos/luasrc/i18n/qos.pt-br.xml [moved from applications/luci-qos/luasrc/i18n/qos.pt_br.xml with 100% similarity]
applications/luci-samba/luasrc/i18n/samba.pt-br.lua [moved from applications/luci-samba/luasrc/i18n/samba.pt_br.lua with 100% similarity]
applications/luci-samba/luasrc/i18n/samba.pt-br.xml [moved from applications/luci-samba/luasrc/i18n/samba.pt_br.xml with 100% similarity]
applications/luci-statistics/luasrc/i18n/rrdtool.pt-br.lua [moved from applications/luci-statistics/luasrc/i18n/rrdtool.pt_br.lua with 100% similarity]
applications/luci-statistics/luasrc/i18n/rrdtool.pt-br.xml.hide [moved from applications/luci-statistics/luasrc/i18n/rrdtool.pt_br.xml.hide with 100% similarity]
applications/luci-statistics/luasrc/i18n/statistics.pt-br.lua [moved from applications/luci-statistics/luasrc/i18n/statistics.pt_br.lua with 100% similarity]
applications/luci-statistics/luasrc/i18n/statistics.pt-br.xml [moved from applications/luci-statistics/luasrc/i18n/statistics.pt_br.xml with 100% similarity]
applications/luci-tinyproxy/luasrc/i18n/tinyproxy.pt-br.lua [moved from applications/luci-tinyproxy/luasrc/i18n/tinyproxy.pt_br.lua with 100% similarity]
applications/luci-tinyproxy/luasrc/i18n/tinyproxy.pt-br.xml [moved from applications/luci-tinyproxy/luasrc/i18n/tinyproxy.pt_br.xml with 100% similarity]
applications/luci-upnp/luasrc/i18n/upnp.pt-br.lua [moved from applications/luci-upnp/luasrc/i18n/upnp.pt_br.lua with 100% similarity]
applications/luci-upnp/luasrc/i18n/upnp.pt-br.xml [moved from applications/luci-upnp/luasrc/i18n/upnp.pt_br.xml with 100% similarity]
applications/luci-ushare/luasrc/i18n/ushare.pt-br.lua [moved from applications/luci-ushare/luasrc/i18n/ushare.pt_br.lua with 100% similarity]
applications/luci-ushare/luasrc/i18n/ushare.pt-br.xml [moved from applications/luci-ushare/luasrc/i18n/ushare.pt_br.xml with 100% similarity]
applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt-br.lua [moved from applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt_br.lua with 100% similarity]
applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt-br.xml [moved from applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.pt_br.xml with 100% similarity]
i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua [moved from i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt_br.lua with 100% similarity]
i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml [moved from i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt_br.xml with 100% similarity]
i18n/portuguese_brazilian/luasrc/i18n/cbi.pt-br.lua [moved from i18n/portuguese_brazilian/luasrc/i18n/cbi.pt_br.lua with 100% similarity]
i18n/portuguese_brazilian/luasrc/i18n/cbi.pt-br.xml [moved from i18n/portuguese_brazilian/luasrc/i18n/cbi.pt_br.xml with 100% similarity]
i18n/portuguese_brazilian/luasrc/i18n/default.pt-br.lua [moved from i18n/portuguese_brazilian/luasrc/i18n/default.pt_br.lua with 100% similarity]
i18n/portuguese_brazilian/luasrc/i18n/default.pt-br.xml [moved from i18n/portuguese_brazilian/luasrc/i18n/default.pt_br.xml with 100% similarity]
i18n/portuguese_brazilian/luasrc/i18n/sysauth.pt-br.lua [moved from i18n/portuguese_brazilian/luasrc/i18n/sysauth.pt_br.lua with 100% similarity]
i18n/portuguese_brazilian/luasrc/i18n/sysauth.pt-br.xml [moved from i18n/portuguese_brazilian/luasrc/i18n/sysauth.pt_br.xml with 100% similarity]
i18n/portuguese_brazilian/luasrc/i18n/wifi.pt-br.lua [moved from i18n/portuguese_brazilian/luasrc/i18n/wifi.pt_br.lua with 100% similarity]
i18n/portuguese_brazilian/luasrc/i18n/wifi.pt-br.xml [moved from i18n/portuguese_brazilian/luasrc/i18n/wifi.pt_br.xml with 100% similarity]
libs/uvl/luasrc/i18n/uvl.pt-br.lua [moved from libs/uvl/luasrc/i18n/uvl.pt_br.lua with 100% similarity]
libs/uvl/luasrc/i18n/uvl.pt-br.xml [moved from libs/uvl/luasrc/i18n/uvl.pt_br.xml with 100% similarity]
libs/web/luasrc/i18n.lua

index 84a869539715096a55007bf9e90ee0ebab1c8090..4b3adf7ebb635418be484ec6275d6dc457101dfc 100644 (file)
@@ -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
git clone https://git.99rst.org/PROJECT