summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-08-12 12:33:35 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-08-12 12:33:35 +0000
commit6151812920880233d953dd840e4f0bee59321ae7 (patch)
treee46bb9f08c55cac8fd510661c53be9f4cc078882
parentc1d69d0146f05c41a9ab0e8951947e57b3b77174 (diff)
themes: filter menu entry title through translate()
-rw-r--r--themes/fledermaus/luasrc/view/themes/fledermaus/header.htm10
-rw-r--r--themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm10
-rw-r--r--themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm8
-rw-r--r--themes/freifunk-hannover/luasrc/view/themes/freifunk-hannover/header.htm8
-rw-r--r--themes/freifunk/luasrc/view/themes/freifunk/header.htm10
-rw-r--r--themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/header.htm8
-rw-r--r--themes/openwrt/luasrc/view/themes/openwrt.org/header.htm6
-rw-r--r--themes/oxygen/luasrc/view/themes/oxygen/header.htm6
8 files changed, 33 insertions, 33 deletions
diff --git a/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm b/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm
index cd48bd7222..856080d71c 100644
--- a/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm
+++ b/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm
@@ -44,7 +44,7 @@ require("luci.http").prepare_content("text/html")
<meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
<meta http-equiv="content-script-type" content="text/javascript" />
<script type="text/javascript" src="<%=resource%>/xhr.js"></script>
- <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title>
+ <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
<!--[if lt IE 7]>
<script type="text/javascript">
@@ -85,7 +85,7 @@ for k,v in pairs(request) do
if c.nodes and c.nodes[v] then
c = c.nodes[v]
url = url .. "/" .. v
- %><a href="<%=url%>"><%=pcdata(striptags(c.title or v))%></a> <% if k ~= #request then %>&#187; <% end
+ %><a href="<%=url%>"><%=pcdata(striptags(translate(c.title) or v))%></a> <% if k ~= #request then %>&#187; <% end
end
end
%>
@@ -119,7 +119,7 @@ local function submenu(prefix, node)
href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href
%>
<li>
- <span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(striptags(nnode.title))%></a></span>
+ <span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(striptags(translate(nnode.title)))%></a></span>
<%- submenu(prefix .. v.name .. "/", nnode) %>
</li>
<%- end %>
@@ -142,7 +142,7 @@ if cattree and cattree.nodes then
if not node.hidden and 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 %>
- <div<% if node._menu_selected then %> class="preactive"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(striptags(node.title))%></a>
+ <div<% if node._menu_selected then %> class="preactive"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(striptags(translate(node.title)))%></a>
<%submenu("/" .. category .. "/" .. k.name .. "/", node)%>
</div>
<% end
@@ -154,7 +154,7 @@ end
<ul><%
for k,node in pairs(tree.nodes) do
if node.title and not node.hidden then %>
- <li<% if request[1] == k then %> class="active"<%end%>><a href="<%=controller%>/<%=k%>"><%=pcdata(striptags(node.title))%></a></li>
+ <li<% if request[1] == k then %> class="active"<%end%>><a href="<%=controller%>/<%=k%>"><%=pcdata(striptags(translate(node.title)))%></a></li>
<% end
end%>
</ul>
diff --git a/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm b/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
index 660d95ac86..7313fff550 100644
--- a/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
+++ b/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
@@ -45,7 +45,7 @@ require("luci.http").prepare_content("text/html")
<meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
<meta http-equiv="content-script-type" content="text/javascript" />
<script type="text/javascript" src="<%=resource%>/xhr.js"></script>
- <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title>
+ <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
<!--[if lt IE 7]>
<script type="text/javascript">
@@ -99,7 +99,7 @@ for k,v in pairs(request) do
if c.nodes and c.nodes[v] then
c = c.nodes[v]
url = url .. "/" .. v
- %><a href="<%=url%>"><%=pcdata(striptags(c.title or v))%></a> <% if k ~= #request then %>&#187; <% end
+ %><a href="<%=url%>"><%=pcdata(striptags(translate(c.title) or v))%></a> <% if k ~= #request then %>&#187; <% end
end
end
%>
@@ -133,7 +133,7 @@ local function submenu(prefix, node)
href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href
%>
<li>
- <span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(striptags(nnode.title))%></a></span>
+ <span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(striptags(translate(nnode.title)))%></a></span>
<%- submenu(prefix .. v.name .. "/", nnode) %>
</li>
<%- end %>
@@ -156,7 +156,7 @@ if cattree and cattree.nodes then
if not node.hidden and 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 %>
- <div<% if node._menu_selected then %> class="preactive"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(striptags(node.title))%></a>
+ <div<% if node._menu_selected then %> class="preactive"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(striptags(translate(node.title)))%></a>
<%submenu("/" .. category .. "/" .. k.name .. "/", node)%>
</div>
<% end
@@ -168,7 +168,7 @@ end
<ul><%
for k,node in pairs(tree.nodes) do
if node.title and not node.hidden then %>
- <li<% if request[1] == k then %> class="active"<%end%>><a href="<%=controller%>/<%=k%>"><%=pcdata(striptags(node.title))%></a></li>
+ <li<% if request[1] == k then %> class="active"<%end%>><a href="<%=controller%>/<%=k%>"><%=pcdata(striptags(translate(node.title)))%></a></li>
<% end
end%>
</ul>
diff --git a/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm b/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
index 412b7e0cf6..513471da50 100644
--- a/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
+++ b/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
@@ -75,7 +75,7 @@ require("luci.http").prepare_content("application/xhtml+xml")
<% end -%>
<script type="text/javascript" src="<%=resource%>/xhr.js"></script>
-<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title>
+<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
</head>
<body class="lang_<%=luci.i18n.context.lang%>">
@@ -151,7 +151,7 @@ local function submenu(prefix, node)
local href = controller .. prefix .. v.name .. "/"
href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href
%>
-<li><a<% if nnode._menu_selected then %> class="active"<%end%> href="<%=luci.util.pcdata(href)%>"><%=nnode.title%></a><%-
+<li><a<% if nnode._menu_selected then %> class="active"<%end%> href="<%=luci.util.pcdata(href)%>"><%=translate(nnode.title)%></a><%-
submenu(prefix .. v.name .. "/", nnode)
%></li>
<%-
@@ -177,7 +177,7 @@ if cattree and cattree.nodes then
local href = controller.."/"..category.."/"..k.name.."/"
href = (k.query) and href .. luci.http.build_querystring(k.query) or href
%>
-<li><a<% if node._menu_selected then %> class="preactive"<%end%> href="<%=href%>"><%=node.title%></a><%
+<li><a<% if node._menu_selected then %> class="preactive"<%end%> href="<%=href%>"><%=translate(node.title)%></a><%
submenu("/" .. category .. "/" .. k.name .. "/", node)
%></li><% end
end
@@ -188,7 +188,7 @@ end
<ul id="modemenu"><%
for k,node in pairs(tree.nodes) do
if node.title and not node.hidden then %>
-<li><a<% if request[1] == k then %> class="active"<%end%> href="<%=controller%>/<%=k%>/"><%=node.title%></a></li><%
+<li><a<% if request[1] == k then %> class="active"<%end%> href="<%=controller%>/<%=k%>/"><%=translate(node.title)%></a></li><%
end
end
%>
diff --git a/themes/freifunk-hannover/luasrc/view/themes/freifunk-hannover/header.htm b/themes/freifunk-hannover/luasrc/view/themes/freifunk-hannover/header.htm
index d594a6535d..5b99d358c6 100644
--- a/themes/freifunk-hannover/luasrc/view/themes/freifunk-hannover/header.htm
+++ b/themes/freifunk-hannover/luasrc/view/themes/freifunk-hannover/header.htm
@@ -51,7 +51,7 @@ require("luci.http").prepare_content("application/xhtml+xml")
<script type="text/javascript" src="<%=resource%>/Dropdowns.js"></script>
<script type="text/javascript" src="<%=resource%>/xhr.js"></script>
-<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title>
+<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
</head>
<body class="lang_<%=luci.i18n.context.lang%>">
@@ -106,7 +106,7 @@ local function submenu(prefix, node)
local href = controller .. prefix .. v.name .. "/"
href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href
%>
-<li><a<% if nnode._menu_selected then %> class="active"<%end%> href="<%=pcdata(href)%>"><%=pcdata(striptags(nnode.title))%></a><%-
+<li><a<% if nnode._menu_selected then %> class="active"<%end%> href="<%=pcdata(href)%>"><%=pcdata(striptags(translate(nnode.title)))%></a><%-
submenu(prefix .. v.name .. "/", nnode)
%></li>
<%-
@@ -132,7 +132,7 @@ if cattree and cattree.nodes then
local href = controller.."/"..category.."/"..k.name.."/"
href = (k.query) and href .. luci.http.build_querystring(k.query) or href
%>
-<li><a<% if node._menu_selected then %> class="preactive"<%end%> href="<%=pcdata(href)%>"><%=pcdata(node.title)%></a><%
+<li><a<% if node._menu_selected then %> class="preactive"<%end%> href="<%=pcdata(href)%>"><%=pcdata(translate(node.title))%></a><%
submenu("/" .. category .. "/" .. k.name .. "/", node)
%></li><% end
end
@@ -143,7 +143,7 @@ end
<ul id="modemenu"><%
for k,node in pairs(tree.nodes) do
if node.title and not node.hidden then %>
-<li><a<% if request[1] == k then %> class="active"<%end%> href="<%=controller%>/<%=k%>/"><%=pcdata(node.title)%></a></li><%
+<li><a<% if request[1] == k then %> class="active"<%end%> href="<%=controller%>/<%=k%>/"><%=pcdata(translate(node.title))%></a></li><%
end
end
%>
diff --git a/themes/freifunk/luasrc/view/themes/freifunk/header.htm b/themes/freifunk/luasrc/view/themes/freifunk/header.htm
index 845c4af83b..023e86a1ed 100644
--- a/themes/freifunk/luasrc/view/themes/freifunk/header.htm
+++ b/themes/freifunk/luasrc/view/themes/freifunk/header.htm
@@ -43,7 +43,7 @@ require("luci.http").prepare_content("text/html")
<meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
<meta http-equiv="content-script-type" content="text/javascript" />
<script type="text/javascript" src="<%=resource%>/xhr.js"></script>
- <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title>
+ <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
<!--[if lt IE 7]>
<script type="text/javascript">
@@ -97,7 +97,7 @@ for k,v in pairs(request) do
if c.nodes and c.nodes[v] then
c = c.nodes[v]
url = url .. "/" .. v
- %><a href="<%=url%>"><%=pcdata(striptags(c.title or v))%></a> <% if k ~= #request then %>&#187; <% end
+ %><a href="<%=url%>"><%=pcdata(striptags(translate(c.title) or v))%></a> <% if k ~= #request then %>&#187; <% end
end
end
%>
@@ -131,7 +131,7 @@ local function submenu(prefix, node)
href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href
%>
<li>
- <span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(striptags(nnode.title))%></a></span>
+ <span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(striptags(translate(nnode.title)))%></a></span>
<%- submenu(prefix .. v.name .. "/", nnode) %>
</li>
<%- end %>
@@ -154,7 +154,7 @@ if cattree and cattree.nodes then
if not node.hidden and 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 %>
- <div<% if node._menu_selected then %> class="preactive"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(striptags(node.title))%></a>
+ <div<% if node._menu_selected then %> class="preactive"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(striptags(translate(node.title)))%></a>
<%submenu("/" .. category .. "/" .. k.name .. "/", node)%>
</div>
<% end
@@ -166,7 +166,7 @@ end
<ul><%
for k,node in pairs(tree.nodes) do
if node.title and not node.hidden then %>
- <li<% if request[1] == k then %> class="active"<%end%>><a href="<%=controller%>/<%=k%>"><%=pcdata(node.title)%></a></li>
+ <li<% if request[1] == k then %> class="active"<%end%>><a href="<%=controller%>/<%=k%>"><%=pcdata(translate(node.title))%></a></li>
<% end
end%>
</ul>
diff --git a/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/header.htm b/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/header.htm
index a3f89cd4f5..c73b5816e4 100644
--- a/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/header.htm
+++ b/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/header.htm
@@ -51,7 +51,7 @@ require("luci.http").prepare_content("application/xhtml+xml")
<script type="text/javascript" src="<%=resource%>/VarType.js"></script>
<script type="text/javascript" src="<%=resource%>/XHTML1.js"></script>
<script type="text/javascript" src="<%=resource%>/Dropdowns.js"></script>
-<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title>
+<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
</head>
<body class="lang_<%=luci.i18n.context.lang%>">
@@ -98,7 +98,7 @@ local function submenu(prefix, node)
local href = controller .. prefix .. v.name .. "/"
href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href
%>
-<li><a<% if nnode._menu_selected then %> class="active"<%end%> href="<%=pcdata(href)%>"><%=pcdata(striptags(nnode.title))%></a><%-
+<li><a<% if nnode._menu_selected then %> class="active"<%end%> href="<%=pcdata(href)%>"><%=pcdata(striptags(translate(nnode.title)))%></a><%-
submenu(prefix .. v.name .. "/", nnode)
%></li>
<%-
@@ -124,7 +124,7 @@ if cattree and cattree.nodes then
local href = controller.."/"..category.."/"..k.name.."/"
href = (k.query) and href .. luci.http.build_querystring(k.query) or href
%>
-<li><a<% if node._menu_selected then %> class="preactive"<%end%> href="<%=pcdata(href)%>"><%=pcdata(striptags(node.title))%></a><%
+<li><a<% if node._menu_selected then %> class="preactive"<%end%> href="<%=pcdata(href)%>"><%=pcdata(striptags(translate(node.title)))%></a><%
submenu("/" .. category .. "/" .. k.name .. "/", node)
%></li><% end
end
@@ -135,7 +135,7 @@ end
<ul id="modemenu"><%
for k,node in pairs(tree.nodes) do
if node.title and not node.hidden then %>
-<li><a<% if request[1] == k then %> class="active"<%end%> href="<%=controller%>/<%=k%>/"><%=pcdata(striptags(node.title))%></a></li><%
+<li><a<% if request[1] == k then %> class="active"<%end%> href="<%=controller%>/<%=k%>/"><%=pcdata(striptags(translate(node.title)))%></a></li><%
end
end
%>
diff --git a/themes/openwrt/luasrc/view/themes/openwrt.org/header.htm b/themes/openwrt/luasrc/view/themes/openwrt.org/header.htm
index 6eea8af20b..33a0de976c 100644
--- a/themes/openwrt/luasrc/view/themes/openwrt.org/header.htm
+++ b/themes/openwrt/luasrc/view/themes/openwrt.org/header.htm
@@ -82,7 +82,7 @@ require("luci.http").prepare_content("application/xhtml+xml")
end
%>
<li class="tabmenu-item-<%=v.name%><% if nnode._menu_selected or (node.leaf and v.name == leaf) then %> active<% end %>">
- <a href="<%=nodeurl(prefix, v.name, nnode.query)%>"><%=striptags(nnode.title)%></a>
+ <a href="<%=nodeurl(prefix, v.name, nnode.query)%>"><%=striptags(translate(nnode.title))%></a>
</li>
<%
end
@@ -116,7 +116,7 @@ require("luci.http").prepare_content("application/xhtml+xml")
<% if node and node.css then %><link rel="stylesheet" type="text/css" media="screen" href="<%=resource%>/<%=node.css%>" />
<% end -%>
<script type="text/javascript" src="<%=resource%>/xhr.js"></script>
-<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title>
+<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
</head>
<body class="lang_<%=luci.i18n.context.lang%>">
@@ -136,7 +136,7 @@ require("luci.http").prepare_content("application/xhtml+xml")
<ul id="modemenu"><%
for k,node in pairs(tree.nodes) do
if node.title and not node.hidden then %>
-<li><a<% if request[1] == k then %> class="active"<%end%> href="<%=controller%>/<%=k%>/"><%=striptags(node.title)%></a></li><%
+<li><a<% if request[1] == k then %> class="active"<%end%> href="<%=controller%>/<%=k%>/"><%=striptags(translate(node.title))%></a></li><%
end
end
%>
diff --git a/themes/oxygen/luasrc/view/themes/oxygen/header.htm b/themes/oxygen/luasrc/view/themes/oxygen/header.htm
index 86ba77596c..56bb522606 100644
--- a/themes/oxygen/luasrc/view/themes/oxygen/header.htm
+++ b/themes/oxygen/luasrc/view/themes/oxygen/header.htm
@@ -44,7 +44,7 @@ require("luci.http").prepare_content("application/xhtml+xml")
<link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/dashboard.css" />
<% if node and node.css then %><link rel="stylesheet" type="text/css" media="screen" href="<%=resource%>/<%=node.css%>" />
<% end -%>
-<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title>
+<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
</head>
<body class="lang_<%=luci.i18n.context.lang%>">
<div id="screen">
@@ -77,7 +77,7 @@ local function ucimenu(prefix, node)
local href = controller .. prefix .. v.name .. "/"
href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href
%>
-<span><a class="menulink<% if nnode._menu_selected then %> active<%end%>" href="<%=pcdata(href)%>"> &gt; <%=pcdata(striptags(nnode.title))%></a></span>
+<span><a class="menulink<% if nnode._menu_selected then %> active<%end%>" href="<%=pcdata(href)%>"> &gt; <%=pcdata(striptags(translate(nnode.title)))%></a></span>
<%-
end
end
@@ -119,7 +119,7 @@ ucimenu("/" .. category .. "/uci/", tree.nodes[category].nodes["uci"], "changes"
if pointer.nodes and pointer.nodes[v] then
pointer = pointer.nodes[v]
%>
- &#187; <a href="<%=luci.dispatcher.build_url(unpack(crequest, 1, k))%>"><%=pcdata(striptags(pointer.title or v))%></a>
+ &#187; <a href="<%=luci.dispatcher.build_url(unpack(crequest, 1, k))%>"><%=pcdata(striptags(translate(pointer.title) or v))%></a>
<%
end
end