From dc5dfb5da06e3acb622a4471eb99d803fb09e664 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Sat, 5 Jul 2008 10:31:58 +0000 Subject: [PATCH] * modules/admin-core: Add translation for UCI changes, revert and apply page title --- modules/admin-core/luasrc/controller/admin/uci.lua | 9 ++++++--- themes/fledermaus/luasrc/view/themes/fledermaus/header.htm | 6 ++++-- themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm | 6 ++++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/modules/admin-core/luasrc/controller/admin/uci.lua b/modules/admin-core/luasrc/controller/admin/uci.lua index b69fef4cd..215a13a34 100644 --- a/modules/admin-core/luasrc/controller/admin/uci.lua +++ b/modules/admin-core/luasrc/controller/admin/uci.lua @@ -14,9 +14,12 @@ $Id$ module("luci.controller.admin.uci", package.seeall) function index() - node("admin", "uci", "changes").target = call("action_changes") - node("admin", "uci", "revert").target = call("action_revert") - node("admin", "uci", "apply").target = call("action_apply") + local i18n = luci.i18n.translate + + entry({"admin", "uci"}, nil, i18n("config")) + entry({"admin", "uci", "changes"}, call("action_changes"), i18n("changes")) + entry({"admin", "uci", "revert"}, call("action_revert"), i18n("revert")) + entry({"admin", "uci", "apply"}, call("action_apply"), i18n("apply")) end function convert_changes(changes) diff --git a/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm b/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm index f1343a0e1..6fd96919f 100644 --- a/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm +++ b/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm @@ -66,7 +66,9 @@ local function submenu(prefix, node) end local index = {} for k, n in pairs(node.nodes) do - table.insert(index, {name=k, order=n.order or 100}) + if n.title and n.target then + table.insert(index, {name=k, order=n.order or 100}) + end end table.sort(index, function(a, b) return a.order < b.order end) @@ -96,7 +98,7 @@ if cattree and cattree.nodes then for i, k in ipairs(index) do node = cattree.nodes[k.name] - if node.title then + if node.title and node.target then local href = controller.."/"..category.."/"..k.name href = (k.query) and href .. luci.http.build_querystring(k.query) or href %> class="yellowtext"<%end%>><%=node.title%> diff --git a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm index 2501051a7..49d282c1f 100644 --- a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm +++ b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm @@ -66,7 +66,9 @@ local function submenu(prefix, node) end local index = {} for k, n in pairs(node.nodes) do - table.insert(index, {name=k, order=n.order or 100}) + if n.title and n.target then + table.insert(index, {name=k, order=n.order or 100}) + end end table.sort(index, function(a, b) return a.order < b.order end) @@ -96,7 +98,7 @@ if cattree and cattree.nodes then for i, k in ipairs(index) do node = cattree.nodes[k.name] - if node.title then + if node.title and node.target then local href = controller.."/"..category.."/"..k.name href = (k.query) and href .. luci.http.build_querystring(k.query) or href %> class="blacktext"<%end%>><%=node.title%> -- 2.11.0