From 2623e2880c69e5e19891ad06759dcbb8ad62f91b Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Sat, 31 May 2008 08:04:49 +0000 Subject: * Core translation part 1 * Introduced new default theme "OpenWRT.org" * Minor tweaks --- modules/admin-core/luasrc/controller/admin/index.lua | 12 ++++++++---- .../admin-core/luasrc/controller/admin/status.lua | 7 +++++-- .../admin-core/luasrc/controller/admin/system.lua | 19 +++++++++++-------- modules/admin-core/luasrc/i18n/admin_index.en | 20 -------------------- modules/admin-core/luasrc/view/about.htm | 12 ++++++------ modules/admin-core/luasrc/view/admin_index/index.htm | 16 ++++++++-------- .../admin-core/luasrc/view/admin_status/index.htm | 4 ++-- 7 files changed, 40 insertions(+), 50 deletions(-) delete mode 100644 modules/admin-core/luasrc/i18n/admin_index.en (limited to 'modules/admin-core/luasrc') diff --git a/modules/admin-core/luasrc/controller/admin/index.lua b/modules/admin-core/luasrc/controller/admin/index.lua index 7ce7f1bdc..51f60bd83 100644 --- a/modules/admin-core/luasrc/controller/admin/index.lua +++ b/modules/admin-core/luasrc/controller/admin/index.lua @@ -1,26 +1,30 @@ module("luci.controller.admin.index", package.seeall) function index() + luci.i18n.loadc("admin-core") + local i18n = luci.i18n.translate + local root = node() if not root.target then root.target = alias("admin") end - entry({"about"}, template("about")) + entry({"about"}, template("about")).i18n = "admin-core" local page = node("admin") page.target = alias("admin", "index") - page.title = "Administration" + page.title = i18n("administration", "Administration") page.order = 10 + page.i18n = "admin-core" local page = node("admin", "index") page.target = template("admin_index/index") - page.title = "Übersicht" + page.title = i18n("overview", "Übersicht") page.order = 10 local page = node("admin", "index", "luci") page.target = cbi("admin_index/luci") - page.title = "Oberfläche" + page.title = i18n("a_i_ui", "Oberfläche") end \ No newline at end of file diff --git a/modules/admin-core/luasrc/controller/admin/status.lua b/modules/admin-core/luasrc/controller/admin/status.lua index 79f728b99..223f54b29 100644 --- a/modules/admin-core/luasrc/controller/admin/status.lua +++ b/modules/admin-core/luasrc/controller/admin/status.lua @@ -1,8 +1,11 @@ module("luci.controller.admin.status", package.seeall) function index() - entry({"admin", "status"}, template("admin_status/index"), "Status", 20) - entry({"admin", "status", "syslog"}, call("action_syslog"), "Systemprotokoll") + luci.i18n.loadc("admin-core") + local i18n = luci.i18n.translate + + entry({"admin", "status"}, template("admin_status/index"), i18n("status", "Status"), 20) + entry({"admin", "status", "syslog"}, call("action_syslog"), i18n("syslog", "Systemprotokoll")) end function action_syslog() diff --git a/modules/admin-core/luasrc/controller/admin/system.lua b/modules/admin-core/luasrc/controller/admin/system.lua index a7c65872a..1bd52e943 100644 --- a/modules/admin-core/luasrc/controller/admin/system.lua +++ b/modules/admin-core/luasrc/controller/admin/system.lua @@ -8,14 +8,17 @@ require("luci.model.ipkg") require("luci.model.uci") function index() - entry({"admin", "system"}, template("admin_system/index"), "System", 30) - entry({"admin", "system", "packages"}, call("action_packages"), "Paketverwaltung", 10) - entry({"admin", "system", "packages", "ipkg"}, call("action_ipkg"), "IPKG-Konfiguration") - entry({"admin", "system", "passwd"}, call("action_passwd"), "Passwort ändern", 20) - entry({"admin", "system", "sshkeys"}, call("action_sshkeys"), "SSH-Schlüssel", 30) - entry({"admin", "system", "hostname"}, cbi("admin_system/hostname"), "Hostname", 40) - entry({"admin", "system", "fstab"}, cbi("admin_system/fstab"), "Einhängepunkte", 50) - entry({"admin", "system", "upgrade"}, call("action_upgrade"), "Firmwareupgrade", 60) + luci.i18n.loadc("admin-core") + local i18n = luci.i18n.translate + + entry({"admin", "system"}, template("admin_system/index"), i18n("system", "System"), 30) + entry({"admin", "system", "packages"}, call("action_packages"), i18n("a_s_packages", "Paketverwaltung"), 10) + entry({"admin", "system", "packages", "ipkg"}, call("action_ipkg"), i18n("a_s_ipkg", "IPKG-Konfiguration")) + entry({"admin", "system", "passwd"}, call("action_passwd"), i18n("a_s_changepw", "Passwort ändern"), 20) + entry({"admin", "system", "sshkeys"}, call("action_sshkeys"), i18n("a_s_sshkeys", "SSH-Schlüssel"), 30) + entry({"admin", "system", "hostname"}, cbi("admin_system/hostname"), i18n("hostname", "Hostname"), 40) + entry({"admin", "system", "fstab"}, cbi("admin_system/fstab"), i18n("a_s_fstab", "Einhängepunkte"), 50) + entry({"admin", "system", "upgrade"}, call("action_upgrade"), i18n("fwupgrade", "Firmwareupgrade"), 60) entry({"admin", "system", "reboot"}, call("action_reboot"), "Neu starten", 70) end diff --git a/modules/admin-core/luasrc/i18n/admin_index.en b/modules/admin-core/luasrc/i18n/admin_index.en deleted file mode 100644 index 0831b59f0..000000000 --- a/modules/admin-core/luasrc/i18n/admin_index.en +++ /dev/null @@ -1,20 +0,0 @@ -luci = "User Interface" - -hello = "Hello!" -admin1 = "This is the administration area of LuCI." -admin2 = "LuCI is a free, flexible, and user friendly graphical interface for configuring OpenWRT Kamikaze." -admin3 = "On the following pages you can adjust all important settings of your router." -admin4 = "You will find a navigation leading to the different configuration pages on the left side." -admin5 = [[As we are always want to improve this interface we are looking forward -to your feedback and suggestions.]] -admin6 = "And now have fun with your router!" -team = "The LuCI Team" - -luci1 = "Here you can customize the settings and the functionality of LuCI." -language = "Language" -general = "General" -ucicommit = "Post-commit actions" -ucicommit1 = [[These commands will be executed automatically when a given UCI configuration is committed allowing -changes to be applied instantly.]] -keepflash = "Files to be kept when flashing a new firmware" -keepflash1 = "When flashing a new firmware with LuCI these files will be added to the new firmware installation." \ No newline at end of file diff --git a/modules/admin-core/luasrc/view/about.htm b/modules/admin-core/luasrc/view/about.htm index 48a8674e0..c6dd1a101 100644 --- a/modules/admin-core/luasrc/view/about.htm +++ b/modules/admin-core/luasrc/view/about.htm @@ -1,25 +1,25 @@ <%+header%> -

<%:about Über%> Luci

-

<%:lucidesc Luci ist eine freie Lua-Bibliothek mit integriertem MVC-Webframework und Weboberfläche für eingebettete Geräte, +

<%:about Über%> LuCI

+

<%:c_lucidesc LuCI ist eine freie Lua-Bibliothek mit integriertem MVC-Webframework und Weboberfläche für eingebettete Geräte, speziell Netzwerkrouter unter OpenWRT. Luci steht unter der Apache-Lizenz.%>

-

<%:projecthome Projekt-Homepage%>: luci.freifunk-halle.net

+

<%:c_projecthome Projekt-Homepage%>: luci.freifunk-halle.net


-

<%:leaddev Leitende Entwicklung%>

+

<%:c_leaddev Leitende Entwicklung%>


-

<%:contributors Mitwirkende Entwickler%>

+

<%:c_contributors Mitwirkende Entwickler%>


-

<%:thanksto Dank an%>

+

<%:c_thanksto Dank an%>