Rewrote state based redirection

[project/luci.git] / libs / web / luasrc / i18n.lua

diff --git a/libs/web/luasrc/i18n.lua b/libs/web/luasrc/i18n.lua
index 5464299..4b3adf7 100644 (file)
--- 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.
 
 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,
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,


@@ -24,26 +24,36 @@ limitations under the License.
 
 ]]--
 
 
 ]]--
 

+--- LuCI translation library.

 module("luci.i18n", package.seeall)
 module("luci.i18n", package.seeall)

-require("luci.sys")
+require("luci.util")

 
 table   = {}
 
 table   = {}

-i18ndir = luci.sys.libpath() .. "/i18n/"
+i18ndir = luci.util.libpath() .. "/i18n/"

 loaded  = {}
 loaded  = {}

+context = luci.util.threadlocal()
+default = "en"

 
 

--- Clears the translation table
+--- Clear the translation table.

 function clear()
        table = {}
 end
 
 function clear()
        table = {}
 end
 

--- Loads a translation and copies its data into the global translation table
-function load(file, force)
-       if force or not loaded[file] then
-               local f = loadfile(i18ndir..file..".lua") or loadfile(i18ndir..file)
+--- Load a translation and copy its data into the translation table.
+-- @param file Language file
+-- @param lang Two-letter language code
+-- @param force        Force reload even if already loaded (optional)
+-- @return             Success status
+function load(file, lang, force)
+       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
                if f then

-                       setfenv(f, table)
+                       table[lang] = table[lang] or {}
+                       setfenv(f, table[lang])

                        f()
                        f()

-                       loaded[file] = true
+                       loaded[lang] = loaded[lang] or {}
+                       loaded[lang][file] = true

                        return true
                else
                        return false
                        return true
                else
                        return false


@@ -53,17 +63,36 @@ function load(file, force)
        end
 end
 
        end
 end
 

--- Same as load but autocompletes the filename with .LANG from config.lang
+--- Load a translation file using the default translation language.
+-- Alternatively load the translation of the fallback language.
+-- @param file Language file
+-- @param force        Force reload even if already loaded (optional)

 function loadc(file, force)
 function loadc(file, force)

-       return load(file .. "." .. require("luci.config").main.lang, force)
+       load(file, default, force)
+       return load(file, context.lang, force)

 end
 
 end
 

--- Returns the i18n-value defined by "key" or if there is no such: "default"
-function translate(key, default)
-       return table[key] or default
+--- Set the context default translation language.
+-- @param lang Two-letter language code
+function setlanguage(lang)
+       context.lang = lang:gsub("_", "-")

 end
 
 end
 

--- Translate shourtcut with sprintf/string.format inclusion
+--- Return the translated value for a specific translation key.
+-- @param key  Translation key
+-- @param def  Default translation
+-- @return             Translated string
+function translate(key, def)
+       return (table[context.lang] and table[context.lang][key])
+               or (table[default] and table[default][key])
+               or def
+end
+
+--- Return the translated value for a specific translation key and use it as sprintf pattern.
+-- @param key          Translation key
+-- @param default      Default translation
+-- @param ...          Format parameters
+-- @return                     Translated and formatted string

 function translatef(key, default, ...)
        return translate(key, default):format(...)
 function translatef(key, default, ...)
        return translate(key, default):format(...)

-end
\ No newline at end of file
+end