[Commits] r641 - in trunk/webinterface/core: . locale/de_DE/LC_MESSAGES
new-commit at lists.openvcp.org
new-commit at lists.openvcp.org
Tue Dec 30 00:26:49 UTC 2008
Author: ftx
Date: 2008-12-30 00:26:49 +0000 (Tue, 30 Dec 2008)
New Revision: 641
Added:
trunk/webinterface/core/locale/de_DE/LC_MESSAGES/super_customers_navi.po
trunk/webinterface/core/locale/de_DE/LC_MESSAGES/super_navi.po
trunk/webinterface/core/locale/de_DE/LC_MESSAGES/super_settings_navi.po
Modified:
trunk/webinterface/core/OpenVCP.php
trunk/webinterface/core/Vserver.class.php
trunk/webinterface/core/locale/de_DE/LC_MESSAGES/super_nodes_navi.po
trunk/webinterface/core/locale/de_DE/LC_MESSAGES/super_vservers_navi.po
trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_control_main.po
trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_firewall_main.po
trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_main.po
trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_options_main.po
trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_stats_main.po
trunk/webinterface/core/mysql.sql
Log:
gettext fixes and fixes for de_DE locale
Modified: trunk/webinterface/core/OpenVCP.php
===================================================================
--- trunk/webinterface/core/OpenVCP.php 2008-12-29 21:07:56 UTC (rev 640)
+++ trunk/webinterface/core/OpenVCP.php 2008-12-30 00:26:49 UTC (rev 641)
@@ -146,7 +146,13 @@
* needed things depend on the request.
*
* @return void
- */
+ */
+
+ protected static $lastTextdomain = "";
+
+
+
+
public static function main(){
if(!self::$mainCalled)
{
@@ -225,9 +231,14 @@
self::_loadCoreClass($mainConfig['load']);
}
$auth = & self::call('Auth', 'getReference');
- $db =& self::call('DB', 'getReference');
- $settings = $db->select($db->table_user_settings, NULL, array('value'), array('userid' => $auth->user_information['id'], 'AND', 'key' => 'language'));
- $mod = explode(DIRECTORY_SEPARATOR, (str_replace(OPENVCP_MODS_DIR.DIRECTORY_SEPARATOR, '', $file)));
+ $db =& self::call('DB', 'getReference');
+ if($auth->user_information['is_admin'] == 1)
+ $settings = $db->select($db->table_admin_settings, NULL, array('value'), array('adminid' => $auth->user_information['id'], 'AND', 'key' => 'language'));
+ else
+ $settings = $db->select($db->table_user_settings, NULL, array('value'), array('userid' => $auth->user_information['id'], 'AND', 'key' => 'language'));
+
+ $mod = explode(DIRECTORY_SEPARATOR, (str_replace(OPENVCP_MODS_DIR.DIRECTORY_SEPARATOR, '', $file)));
+
$domain = "";
foreach($mod as $sub)
{
@@ -247,6 +258,8 @@
bindtextdomain($domain, $mainConfig['localeDir']);
bind_textdomain_codeset($domain, 'utf-8');
textdomain($domain);
+
+ self::$lastTextdomain = $domain;
$mainMod = explode("/", self::calledMod(true));
$dir = dirname(isset($mainMod[1]) ? str_replace("/".$mainMod[1], "", self::calledMod()) : self::calledMod());
@@ -263,6 +276,22 @@
}
}
}
+
+
+ public static function setTextdomain($domain)
+ {
+ bindtextdomain($domain, self::$mainConfig['localeDir']);
+ bind_textdomain_codeset($domain, 'utf-8');
+ textdomain($domain);
+ }
+
+ public static function resetTextdomain()
+ {
+ bindtextdomain(self::$lastTextdomain, self::$mainConfig['localeDir']);
+ bind_textdomain_codeset(self::$lastTextdomain, 'utf-8');
+ textdomain(self::$lastTextdomain);
+ }
+
/**
* Calls a core method with the
Modified: trunk/webinterface/core/Vserver.class.php
===================================================================
--- trunk/webinterface/core/Vserver.class.php 2008-12-29 21:07:56 UTC (rev 640)
+++ trunk/webinterface/core/Vserver.class.php 2008-12-30 00:26:49 UTC (rev 641)
@@ -205,7 +205,7 @@
return $this->SOCKET->socket_exec($this->vserverinfo['nodeid'], $request);
}
- public function addIp($ip, $dev, $mask, $alias, $bcast, $nodev="")
+ public function addIp($ip, $dev, $mask, $alias, $bcast, $nodev="", $tuntap="")
{
if(strlen($alias) > 10) {
$alias = substr($alias, -10, 10);
@@ -218,6 +218,9 @@
if($alias != "") $this->XML->addStructMember($request, "name", "string", $alias);
if($bcast != "") $this->XML->addStructMember($request, "bcast", "string", $bcast);
if($nodev != "") $this->XML->addStructMember($request, "nodev", "string", "nodev");
+ if($tuntap == "tun") $this->XML->addStructMember($request, "tun", "string", "tun");
+ if($tuntap == "tap") $this->XML->addStructMember($request, "tap", "string", "tap");
+
$response = $this->SOCKET->socket_exec($this->vserverinfo['nodeid'], $request);
$this->DB->update($this->DB->table_network, array('vserverid' => $this->vserverinfo['id'], 'used' => 'y'), array('id' => $ip));
}
Added: trunk/webinterface/core/locale/de_DE/LC_MESSAGES/super_customers_navi.po
===================================================================
--- trunk/webinterface/core/locale/de_DE/LC_MESSAGES/super_customers_navi.po (rev 0)
+++ trunk/webinterface/core/locale/de_DE/LC_MESSAGES/super_customers_navi.po 2008-12-30 00:26:49 UTC (rev 641)
@@ -0,0 +1,40 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-08-19 12:18+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+
+msgid "customer"
+msgstr "Kunde"
+
+msgid "Customers"
+msgstr "Kunden"
+
+msgid "customer overview"
+msgstr "Kundenübersicht"
+
+msgid "add customer"
+msgstr "Kunden hinzufügen"
+
+msgid "Template"
+msgstr "Vorlage"
+
+msgid "overview"
+msgstr "Übersicht"
+
+msgid "add template"
+msgstr "Vorlage hinzufügen"
+
Added: trunk/webinterface/core/locale/de_DE/LC_MESSAGES/super_navi.po
===================================================================
--- trunk/webinterface/core/locale/de_DE/LC_MESSAGES/super_navi.po (rev 0)
+++ trunk/webinterface/core/locale/de_DE/LC_MESSAGES/super_navi.po 2008-12-30 00:26:49 UTC (rev 641)
@@ -0,0 +1,36 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-08-19 12:16+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+
+msgid "overview"
+msgstr "Übersicht"
+
+msgid "logout"
+msgstr "Ausloggen"
+
+msgid "add admin"
+msgstr "Admin hinzufügen"
+
+msgid "add customer"
+msgstr "Benutzer hinzufügen"
+
+msgid "add node"
+msgstr "Hostsystem hinzufügen"
+
+msgid "add vserver"
+msgstr "vServer hinzufügen"
Modified: trunk/webinterface/core/locale/de_DE/LC_MESSAGES/super_nodes_navi.po
===================================================================
--- trunk/webinterface/core/locale/de_DE/LC_MESSAGES/super_nodes_navi.po 2008-12-29 21:07:56 UTC (rev 640)
+++ trunk/webinterface/core/locale/de_DE/LC_MESSAGES/super_nodes_navi.po 2008-12-30 00:26:49 UTC (rev 641)
@@ -16,40 +16,20 @@
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../../../mods/super/settings/navi.php:3
-msgid "settings"
-msgstr "Einstellungen"
-#: ../../../../mods/super/settings/navi.php:7
-msgid "global"
-msgstr "Global"
+msgid "Nodes"
+msgstr "Hostsysteme"
-#: ../../../../mods/super/settings/navi.php:8
-#: ../../../../mods/super/settings/navi.php:23
-msgid "view"
-msgstr "Ansehen"
-#: ../../../../mods/super/settings/navi.php:14
-msgid "other's"
-msgstr "Andere"
+msgid "overview"
+msgstr "Übersicht"
-#: ../../../../mods/super/settings/navi.php:18
-msgid "edit"
-msgstr "Bearbeiten"
+msgid "add node"
+msgstr "Hostsysteme hinzufügen"
-#: ../../../../mods/super/settings/navi.php:22
-msgid "own"
-msgstr "Eigene"
+msgid "Node"
+msgstr "Hostsystem"
-#: ../../../../mods/super/settings/navi.php:24
-msgid "change password"
-msgstr "Passwort ändern"
+msgid "update vserver list"
+msgstr "vServer Liste aktualisieren"
-#: ../../../../mods/super/settings/navi.php:27
-#: ../../../../mods/super/settings/navi.php:28
-msgid "mail templates"
-msgstr "E-Mail Vorlagen"
-
-#: ../../../../mods/super/settings/navi.php:29
-msgid "add template"
-msgstr "Vorlage hinzufügen"
Added: trunk/webinterface/core/locale/de_DE/LC_MESSAGES/super_settings_navi.po
===================================================================
--- trunk/webinterface/core/locale/de_DE/LC_MESSAGES/super_settings_navi.po (rev 0)
+++ trunk/webinterface/core/locale/de_DE/LC_MESSAGES/super_settings_navi.po 2008-12-30 00:26:49 UTC (rev 641)
@@ -0,0 +1,51 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-03-21 15:09+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+
+msgid "global settings"
+msgstr "Globale Einstellungen"
+
+msgid "view"
+msgstr "Ansehen"
+
+msgid "global"
+msgstr "Globale"
+
+msgid "own"
+msgstr "Eigene"
+
+
+msgid "other's"
+msgstr "Andere Einstellungen"
+
+
+msgid "admin"
+msgstr "Admin"
+
+msgid "change password"
+msgstr "Passwort ändern"
+
+
+msgid "preferences"
+msgstr "Einstellungen"
+
+msgid "mail templates"
+msgstr "E-Mail Vorlagen"
+
+msgid "add template"
+msgstr "Vorlagen hinzufügen"
Modified: trunk/webinterface/core/locale/de_DE/LC_MESSAGES/super_vservers_navi.po
===================================================================
--- trunk/webinterface/core/locale/de_DE/LC_MESSAGES/super_vservers_navi.po 2008-12-29 21:07:56 UTC (rev 640)
+++ trunk/webinterface/core/locale/de_DE/LC_MESSAGES/super_vservers_navi.po 2008-12-30 00:26:49 UTC (rev 641)
@@ -39,3 +39,16 @@
#: ../../../../mods/super/vservers/navi.php:14
msgid "add"
msgstr "Hinzufügen"
+
+msgid "add template"
+msgstr "Vorlage hinzufügen"
+
+msgid "info"
+msgstr "Info"
+
+msgid "customer"
+msgstr "Kunde"
+
+msgid "node"
+msgstr "Hostsystem"
+
Modified: trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_control_main.po
===================================================================
--- trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_control_main.po 2008-12-29 21:07:56 UTC (rev 640)
+++ trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_control_main.po 2008-12-30 00:26:49 UTC (rev 641)
@@ -353,3 +353,8 @@
#: ../../../../mods/user/control/main.php:495
msgid "offline"
msgstr "offline"
+
+msgid "trafficlimit"
+msgstr "Traffic Limit"
+
+
Modified: trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_firewall_main.po
===================================================================
--- trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_firewall_main.po 2008-12-29 21:07:56 UTC (rev 640)
+++ trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_firewall_main.po 2008-12-30 00:26:49 UTC (rev 641)
@@ -22,13 +22,13 @@
#: ../../../../mods/user/firewall/main.php:47
msgid "overview"
-msgstr "Ãœbersicht"
+msgstr "Übersicht"
#: ../../../../mods/user/firewall/main.php:48
#: ../../../../mods/user/firewall/main.php:68
#: ../../../../mods/user/firewall/main.php:128
msgid "add rule"
-msgstr "Regel hinzufügen"
+msgstr "Regel hinzufügen"
#: ../../../../mods/user/firewall/main.php:66
msgid "select direction"
@@ -36,11 +36,11 @@
#: ../../../../mods/user/firewall/main.php:73
msgid "add new"
-msgstr "Neue Regel für VServer"
+msgstr "Neue Regel für VServer"
#: ../../../../mods/user/firewall/main.php:73
msgid "rule for vserver"
-msgstr "hinzufügen"
+msgstr "hinzufügen"
#: ../../../../mods/user/firewall/main.php:77
msgid "select protocol"
@@ -52,11 +52,11 @@
#: ../../../../mods/user/firewall/main.php:109
msgid "select match"
-msgstr "Ãœbereinstimmung"
+msgstr "Übereinstimmung"
#: ../../../../mods/user/firewall/main.php:112
msgid "select match value"
-msgstr "Wert für die Übereinstimmung"
+msgstr "Wert für die Übereinstimmung"
#: ../../../../mods/user/firewall/main.php:114
msgid "states"
@@ -72,7 +72,7 @@
#: ../../../../mods/user/firewall/main.php:164
msgid "firewall rules for vserver"
-msgstr "Firewallregeln für VServer"
+msgstr "Firewallregeln für VServer"
#: ../../../../mods/user/firewall/main.php:166
msgid "default policy is allow"
@@ -108,7 +108,7 @@
#: ../../../../mods/user/firewall/main.php:190
msgid "match"
-msgstr "Ãœbereinstimmung"
+msgstr "Übereinstimmung"
#: ../../../../mods/user/firewall/main.php:191
msgid "match value"
@@ -121,4 +121,4 @@
#: ../../../../mods/user/firewall/main.php:208
msgid "delete rules"
-msgstr "Regeln löschen"
+msgstr "Regeln löschen"
Modified: trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_main.po
===================================================================
--- trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_main.po 2008-12-29 21:07:56 UTC (rev 640)
+++ trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_main.po 2008-12-30 00:26:49 UTC (rev 641)
@@ -18,7 +18,7 @@
#: ../../../../mods/user/main.php:33
msgid "overview"
-msgstr "Ãœbersicht"
+msgstr "Übersicht"
#: ../../../../mods/user/main.php:34
msgid "logout"
Modified: trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_options_main.po
===================================================================
--- trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_options_main.po 2008-12-29 21:07:56 UTC (rev 640)
+++ trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_options_main.po 2008-12-30 00:26:49 UTC (rev 641)
@@ -22,11 +22,11 @@
#: ../../../../mods/user/options/main.php:33
msgid "change password"
-msgstr "Passwort ändern"
+msgstr "Passwort ändern"
#: ../../../../mods/user/options/main.php:34
msgid "change settings"
-msgstr "Einstellungen ändern"
+msgstr "Einstellungen Ändern"
#: ../../../../mods/user/options/main.php:52
msgid "your settings were saved"
@@ -38,7 +38,7 @@
#: ../../../../mods/user/options/main.php:63
msgid "password's do not match"
-msgstr "Die Passwörter stimmen nicht über ein"
+msgstr "Die Passwörter stimmen nicht über ein"
#: ../../../../mods/user/options/main.php:64
msgid "plaese try again"
@@ -60,7 +60,7 @@
#: ../../../../mods/user/options/main.php:117
msgid "change your password"
-msgstr "Passwort ändern"
+msgstr "Passwort Ändern"
#: ../../../../mods/user/options/main.php:119
msgid "new password"
Modified: trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_stats_main.po
===================================================================
--- trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_stats_main.po 2008-12-29 21:07:56 UTC (rev 640)
+++ trunk/webinterface/core/locale/de_DE/LC_MESSAGES/user_stats_main.po 2008-12-30 00:26:49 UTC (rev 641)
@@ -22,21 +22,21 @@
#: ../../../../mods/user/stats/main.php:42
msgid "traffic day"
-msgstr ""
+msgstr "Tagestraffic"
#: ../../../../mods/user/stats/main.php:43
msgid "traffic month"
-msgstr ""
+msgstr "Monatstraffic"
#: ../../../../mods/user/stats/main.php:44
msgid "traffic year"
-msgstr ""
+msgstr "Jahrestraffic"
#: ../../../../mods/user/stats/main.php:80
#: ../../../../mods/user/stats/main.php:82
#: ../../../../mods/user/stats/main.php:149
msgid "traffic for"
-msgstr ""
+msgstr "Datentransferstatistik für"
#: ../../../../mods/user/stats/main.php:86
msgid "hour"
Modified: trunk/webinterface/core/mysql.sql
===================================================================
--- trunk/webinterface/core/mysql.sql 2008-12-29 21:07:56 UTC (rev 640)
+++ trunk/webinterface/core/mysql.sql 2008-12-30 00:26:49 UTC (rev 641)
@@ -336,3 +336,8 @@
#since r562
ALTER TABLE `openvcp_network` ADD `reservation` TEXT NOT NULL default '';
+#since r641
+INSERT INTO `openvcp_user_settings_available` (`key`, `value`) VALUES
+('language', 'en_US'),
+('theme', 'default');
+
More information about the Commits
mailing list