From 7be63518bdb86fb747dda20918ef6eab3d30e40c Mon Sep 17 00:00:00 2001 From: neoraider Date: Sat, 9 Dec 2006 01:18:00 +0000 Subject: ?bersetzung vereinfacht; alle Seiten ?bersetzt --- base.xml | 2 +- code/message.inc.php | 19 ------------- code/pages.inc.php | 18 +++++++----- code/subst.inc.php | 13 +++++++++ code/util.inc.php | 11 -------- config/neon.sql | 8 ++++-- index.php | 2 +- lang/de.inc.php | 48 ++++++++++++++++++++++++++++---- pages/base/default.xml | 2 +- pages/content/Login.xml | 6 ++-- pages/content/Modules.xml | 4 +-- pages/content/Pages.xml | 18 ++++++------ pages/content/Pages:Handle.xml | 59 ++++++++++++++++++++-------------------- pages/content/Users.xml | 10 +++---- pages/content/Users:Handle.xml | 62 ++++++++++++++++++++---------------------- templates/default.inc.php | 6 ++-- templates/phpexec.inc.php | 4 +-- 17 files changed, 158 insertions(+), 134 deletions(-) delete mode 100644 code/message.inc.php create mode 100644 code/subst.inc.php diff --git a/base.xml b/base.xml index f37b64e..cdc3003 100644 --- a/base.xml +++ b/base.xml @@ -6,9 +6,9 @@ links - message nav pages + subst templates user util diff --git a/code/message.inc.php b/code/message.inc.php deleted file mode 100644 index fb9e8fa..0000000 --- a/code/message.inc.php +++ /dev/null @@ -1,19 +0,0 @@ -' . Subst($GLOBALS['message'][$type], $data) . ''; - } -?> diff --git a/code/pages.inc.php b/code/pages.inc.php index e3af67a..549e24c 100644 --- a/code/pages.inc.php +++ b/code/pages.inc.php @@ -1,5 +1,5 @@ Exists($page, $type)) return array('title' => $page, - 'content' => ErrorMessage('PageNotFound', array('page' => $page))); + 'content' => Subst('{{The page \'' . $page . '\' does not exist.}}')); if(!$this->HasReadAccess($page, $type)) return array('title' => $page, - 'content' => ErrorMessage('Forbidden', array('page' => $page))); + 'content' => Subst('{{The page \'' . $page . '\' is protected.}}')); $pagedata = $this->GetPageData($page, $type); @@ -22,17 +22,19 @@ $data['_page'] = $page; $data['_type'] = $type; - return $GLOBALS['templates'][$pagedata['template']]->GetPage($data); + $ret = $GLOBALS['templates'][$pagedata['template']]->GetPage($data); + + return array('title' => Subst($ret['title']), 'content' => Subst($ret['content'])); } function GetEditor($page, $type, $backlink) { if(!$this->Exists($page, $type)) return array('title' => $page, - 'content' => ErrorMessage('PageNotFound', array('page' => $page))); + 'content' => Subst('{{The page \'' . $page . '\' does not exist.}}')); if(!$this->HasWriteAccess($page, $type)) return array('title' => $page, - 'content' => ErrorMessage('Forbidden', array('page' => $page))); + 'content' => Subst('{{The page \'' . $page . '\' is protected.}}')); $pagedata = $this->GetPageData($page, $type); @@ -41,7 +43,9 @@ $data['_type'] = $type; $data['_backlink'] = $backlink; - return $GLOBALS['templates'][$pagedata['template']]->GetEditor($data); + $ret = $GLOBALS['templates'][$pagedata['template']]->GetEditor($data); + + return array('title' => Subst($ret['title']), 'content' => Subst($ret['content'])); } function Exists($page, $type) { diff --git a/code/subst.inc.php b/code/subst.inc.php new file mode 100644 index 0000000..9696ec9 --- /dev/null +++ b/code/subst.inc.php @@ -0,0 +1,13 @@ + diff --git a/code/util.inc.php b/code/util.inc.php index 3ee2489..b2cf954 100644 --- a/code/util.inc.php +++ b/code/util.inc.php @@ -1,15 +1,4 @@ '$'); - - foreach($subst as $key => $value) - $tr['$' . $key] = $value; - - krsort($tr); - - return strtr($string, $tr); - } - if(get_magic_quotes_gpc()) { function Unquote($string) { return stripslashes($string); diff --git a/config/neon.sql b/config/neon.sql index 5de9591..74e4c60 100644 --- a/config/neon.sql +++ b/config/neon.sql @@ -3,7 +3,7 @@ -- http://www.phpmyadmin.net -- -- Host: localhost --- Erstellungszeit: 04. Dezember 2006 um 01:27 +-- Erstellungszeit: 09. Dezember 2006 um 02:16 -- Server Version: 5.0.27 -- PHP-Version: 5.2.0-7 -- @@ -53,6 +53,7 @@ CREATE TABLE `groups` ( -- INSERT INTO `groups` (`id`, `name`) VALUES (3, 'Mitglied'); +INSERT INTO `groups` (`id`, `name`) VALUES (-1, '{{Administrator}}'); -- -------------------------------------------------------- @@ -64,7 +65,8 @@ CREATE TABLE `modules` ( `id` bigint(20) NOT NULL auto_increment, `name` varchar(255) NOT NULL, `enabled` tinyint(1) NOT NULL, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + UNIQUE KEY `name` (`name`) ) TYPE=MyISAM AUTO_INCREMENT=6 ; -- @@ -203,6 +205,6 @@ CREATE TABLE `users` ( -- Daten für Tabelle `users` -- -INSERT INTO `users` (`id`, `sid`, `gid`, `user`, `password`, `lastaccess`) VALUES (1, '', -1, 'NeoRaider', 'gamezock', '2006-12-04 01:18:26'); +INSERT INTO `users` (`id`, `sid`, `gid`, `user`, `password`, `lastaccess`) VALUES (1, '', -1, 'NeoRaider', 'gamezock', '2006-12-09 02:15:08'); INSERT INTO `users` (`id`, `sid`, `gid`, `user`, `password`, `lastaccess`) VALUES (3, '', -1, 'sicarius', 'armleuchter', '2006-12-02 22:46:58'); INSERT INTO `users` (`id`, `sid`, `gid`, `user`, `password`, `lastaccess`) VALUES (4, '', -1, 'morti', 'return', '2006-12-02 22:46:58'); diff --git a/index.php b/index.php index cef78c6..0da673f 100644 --- a/index.php +++ b/index.php @@ -4,7 +4,7 @@ require_once('core/modules.inc.php'); require_once('core/xmlparser.inc.php'); - Uses('util', 'pages', 'links'); + Uses('util', 'pages', 'links', 'subst'); header('Content-type: text/html;charset=UTF-8'); diff --git a/lang/de.inc.php b/lang/de.inc.php index 47e7007..7837055 100644 --- a/lang/de.inc.php +++ b/lang/de.inc.php @@ -1,7 +1,45 @@ diff --git a/pages/base/default.xml b/pages/base/default.xml index 51fc115..de2ef47 100644 --- a/pages/base/default.xml +++ b/pages/base/default.xml @@ -31,7 +31,7 @@ if($GLOBALS['pages']->HasWriteAccess($GLOBALS['page'], 'c') && $_GET['mode'] != 'edit') { $backlink = $GLOBALS['links']->GetNeonLink($GLOBALS['page']); - echo 'Bearbeiten'; + echo '{{Edit}}'; } echo $GLOBALS['data']['content']; diff --git a/pages/content/Login.xml b/pages/content/Login.xml index 4e21b3f..4a6471a 100644 --- a/pages/content/Login.xml +++ b/pages/content/Login.xml @@ -10,7 +10,7 @@ Login(Unquote($_POST['name']), Unquote($_POST['password']))) { @@ -19,9 +19,9 @@ } } - $title = Message('Error'); + $title = '{{Error}}'; - echo '' . Message('LoginError') . ''; + echo '{{Login failed. Username or password is wrong.}}'; ?> ]]> diff --git a/pages/content/Modules.xml b/pages/content/Modules.xml index 86a031b..f8f52e2 100644 --- a/pages/content/Modules.xml +++ b/pages/content/Modules.xml @@ -12,9 +12,9 @@ Module'; + echo '

{{Modules}}

'; $modules = array_keys($GLOBALS['modules']->modules); unset($modules[array_search('base', $modules)]); diff --git a/pages/content/Pages.xml b/pages/content/Pages.xml index e72368f..6db0710 100644 --- a/pages/content/Pages.xml +++ b/pages/content/Pages.xml @@ -13,9 +13,9 @@ Uses('links', 'pages'); - $title = 'Seiten'; + $title = '{{Pages}}'; - echo '

Seiten

'; + echo '

{{Pages}}

'; echo '
'; @@ -29,13 +29,13 @@ echo ''; echo '
'; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ''; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ''; echo '
'; ?> ]]> diff --git a/pages/content/Pages:Handle.xml b/pages/content/Pages:Handle.xml index 173eec7..9abc7d9 100644 --- a/pages/content/Pages:Handle.xml +++ b/pages/content/Pages:Handle.xml @@ -23,21 +23,21 @@ } } elseif(isset($_POST['new'])) { - $title = 'Neue Seite'; + $title = '{{New page}}'; ?> -

Neue Seite

+

{{New page}}

- Name:
- Template:
+ {{Template}}:
- - + +
Rechte von \'' . $name . '\' ändern'; + echo '

{{Change access to \'' . $name . '\'}}

'; $access = $GLOBALS['pages']->GetAccess(Unquote($_POST['name']), $_POST['type']); $groups = $GLOBALS['user']->ListGroups(); - array_unshift($groups, array(0, 'Gast')); + array_unshift($groups, array(0, '{{Guest}}')); echo '
'; @@ -77,25 +77,25 @@ echo ''; + echo '>{{No access}}'; echo ''; + echo '>{{Read only}}'; echo ''; + echo '>{{Read and write}}'; echo ''; } echo ''; - echo ' '; - echo ''; + echo ' '; + echo ''; echo '
'; } @@ -104,16 +104,16 @@ if($_POST['name']) { $name = htmlspecialchars(Unquote($_POST['name'])); - $title = '\'' . $name . '\' kopieren'; + $title = '{{Copy \'' . $name . '\'}}'; - echo '

\'' . $name . '\' kopieren

'; + echo '

{{Copy \'' . $name . '\'}}

'; echo '
'; echo ''; echo ''; - echo 'Neuer Name:
'; - echo ' '; - echo ''; + echo '{{New name}}:
'; + echo ' '; + echo ''; echo '
'; } } @@ -121,17 +121,16 @@ if($_POST['name']) { $name = htmlspecialchars(Unquote($_POST['name'])); - $title = '\'' . $name . '\' umbenennen'; + $title = '{{Rename \'' . $name . '\'}}'; - echo '

\'' . $name . '\' umbenennen

'; + echo '

{{Rename \'' . $name . '\'}}

'; echo '
'; echo ''; echo ''; - echo 'Neuer Name:
'; - echo '
'; - echo ' '; - echo ''; + echo '{{New name}}:
'; + echo ' '; + echo ''; echo '
'; } } @@ -139,16 +138,16 @@ if($_POST['name']) { $name = htmlspecialchars(Unquote($_POST['name'])); - $title = '\'' . $name . '\' löschen'; + $title = '{{Delete \'' . $name . '\'}}'; - echo '

\'' . $name . '\' löschen

'; + echo '

{{Delete \'' . $name . '\'}}

'; echo '
'; echo ''; echo ''; - echo 'Wollen Sie die Seite \'' . $name . '\' wirklich löschen?
'; - echo ' '; - echo ''; + echo '{{Do you really want to delete the page \'' . $name . '\'?}}
'; + echo ' '; + echo ''; echo '
'; } } diff --git a/pages/content/Users.xml b/pages/content/Users.xml index bd70234..9833701 100644 --- a/pages/content/Users.xml +++ b/pages/content/Users.xml @@ -29,11 +29,11 @@ echo ''; echo '
'; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ''; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ''; echo ''; ?> ]]> diff --git a/pages/content/Users:Handle.xml b/pages/content/Users:Handle.xml index 27b5a3e..9e949c1 100644 --- a/pages/content/Users:Handle.xml +++ b/pages/content/Users:Handle.xml @@ -14,29 +14,28 @@ if(isset($_POST['new'])) { - $title = 'Neuer Benutzer'; + $title = '{{New user}}'; ?> -

Neuer Benutzer

+

{{New user}}

Name:
- Gruppe:
+ {{Group}}:

- Passwort:
+ {{Password}}:

- Bestätigen:
+ {{Confirm}}:

- - + +
GetName($_POST['id'])); $gid = $GLOBALS['user']->GetGid($_POST['id']); - $title = 'Gruppe von \'' . $name . '\' ändern'; + $title = '{{Change group of \'' . $name . '\'}}'; - echo '

Gruppe von \'' . $name . '\' ändern

'; + echo '

{{Change group of \'' . $name . '\'}}

'; echo '
'; echo ''; - echo 'Neue Gruppe:
'; + echo '{{New group}}:
'; echo ' '; - echo ''; + echo ' '; + echo ''; echo '
'; } } @@ -76,18 +74,18 @@ if($_POST['id']) { $name = htmlspecialchars($GLOBALS['user']->GetName($_POST['id'])); - $title = 'Passwort von \'' . $name . '\' ändern'; + $title = '{{Change password of \'' . $name . '\'}}'; - echo '

Passwort von \'' . $name . '\' ändern

'; + echo '

{{Change password of \'' . $name . '\'}}

'; echo '
'; echo ''; - echo 'Neues Passwort:
'; + echo '{{New password}}:
'; echo '
'; - echo 'Bestätigen:
'; + echo '{{Confirm}}:
'; echo '
'; - echo ' '; - echo ''; + echo ' '; + echo ''; echo '
'; } } @@ -95,16 +93,16 @@ if($_POST['id']) { $name = htmlspecialchars($GLOBALS['user']->GetName($_POST['id'])); - $title = '\'' . $name . '\' umbenennen'; + $title = '{{Rename \'' . $name . '\'}}'; - echo '

\'' . $name . '\' umbenennen

'; + echo '

{{Rename \'' . $name . '\'}}

'; echo '
'; echo ''; - echo 'Neuer Name: '; + echo '{{New name}}: '; echo '
'; - echo ' '; - echo ''; + echo ' '; + echo ''; echo '
'; } } @@ -112,15 +110,15 @@ if($_POST['id']) { $name = htmlspecialchars($GLOBALS['user']->GetName($_POST['id'])); - $title = '\'' . $name . '\' löschen'; + $title = '{{Delete \'' . $name . '\'}}'; - echo '

\'' . $name . '\' löschen

'; + echo '

{{Delete \'' . $name . '\'}}

'; echo '
'; echo ''; - echo 'Wollen Sie den Benutzer \'' . $name . '\' wirklich löschen?
'; - echo ' '; - echo ''; + echo '{{Do you really want to delete the user \'' . $name . '\'?}}
'; + echo ' '; + echo ''; echo '
'; } } diff --git a/templates/default.inc.php b/templates/default.inc.php index c416f44..a6fc876 100644 --- a/templates/default.inc.php +++ b/templates/default.inc.php @@ -1,5 +1,5 @@ ' . $title . ''; $content .= '
'; $content .= ''; $content .= ''; $content .= ''; - $content .= 'Titel:
'; $content .= '
'; diff --git a/templates/phpexec.inc.php b/templates/phpexec.inc.php index 18c33be..db8373a 100644 --- a/templates/phpexec.inc.php +++ b/templates/phpexec.inc.php @@ -1,5 +1,5 @@ ' . $title . ''; $content .= ''; -- cgit v1.2.3