From: Steven Barth Date: Sun, 13 Apr 2008 16:33:36 +0000 (+0000) Subject: * Fixed not unique i18n-file convention in ffluci.dispatcher X-Git-Tag: 0.8.0~1131 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0d6ea4806376a83cf61f53d48d197cdc385833c4;p=oweals%2Fluci.git * Fixed not unique i18n-file convention in ffluci.dispatcher --- diff --git a/core/src/ffluci/dispatcher.lua b/core/src/ffluci/dispatcher.lua index b60a9beef..dba1e7f43 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