diff options
| author | Steven Barth <steven@midlink.org> | 2008-04-13 16:33:36 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-04-13 16:33:36 +0000 |
| commit | 0d6ea4806376a83cf61f53d48d197cdc385833c4 (patch) | |
| tree | d17f1252ec703727845d863205f228643900aeb1 | |
| parent | e2dc4be8717d70e587d938a14b2f0da461b685eb (diff) | |
* Fixed not unique i18n-file convention in ffluci.dispatcher
| -rw-r--r-- | core/src/ffluci/dispatcher.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/src/ffluci/dispatcher.lua b/core/src/ffluci/dispatcher.lua index b60a9beefa..dba1e7f433 100644 --- a/core/src/ffluci/dispatcher.lua +++ b/core/src/ffluci/dispatcher.lua @@ -163,7 +163,7 @@ function action(request) local i18n = require("ffluci.i18n") local disp = require("ffluci.dispatcher") - i18n.loadc(request.module) + i18n.loadc(request.category .. "_" .. request.module) local action = getfenv()["action_" .. request.action:gsub("-", "_")] if action then action() @@ -182,7 +182,7 @@ function cbi(request) local path = request.category.."_"..request.module.."/"..request.action - i18n.loadc(request.module) + i18n.loadc(request.category .. "_" .. request.module) local stat, map = pcall(cbi.load, path) if stat and map then @@ -209,7 +209,7 @@ function dynamic(request) local tmpl = require("ffluci.template") local cbi = require("ffluci.cbi") - i18n.loadc(request.module) + i18n.loadc(request.category .. "_" .. request.module) local action = getfenv()["action_" .. request.action:gsub("-", "_")] if action then @@ -250,7 +250,7 @@ function simpleview(request) local path = request.category.."_"..request.module.."/"..request.action - i18n.loadc(request.module) + i18n.loadc(request.category .. "_" .. request.module) if not pcall(tmpl.render, path) then disp.error404() end |