From 1a511de0be0ebd21bd076c9d84074a7e3958b489 Mon Sep 17 00:00:00 2001 From: Manuel Munz Date: Thu, 8 Sep 2011 12:51:00 +0000 Subject: Fix i18n problems with freifunk module and meshwizard --- modules/freifunk/luasrc/model/cbi/freifunk/basics.lua | 2 +- modules/freifunk/luasrc/model/cbi/freifunk/profile.lua | 1 + modules/freifunk/luasrc/model/cbi/freifunk/profile_expert.lua | 1 + modules/freifunk/luasrc/model/cbi/freifunk/user_index.lua | 1 + modules/freifunk/luasrc/view/freifunk/adminindex.htm | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) (limited to 'modules/freifunk') diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/basics.lua b/modules/freifunk/luasrc/model/cbi/freifunk/basics.lua index 247e8816c..fa7cfecd1 100644 --- a/modules/freifunk/luasrc/model/cbi/freifunk/basics.lua +++ b/modules/freifunk/luasrc/model/cbi/freifunk/basics.lua @@ -15,7 +15,7 @@ local fs = require "luci.fs" local util = require "luci.util" local uci = require "luci.model.uci".cursor() local profiles = "/etc/config/profile_" - +luci.i18n.loadc("freifunk") m = Map("freifunk", translate ("Community")) c = m:section(NamedSection, "community", "public", nil, translate("These are the basic settings for your local wireless community. These settings define the default values for the wizard and DO NOT affect the actual configuration of the router.")) diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/profile.lua b/modules/freifunk/luasrc/model/cbi/freifunk/profile.lua index 5e5cc21da..fab7072ff 100644 --- a/modules/freifunk/luasrc/model/cbi/freifunk/profile.lua +++ b/modules/freifunk/luasrc/model/cbi/freifunk/profile.lua @@ -12,6 +12,7 @@ You may obtain a copy of the License at local uci = require "luci.model.uci".cursor() local community = uci:get("freifunk", "community", "name") +luci.i18n.loadc("freifunk") if community == nil then luci.http.redirect(luci.dispatcher.build_url("admin", "freifunk", "profile_error")) diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/profile_expert.lua b/modules/freifunk/luasrc/model/cbi/freifunk/profile_expert.lua index a0b8f34bc..b08c0f024 100644 --- a/modules/freifunk/luasrc/model/cbi/freifunk/profile_expert.lua +++ b/modules/freifunk/luasrc/model/cbi/freifunk/profile_expert.lua @@ -13,6 +13,7 @@ You may obtain a copy of the License at local fs = require "nixio.fs" local uci = require "luci.model.uci".cursor() local community = uci:get("freifunk", "community", "name") +luci.i18n.loadc("freifunk") if community == nil then luci.http.redirect(luci.dispatcher.build_url("admin", "freifunk", "profile_error")) diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/user_index.lua b/modules/freifunk/luasrc/model/cbi/freifunk/user_index.lua index fe1d8fe7e..e23ea901a 100644 --- a/modules/freifunk/luasrc/model/cbi/freifunk/user_index.lua +++ b/modules/freifunk/luasrc/model/cbi/freifunk/user_index.lua @@ -1,5 +1,6 @@ local fs = require "nixio.fs" local file = "/www/luci-static/index_user.html" +luci.i18n.loadc("freifunk") m = Map("freifunk", translate("Edit index page"), translate("You can display additional content on the public index page by inserting valid XHTML in the form below.
Headlines should be enclosed between <h2> and </h2>.")) diff --git a/modules/freifunk/luasrc/view/freifunk/adminindex.htm b/modules/freifunk/luasrc/view/freifunk/adminindex.htm index 58655cca6..4eed2aa95 100644 --- a/modules/freifunk/luasrc/view/freifunk/adminindex.htm +++ b/modules/freifunk/luasrc/view/freifunk/adminindex.htm @@ -8,6 +8,7 @@ local latitude = uci:get_first ("system", "system", "latitude") local longitude = uci:get_first ("system", "system", "longitude") local location = uci:get_first ("system", "system", "location") local basicsurl = luci.dispatcher.build_url(luci.dispatcher.context.path[1], "freifunk", "basics") +luci.i18n.loadc("freifunk") %>

<%:Freifunk Overview%>

-- cgit v1.2.3