Renamed a lot language strings to new naming convention, first english translation...
authorRoland Häder <roland@mxchange.org>
Tue, 8 Feb 2011 03:26:24 +0000 (03:26 +0000)
committerRoland Häder <roland@mxchange.org>
Tue, 8 Feb 2011 03:26:24 +0000 (03:26 +0000)
24 files changed:
.gitattributes
inc/language/_en.php [new file with mode: 0644]
inc/language/active_de.php
inc/language/active_en.php [new file with mode: 0644]
inc/language/admins_de.php
inc/language/de.php
inc/libs/admins_functions.php
inc/modules/admin/admin-inc.php
inc/modules/admin/what-admins_contct.php
inc/modules/admin/what-admins_mails.php
inc/modules/admin/what-config_admins.php
inc/mysql-manager.php
templates/de/html/admin/admin_admins_contct_default.tpl
templates/de/html/admin/admin_admins_contct_form.tpl
templates/de/html/admin/admin_admins_contct_select.tpl
templates/de/html/admin/admin_admins_mails_edit.tpl
templates/de/html/admin/admin_admins_mails_edit_form.tpl
templates/de/html/admin/admin_admins_mails_list.tpl
templates/de/html/admin/admin_config_active.tpl
templates/de/html/admin/admin_config_admins.tpl
templates/de/html/admin/admin_config_admins_del.tpl
templates/de/html/admin/admin_config_admins_edit.tpl
templates/de/html/admin/admin_config_home.tpl
templates/de/html/admin/admin_list_online.tpl

index d388497..579d865 100644 (file)
@@ -244,7 +244,9 @@ inc/js/js-uberwach.php -text svneol=unset#text/plain
 inc/language-functions.php -text svneol=unset#text/plain
 inc/language/.htaccess -text svneol=unset#text/plain
 inc/language/_de.php -text svneol=unset#text/plain
+inc/language/_en.php svneol=native#text/plain
 inc/language/active_de.php -text svneol=unset#text/plain
+inc/language/active_en.php svneol=native#text/plain
 inc/language/admins_de.php -text svneol=unset#text/plain
 inc/language/autopurge_de.php -text svneol=unset#text/plain
 inc/language/bank_de.php -text svneol=unset#text/plain
diff --git a/inc/language/_en.php b/inc/language/_en.php
new file mode 100644 (file)
index 0000000..fff57a2
--- /dev/null
@@ -0,0 +1,48 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 02/08/2011 *
+ * ===================                          Last change: 02/08/2011 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : _en.php                                          *
+ * -------------------------------------------------------------------- *
+ * Short description : English langugage support                        *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Englische Sprachunterstuetzung                   *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://www.mxchange.org                  *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if (!defined('__SECURITY')) {
+       die();
+} // END - if
+
+// Language definitions
+addMessages(array(
+));
+
+// [EOF]
+?>
index 802d014..91be17b 100644 (file)
@@ -46,8 +46,8 @@ addMessages(array(
        'GUEST_ACTIVE_NO_MEMER_ONLINE_TODAY' => "Heute war noch kein einziges Mitglied online.",
        'GUEST_ACTIVE_HEADER' => "Wir waren heute online.",
        'GUEST_ACTIVE_FOOTER' => "Diese Mitglieder waren heute bei <strong>{?MAIN_TITLE?}</strong> eingeloggt.",
-       'ADMIN_ACTIVE_SETTINGS' => "Einstellungen an Aktiv-Liste",
-       'ADMIN_ACTIVE_LIMIT' => "Anzahl Eintr&auml;ge in Liste",
+       'ADMIN_CONFIG_ACTIVE_SETTINGS_TITLE' => "Einstellungen an Aktiv-Liste",
+       'ADMIN_CONFIG_ACTIVE_LIMIT' => "Anzahl Eintr&auml;ge in Liste",
 ));
 
 // [EOF]
diff --git a/inc/language/active_en.php b/inc/language/active_en.php
new file mode 100644 (file)
index 0000000..871020a
--- /dev/null
@@ -0,0 +1,54 @@
+<?php
+/************************************************************************
+ * Mailer v0.2.1-FINAL                                Start: 02/08/2011 *
+ * ===================                          Last change: 02/08/2011 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : active_en.php                                    *
+ * -------------------------------------------------------------------- *
+ * Short description : English langugage support                        *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Englische Sprachunterstuetzung                   *
+ * -------------------------------------------------------------------- *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://www.mxchange.org                  *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if (!defined('__SECURITY')) {
+       die();
+} // END - if
+
+// Language definitions
+addMessages(array(
+       'GUEST_ACTIVE_LINK' => "Online Today",
+       'GUEST_ACTIVE_NO_MEMER_ONLINE_TODAY' => "Today no member was online.",
+       'GUEST_ACTIVE_HEADER' => "We were online today.",
+       'GUEST_ACTIVE_FOOTER' => "These members were logged in at <strong>{?MAIN_TITLE?}</strong> today.",
+       'ADMIN_CONFIG_ACTIVE_SETTINGS_TITLE' => "Settings for active-list",
+       'ADMIN_CONFIG_ACTIVE_LIMIT' => "Number of entries in active-list",
+));
+
+// [EOF]
+?>
index e721062..a2a3a97 100644 (file)
@@ -58,23 +58,23 @@ addMessages(array(
        'ADMIN_ADMINS_EDIT_NOTE' => "Bitte beachten Sie, dass Sie nur dann das Passwort zweimal eingeben m&uuml;ssen, wenn Sie es &auml;ndern wollen. Wollen Sie nur die Daten &auml;ndern, brauchen Sie kein Passwort eingeben.",
        'ADMIN_ADMINS_DELETE_ACCOUNTS' => "Wollen Sie wirklich diese Accounts l&ouml;schen?",
        'ADMIN_ADMINS_CANNOT_DELETE_LAST' => "Das letzte Admin-Account kann nicht gel&ouml;scht werden.",
-       'ADMINS_SELECT_ADMIN' => "Bitte w&auml;hlen Sie einen Administrator aus dem Men&uuml;punkt <em>Admin-Account &auml;ndern</em> aus.",
-       'ADMINS_ADMIN_ID' => "Admin-Id",
-       'ADMINS_CONTACT_SUBMIT' => "Admin kontaktieren",
-       'ADMINS_ENTER_CONTACT_TEXT' => "Kontaktgrund eingeben",
-       'ADMINS_SELECT_CONTACT_TYPE' => "Nachricht &uuml;bertragen als",
-       'ADMINS_CONTACT_TYPE_MAIL' => "Mail",
-       'ADMINS_CONTACT_TYPE_MSG' => "Nachricht",
-       'ADMINS_CONTACT_DEFAULT_MAIL' => "Ihre Nachricht wird als Mail versendet.",
-       'ADMINS_MSG_FROM_ADMIN' => "Nachricht von einem Admin",
-       'ADMINS_ADMIN_CONTACTED' => "Administrator wurde benachrichtigt.",
+       'ADMIN_ADMINS_SELECT_ADMIN' => "Bitte w&auml;hlen Sie einen Administrator aus dem Men&uuml;punkt <em>Admin-Account &auml;ndern</em> aus.",
+       'ADMIN_ADMINS_ADMIN_ID' => "Admin-Id",
+       'ADMIN_ADMINS_CONTACT_SUBMIT' => "Admin kontaktieren",
+       'ADMIN_ADMINS_ENTER_CONTACT_TEXT' => "Kontaktgrund eingeben",
+       'ADMIN_ADMINS_SELECT_CONTACT_TYPE' => "Nachricht &uuml;bertragen als",
+       'ADMIN_ADMINS_CONTACT_TYPE_MAIL' => "Mail",
+       'ADMIN_ADMINS_CONTACT_TYPE_MSG' => "Nachricht",
+       'ADMIN_ADMINS_CONTACT_DEFAULT_MAIL' => "Ihre Nachricht wird als Mail versendet.",
+       'ADMIN_ADMINS_MESSAGE_FROM_ADMIN' => "Nachricht von einem Admin",
+       'ADMIN_ADMINS_ADMIN_CONTACTED' => "Administrator wurde benachrichtigt.",
        'ADMIN_ADMINS_ADD_ACL' => "Zugriffkontrollzeile hinzuf&uuml;gen",
        'ADMIN_ADMINS_SELECT_LOGIN' => "Admin-Login ausw&auml;hlen",
        'ADMIN_ADMINS_SELECT_ACTION' => "Hauptmen&uuml;",
        'ADMIN_ADMINS_SELECT_WHAT' => "Untermen&uuml;",
        'ADMIN_ADMINS_SELECT_MODE' => "Zugriffsmodus ausw&auml;hlen",
-       'ADMINS_ALLOW_MODE' => "Erlauben",
-       'ADMINS_DENY_MODE' => "Ablehnen",
+       'ADMIN_ADMINS_MODE_ALLOW' => "Erlauben",
+       'ADMIN_ADMINS_MODE_DENY' => "Ablehnen",
        'ADMIN_ADMINS_ACCESS_MODE' => "Zugriffsmodus",
        'ADMIN_ADMINS_ACL_NOTE' => "Sperren Sie nicht sich selber aus, indem Sie den Zugriffsmodus Ihres eigenen Accountes auf <strong>Ablehnen</strong> stellen! Dann k&ouml;nnen Sie zwar einloggen, aber nichts mehr machen.",
        'ADMIN_ADMINS_SAME_MODE_SELECTED' => "Bitte w&auml;hlen Sie den anderen Zugriffsmodus aus.",
@@ -82,31 +82,31 @@ addMessages(array(
        'ADMIN_ADMINS_ACL_ALREADY_ADDED' => "Zugriffskontrollzeile bereits hinzugef&uuml;gt.",
        'ADMIN_ADMINS_ACL_SAVED' => "Zugriffskontrollzeile gespeichert.",
        'ADMIN_ADMINS_LIST_ACLS' => "Alle angelgten Zugriffkontrollzeilen auflisten",
-       'ADMINS_EDIT_ACLS' => "Editieren",
-       'ADMINS_DELETE_ACLS' => "L&ouml;schen",
-       'ADMINS_AID' => "Admin-Login",
+       'ADMIN_ADMINS_EDIT_ACLS_SUBMIT' => "Editieren",
+       'ADMIN_ADMINS_DELETE_ACLS_SUBMIT' => "L&ouml;schen",
+       'ADMIN_ADMINS_LOGIN_ID' => "Admin-Login",
        'ADMIN_ADMINS_EDIT_ACLS' => "Zugriffkontrollzeilen &auml;ndern",
-       'ADMINS_CHANGE_ACLS' => "Eintr&auml;ge &auml;ndern",
-       'ADMINS_REMOVE_ACLS' => "Eintr&auml;ge l&ouml;schen",
-       'ADMIN_ADMINS_ENTRIES_CHANGED' => "Zugriffkontrollzeilen wurden ge&auml;ndert.",
        'ADMIN_ADMINS_DELETE_ACLS' => "Zugriffkontrollzeilen l&ouml;schen",
+       'ADMIN_ADMINS_CHANGE_ACLS_SUBMIT' => "Eintr&auml;ge &auml;ndern",
+       'ADMIN_ADMINS_REMOVE_ACLS_SUBMIT' => "Eintr&auml;ge l&ouml;schen",
+       'ADMIN_ADMINS_ENTRIES_CHANGED' => "Zugriffkontrollzeilen wurden ge&auml;ndert.",
        'ADMIN_ADMINS_ENTRIES_DELETED' => "Zugriffkontrollzeilen wurden gel&ouml;scht.",
-       'ADMINS_MAILS_NO_ENTRIES' => "Keine Eintr&auml;ge gefunden.",
-       'ADMINS_MAILS_TITLE' => "Admins-Mails verwalten",
+       'ADMIN_ADMINS_MAILS_NO_ENTRIES' => "Keine Eintr&auml;ge gefunden.",
+       'ADMIN_LIST_ADMINS_MAILS_TITLE' => "Admins-Mails verwalten",
        'ADMIN_ADMINS_TEMPLATE' => "Mail-Template",
-       'ADMINS_ALL_ADMINS' => "An alle Admins",
-       'ADMINS_TO_USER_EVENTS' => "Im Userlog vermerken",
-       'ADMINS_NO_MAIL_CHECKED' => "Keine Mails zum Editieren ausgew&auml;hlt.",
-       'ADMINS_MAILS_EDIT_TITLE' => "Ausgew&auml;hlte Templates den Admins zuweisen",
-       'ADMIN_ADMINS_CHANGE' => "&Auml;ndern",
-       'ADMINS_ADD_MORE_ADMINS' => "Weiteren Admin hinzuf&uuml;gen",
+       'ADMIN_TO_ALL_ADMINS' => "An alle Admins",
+       'ADMIN_ADMINS_TO_USER_EVENTS' => "Im Userlog vermerken",
+       'ADMIN_ADMINS_NO_MAIL_CHECKED' => "Keine Mails zum Editieren ausgew&auml;hlt.",
+       'ADMIN_EDIT_ADMINS_MAILS_TITLE' => "Ausgew&auml;hlte Templates den Admins zuweisen",
+       'ADMIN_EDIT_ADMINS_MAILS_SUBMIT' => "&Auml;ndern",
+       'ADMIN_ADMINS_ADD_MORE_ADMINS' => "Weiteren Admin hinzuf&uuml;gen",
        'ADMIN_ACCOUNT_SAVED' => "Admin-Account gespeichert.",
-       'ADMINS_ERROR_PASS_MISMATCH' => "Die beiden Passw&ouml;rter stimmen nicht &uuml;berein.",
+       'ADMIN_ADMINS_ERROR_PASS_MISMATCH' => "Die beiden Passw&ouml;rter stimmen nicht &uuml;berein.",
 
 // Logical area constants
-       'ADMINS_GLOBAL_LA_SETTING' => "Globale Einst.",
-       'ADMINS_OLD_LA_SETTING' => "Altes Men&uuml;",
-       'ADMINS_NEW_LA_SETTING' => "Neues Men&uuml;",
+       'ADMIN_ADMINS_LA_MODE_GLOBAL' => "Globale Einst.",
+       'ADMIN_ADMINS_LA_MODE_OLD' => "Altes Men&uuml;",
+       'ADMIN_ADMINS_LA_MODE_NEW' => "Neues Men&uuml;",
 ));
 
 // [EOF]
index 8fb201b..38b2952 100644 (file)
@@ -594,8 +594,8 @@ addMessages(array(
        'ADMIN_ONLINE_DETAILS' => "Detailierte Statistik f&uuml;r alle Besucher",
        '_REFID' => "Ref-Id",
        '_MODULE' => "Modul",
-       'MENU_ACTION' => "Hauptmen&uuml;",
-       'MENU_WHAT' => "Untermen&uuml;",
+       'ADMIN_MENU_ACTION' => "Hauptmen&uuml;",
+       'ADMIN_MENU_WHAT' => "Untermen&uuml;",
        '_IS_ADMIN' => "Administrator",
        '_IS_GUEST' => "Gast",
        'LAST_SEEN' => "Zuletzt gesehen",
@@ -762,9 +762,9 @@ addMessages(array(
        'EMAILS_PAGENAV' => "Seite",
        '_IS_CURRENT_HOME' => "Liegt in Home",
        '_IS_NEW_HOME' => "In Home setzen",
-       'ADMIN_CONFIG_HOME' => "Legen Sie hier die neue Home-Seite fest",
-       'HOME_ACTION' => "Funktion",
-       'HOME_BOTTOM_NOTE' => "Es werden nur aktive Men&uuml;punkte aus dem Gasthauptmen&uuml; (main) angezeigt.",
+       'ADMIN_CONFIG_SET_HOME' => "Legen Sie hier die neue Home-Seite fest",
+       'ADMIN_HOME_ACTION' => "Funktion",
+       'ADMIN_CONFIG_SET_HOME_NOTE' => "Es werden nur aktive Men&uuml;punkte aus dem Gasthauptmen&uuml; (main) angezeigt.",
        'ADMIN_EDIT' => "&Auml;ndern",
        'ADMIN_EDIT_EXTENSIONS' => "&Auml;ndern von Erweiterungen",
        'ONLINE_TIMEOUT_IS' => "Die Liste zeigt die Besucher der letzten <span class=\"data\">{%config,createFancyTime=online_timeout%}</span> an.",
@@ -1133,8 +1133,8 @@ addMessages(array(
        'ADMIN_STATUS_CHANGED' => "Es wurden <span class=\"data\">%s</span> von <span class=\"data\">%s</span> Eintr&auml;gen ge&auml;ndert.",
 
        // Missing menu entries
-       'MENU_ACTION_404' => "Hauptmen&uuml; %s deaktiviert, da keine Scriptdatei auf dem Server gefunden wurde.",
-       'MENU_WHAT_404' => "Untermen&uuml; %s deaktiviert, da keine Scriptdatei auf dem Server gefunden wurde.",
+       'ADMIN_MENU_ACTION_404' => "Hauptmen&uuml; %s deaktiviert, da keine Scriptdatei auf dem Server gefunden wurde.",
+       'ADMIN_MENU_WHAT_404' => "Untermen&uuml; %s deaktiviert, da keine Scriptdatei auf dem Server gefunden wurde.",
 
        // Cache messages
        'CACHE_PROBLEMS_DETECTED' => "Probleme mit dem Cache-Subsystem erkannt.",
index 1175558..c46ee54 100644 (file)
@@ -249,7 +249,7 @@ LIMIT 1",
                                $message = '{--ADMIN_ACCOUNT_SAVED--}';
                        } else {
                                // Passwords did not match
-                               $message = '{--ADMINS_ERROR_PASS_MISMATCH--}';
+                               $message = '{--ADMIN_ADMINS_ERROR_PASS_MISMATCH--}';
                        }
                } else {
                        // Update whole array
@@ -313,12 +313,12 @@ function adminsEditAdminAccount ($postData) {
                        // Shall we allow changing default ACL?
                        if ($currMode == 'allow') {
                                // Allow chaning it
-                               $content['mode']    = generateOptionList('/ARRAY/', array('allow', 'deny'), array('{--ADMINS_ALLOW_MODE--}', '{--ADMINS_DENY_MODE--}'), $content['mode']);
+                               $content['mode']    = generateOptionList('/ARRAY/', array('allow', 'deny'), array('{--ADMIN_ADMINS_MODE_ALLOW--}', '{--ADMIN_ADMINS_MODE_DENY--}'), $content['mode']);
                        } else {
                                // Don't allow it
                                $content['mode'] = '&nbsp;';
                        }
-                       $content['la_mode'] = generateOptionList('/ARRAY/', array('global', 'OLD', 'NEW'), array('{--ADMINS_GLOBAL_LA_SETTING--}', '{--ADMINS_OLD_LA_SETTING--}', '{--ADMINS_NEW_LA_SETTING--}'), $content['la_mode']);
+                       $content['la_mode'] = generateOptionList('/ARRAY/', array('global', 'OLD', 'NEW'), array('{--ADMIN_ADMINS_LA_MODE_GLOBAL--}', '{--ADMIN_ADMINS_LA_MODE_OLD--}', '{--ADMINS_NEW_LA_SETTING--}'), $content['la_mode']);
 
                        // Load row template and switch color
                        $OUT .= loadTemplate('admin_edit_admins_row', true, $content);
@@ -347,8 +347,8 @@ function adminsDeleteAdminAccount ($postData) {
                        if (SQL_NUMROWS($result) == 1) {
                                // Entry found, so load data
                                $content = SQL_FETCHARRAY($result);
-                               $content['mode']    = '{--ADMINS_' . strtoupper($content['mode'])    . '_MODE--}';
-                               $content['la_mode'] = '{--ADMINS_' . strtoupper($content['la_mode']) . '_LA_SETTING--}';
+                               $content['mode']    = '{--ADMIN_ADMINS_MODE_' . strtoupper($content['mode'])    . '--}';
+                               $content['la_mode'] = '{--ADMIN_ADMINS_LA_MODE_' . strtoupper($content['la_mode']) . '--}';
 
                                // Prepare some more data
                                $content['id'] = $id;
index 1d19c8f..7f85ad4 100644 (file)
@@ -296,7 +296,7 @@ ORDER BY
                                                $OUT .= '[<a href="{%url=modules.php?module=admin&amp;action=' . $menu . '%}">';
                                        }
                                } else {
-                                       $OUT .= '<em style="cursor:help" class="notice" title="{%message,MENU_ACTION_404=' . $menu . '}">';
+                                       $OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_ACTION_404=' . $menu . '}">';
                                }
 
                                $OUT .= $title;
@@ -358,7 +358,7 @@ ORDER BY
                                                                        $OUT .= '[<a href="{%url=modules.php?module=admin&amp;what=' . $what_sub . '%}">';
                                                                }
                                                        } else {
-                                                               $OUT .= '<em style="cursor:help" class="notice" title="{%message,MENU_WHAT_404=' . $what_sub . '%}">';
+                                                               $OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_WHAT_404=' . $what_sub . '%}">';
                                                        }
 
                                                        $OUT .= $title_what;
index b4783ca..1674350 100644 (file)
@@ -48,18 +48,18 @@ if ((isFormSent()) && (isGetRequestParameterSet('admin'))) {
        if ((isExtensionActive('msg')) && (postRequestParameter('type') == 'message')) {
                // Add message
                $message = loadEmailTemplate('admins_msg_contct_admin', postRequestParameter('text'), 0);
-               sendAdminMessage(getRequestParameter('admin'), '{--ADMINS_MSG_FROM_ADMIN--}', $message);
+               sendAdminMessage(getRequestParameter('admin'), '{--ADMIN_ADMINS_MESSAGE_FROM_ADMIN--}', $message);
        } else {
                // Load admin's email address
                $email = getAdminEmail(bigintval(getRequestParameter('admin')));
 
                // Load email template and send the mail to the admin
                $message = loadEmailTemplate('admins_mail_contct_admin', postRequestParameter('text'), 0);
-               sendEmail($email, '{--ADMINS_MSG_FROM_ADMIN--}', $message);
+               sendEmail($email, '{--ADMIN_ADMINS_MESSAGE_FROM_ADMIN--}', $message);
        }
 
        // Mail / message dropped
-       displayMessage('{--ADMINS_ADMIN_CONTACTED--}');
+       displayMessage('{--ADMIN_ADMINS_ADMIN_CONTACTED--}');
 } elseif (isGetRequestParameterSet('admin')) {
        // Load contact form template
        $content['admin'] = getRequestParameter('admin');
@@ -76,7 +76,7 @@ if ((isFormSent()) && (isGetRequestParameterSet('admin'))) {
        loadTemplate('admin_admins_contct_form', false, $content);
 } else {
        // Please select an admin!
-       displayMessage('{--ADMINS_SELECT_ADMIN--}');
+       displayMessage('{--ADMIN_ADMINS_SELECT_ADMIN--}');
 }
 
 // [EOF]
index ca5ff34..f697968 100644 (file)
@@ -60,11 +60,11 @@ if (isFormSent('edit')) {
                                $OUT .= '<select name="admin_id[' . $content['id'] . ']" size="1" class="form_select">
 <option value="0"';
                                if ($content['admin_id'] == '0') $OUT .= ' selected="selected"';
-                               $OUT .= '>{--ADMINS_ALL_ADMINS--}</option>';
+                               $OUT .= '>{--ADMIN_TO_ALL_ADMINS--}</option>';
                                if (isExtensionActive('events')) {
                                        $OUT .= '<option value="-1"';
                                        if ($content['admin_id'] == '-1') $OUT .= ' selected="selected"';
-                                       $OUT .= '>{--ADMINS_TO_USER_EVENTS--}</option>';
+                                       $OUT .= '>{--ADMIN_ADMINS_TO_USER_EVENTS--}</option>';
                                }
                                $OUT .= generateOptionList('admins', 'id', 'login', $content['admin_id'], 'email');
                                $OUT .= '</select>';
@@ -178,7 +178,7 @@ ORDER BY
                loadTemplate('admin_admins_mails_list', false, $OUT);
        } else {
                // No entries found
-               displayMessage('{--ADMINS_MAILS_NO_ENTRIES--}');
+               displayMessage('{--ADMIN_ADMINS_MAILS_NO_ENTRIES--}');
        }
 }
 
index 0dce8b6..f98b503 100644 (file)
@@ -65,8 +65,8 @@ if ((isFormSent('edit')) && (ifPostContainsSelections())) {
                                '/ARRAY/',
                                array('allow', 'deny'),
                                array(
-                                       '{--ADMINS_ALLOW_MODE--}',
-                                       '{--ADMINS_DENY_MODE--}'
+                                       '{--ADMIN_ADMINS_MODE_ALLOW--}',
+                                       '{--ADMIN_ADMINS_MODE_DENY--}'
                                ),
                                $content['access_mode']
                        ),
@@ -85,17 +85,27 @@ if ((isFormSent('edit')) && (ifPostContainsSelections())) {
                $id = bigintval($id);
 
                // Update entries
-               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admins_acls` SET admin_id=%s, action_menu='%s', what_menu='%s', access_mode='%s' WHERE `id`=%s LIMIT 1",
-               array(
-                       postRequestParameter('admin', $id),
-                       postRequestParameter('action_menu', $id),
-                       postRequestParameter('what_menu', $id),
-                       postRequestParameter('mode', $id),
-                       $id
-               ),__FILE__, __LINE__);
+               SQL_QUERY_ESC("UPDATE
+       `{?_MYSQL_PREFIX?}_admins_acls`
+SET
+       `admin_id`=%s,
+       `action_menu`='%s',
+       `what_menu`='%s',
+       `access_mode`='%s'
+WHERE
+       `id`=%s
+LIMIT 1",
+                       array(
+                               postRequestParameter('admin', $id),
+                               postRequestParameter('action_menu', $id),
+                               postRequestParameter('what_menu', $id),
+                               postRequestParameter('mode', $id),
+                               $id
+                       ),__FILE__, __LINE__);
        } // END - foreach
 
        // Update cache when installed
+       // @TODO Rewrite this to a filter
        if (isExtensionActive('cache')) {
                if ($GLOBALS['cache_instance']->loadCacheFile('admin_acls')) $GLOBALS['cache_instance']->removeCacheFile();
        } // END - if
@@ -113,7 +123,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections())) {
                SQL_FREERESULT($result);
 
                // Get admin mode
-               $content['access_mode'] = '{--ADMINS_' . strtoupper($content['access_mode']) . '_MODE--}';
+               $content['access_mode'] = '{--ADMIN_ADMINS_MODE_' . strtoupper($content['access_mode']) . '--}';
 
                // Load row template and switch colors
                $OUT .= loadTemplate('admin_config_admins_del_row', true, $content);
@@ -223,8 +233,8 @@ VALUES ('%s','%s','%s','%s')",
                '/ARRAY/',
                array('allow', 'deny'),
                array(
-                       '{--ADMINS_ALLOW_MODE--}',
-                       '{--ADMINS_DENY_MODE--}'
+                       '{--ADMIN_ADMINS_MODE_ALLOW--}',
+                       '{--ADMIN_ADMINS_MODE_DENY--}'
                )
        );
 
index 7436f55..1a13eb1 100644 (file)
@@ -260,7 +260,7 @@ ORDER BY
                                                $OUT .= '<a name="menu" class="menu_blur" href="{%url=modules.php?module=' . getModule() . '&amp;what=' . $content['sub_what'] . '%}" target="_self">';
                                        } else {
                                                // Not found - open
-                                               $OUT .= '<em style="cursor:help" class="notice" title="{%message,MENU_WHAT_404=' . $content['sub_what'] . '%}">';
+                                               $OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_WHAT_404=' . $content['sub_what'] . '%}">';
                                        }
 
                                        // Menu title
index 755f7b9..fc479bd 100644 (file)
@@ -1,5 +1,5 @@
 <tr>
        <td colspan="3" align="center" class="table_header bottom" height="28">
-       {--ADMINS_CONTACT_DEFAULT_MAIL--} <input type="hidden" name="type"
+       {--ADMIN_ADMINS_CONTACT_DEFAULT_MAIL--} <input type="hidden" name="type"
                value="mail"></td>
 </tr>
index 391c907..f6f4f7c 100644 (file)
@@ -3,12 +3,12 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <!-- @TODO Shouldn't we add a title here? //-->
        <tr>
-               <td class="header_column bottom" align="right" height="28"><strong>{--ADMINS_ADMIN_ID--}:</strong></td>
+               <td class="header_column bottom" align="right" height="28"><strong>{--ADMIN_ADMINS_ADMIN_ID--}:</strong></td>
                <td class="header_column bottom" align="left"><strong>$content[admin]</strong></td>
        </tr>
        <tr>
                <td class="bottom" colspan="2" align="center">
-                       {--ADMINS_ENTER_CONTACT_TEXT--}:<br />
+                       {--ADMIN_ADMINS_ENTER_CONTACT_TEXT--}:<br />
                        <textarea class="form_field" name="text" rows="5" cols="40"></textarea>
                </td>
        </tr>
@@ -16,7 +16,7 @@
        <tr>
                <td class="table_footer" align="center" colspan="2">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="ok" value="{--ADMINS_CONTACT_SUBMIT--}" />
+                       <input type="submit" class="form_submit" name="ok" value="{--ADMIN_ADMINS_CONTACT_SUBMIT--}" />
                </td>
        </tr>
 </table>
index 7bae21f..623af8a 100644 (file)
@@ -1,13 +1,13 @@
 <tr>
        <td colspan="2" align="center" class="table_header bottom" height="28">
-               {--ADMINS_SELECT_CONTACT_TYPE--}
+               {--ADMIN_ADMINS_SELECT_CONTACT_TYPE--}
        </td>
 </tr>
 <tr>
        <td align="right">
-               <input type="radio" class="form_field" name="type" value="mail" checked="checked" /> {--ADMINS_CONTACT_TYPE_MAIL--}
+               <input type="radio" class="form_field" name="type" value="mail" checked="checked" /> {--ADMIN_ADMINS_CONTACT_TYPE_MAIL--}
        </td>
        <td>
-               <input type="radio" class="form_field" name="type" value="message" /> {--ADMINS_CONTACT_TYPE_MSG--}
+               <input type="radio" class="form_field" name="type" value="message" /> {--ADMIN_ADMINS_CONTACT_TYPE_MSG--}
        </td>
 </tr>
index 4f758d3..15ad9fb 100644 (file)
@@ -3,7 +3,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="2" align="center" class="table_header">
-                       <strong>{--ADMINS_MAILS_EDIT_TITLE--}</strong>
+                       <strong>{--ADMIN_EDIT_ADMINS_MAILS_TITLE--}</strong>
                </td>
        </tr>
        <tr>
@@ -18,7 +18,7 @@
        <tr>
                <td colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
-                       <input type="submit" class="form_submit" name="change" value="{--ADMIN_ADMINS_CHANGE--}" />
+                       <input type="submit" class="form_submit" name="change" value="{--ADMIN_EDIT_ADMINS_MAILS_SUBMIT--}" />
                </td>
        </tr>
 </table>
index 172816f..ebccf98 100644 (file)
@@ -1,8 +1,10 @@
-<div class="tiny">{--ADMINS_ADD_MORE_ADMINS--}:</div>
-<br />
-<select name="admin_new[$content[mail_template]]" size="1"
-       class="form_select">
-       <option value="x">{--SELECT_NONE--}</option>
-       $content[admins]
-</select>
-<br />
+<div class="tiny">
+       {--ADMIN_ADMINS_ADD_MORE_ADMINS--}:
+</div>
+
+<div>
+       <select name="admin_new[$content[mail_template]]" size="1" class="form_select">
+               <option value="x">{--SELECT_NONE--}</option>
+               $content[admins]
+       </select>
+</div>
index 38fe535..209cdf2 100644 (file)
@@ -3,7 +3,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="3" align="center" class="table_header bottom">
-                       <strong>{--ADMINS_MAILS_TITLE--}</strong>
+                       <strong>{--ADMIN_LIST_ADMINS_MAILS_TITLE--}</strong>
                </td>
        </tr>
        <tr>
index 98a2176..71b81cc 100644 (file)
@@ -3,11 +3,11 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td class="table_header bottom" colspan="2" align="center">
-                       <strong>{--ADMIN_ACTIVE_SETTINGS--}:</strong>
+                       <strong>{--ADMIN_CONFIG_ACTIVE_SETTINGS_TITLE--}:</strong>
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right">{--ADMIN_ACTIVE_LIMIT--}:</td>
+               <td class="bottom" align="right">{--ADMIN_CONFIG_ACTIVE_LIMIT--}:</td>
                <td class="bottom" align="center">
                        <input type="input" name="active_limit" class="form_field" value="{?active_limit?}" size="5" maxlength="20" />
                </td>
index 6f4d268..1dbdbf4 100644 (file)
@@ -8,17 +8,17 @@
        </tr>
        <tr>
                <td align="center" class="header_column bottom right" width="30"><strong>{--ID_SELECT--}</strong></td>
-               <td align="center" class="header_column bottom right" width="120"><strong>{--ADMINS_AID--}:</strong></td>
-               <td align="center" class="header_column bottom right" width="204"><strong>{--MENU_ACTION--}:</strong></td>
-               <td align="center" class="header_column bottom right" width="204"><strong>{--MENU_WHAT--}:</strong></td>
+               <td align="center" class="header_column bottom right" width="120"><strong>{--ADMIN_ADMINS_LOGIN_ID--}:</strong></td>
+               <td align="center" class="header_column bottom right" width="204"><strong>{--ADMIN_MENU_ACTION--}:</strong></td>
+               <td align="center" class="header_column bottom right" width="204"><strong>{--ADMIN_MENU_WHAT--}:</strong></td>
                <td align="center" class="header_column bottom" width="120"><strong>{--ADMIN_ADMINS_ACCESS_MODE--}:</strong></td>
        </tr>
        $content
        <tr>
                <td colspan="5" class="table_footer">
                        <input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
-                       <input type="submit" class="form_submit" name="edit" value="{--ADMINS_EDIT_ACLS--}" />
-                       <input type="submit" class="form_delete" name="delete" value="{--ADMINS_DELETE_ACLS--}" />
+                       <input type="submit" class="form_submit" name="edit" value="{--ADMIN_ADMINS_EDIT_ACLS_SUBMIT--}" />
+                       <input type="submit" class="form_delete" name="delete" value="{--ADMIN_ADMINS_DELETE_ACLS_SUBMIT--}" />
                </td>
        </tr>
 </table>
index 04d7684..a7cc983 100644 (file)
@@ -8,16 +8,16 @@
        </tr>
        <tr>
                <td align="center" class="header_column bottom right" width="30"><strong>{--ID_SELECT--}</strong></td>
-               <td align="center" class="header_column bottom right" width="120"><strong>{--ADMINS_AID--}:</strong></td>
-               <td align="center" class="header_column bottom right" width="204"><strong>{--MENU_ACTION--}:</strong></td>
-               <td align="center" class="header_column bottom right" width="204"><strong>{--MENU_WHAT--}:</strong></td>
+               <td align="center" class="header_column bottom right" width="120"><strong>{--ADMIN_ADMINS_LOGIN_ID--}:</strong></td>
+               <td align="center" class="header_column bottom right" width="204"><strong>{--ADMIN_MENU_ACTION--}:</strong></td>
+               <td align="center" class="header_column bottom right" width="204"><strong>{--ADMIN_MENU_WHAT--}:</strong></td>
                <td align="center" class="header_column bottom" width="120"><strong>{--ADMIN_ADMINS_ACCESS_MODE--}:</strong></td>
        </tr>
        $content
        <tr>
                <td colspan="5" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" name="remove" class="form_delete" value="{--ADMINS_REMOVE_ACLS--}" />
+                       <input type="submit" name="remove" class="form_delete" value="{--ADMIN_ADMINS_REMOVE_ACLS_SUBMIT--}" />
                </td>
        </tr>
 </table>
index 36f509f..239c779 100644 (file)
@@ -8,16 +8,16 @@
        </tr>
        <tr>
                <td align="center" class="header_column bottom right" width="30"><strong>{--ID_SELECT--}</strong></td>
-               <td align="center" class="header_column bottom right" width="120"><strong>{--ADMINS_AID--}:</strong></td>
-               <td align="center" class="header_column bottom right" width="204"><strong>{--MENU_ACTION--}:</strong></td>
-               <td align="center" class="header_column bottom right" width="204"><strong>{--MENU_WHAT--}:</strong></td>
+               <td align="center" class="header_column bottom right" width="120"><strong>{--ADMIN_ADMINS_LOGIN_ID--}:</strong></td>
+               <td align="center" class="header_column bottom right" width="204"><strong>{--ADMIN_MENU_ACTION--}:</strong></td>
+               <td align="center" class="header_column bottom right" width="204"><strong>{--ADMIN_MENU_WHAT--}:</strong></td>
                <td align="center" class="header_column bottom" width="120"><strong>{--ADMIN_ADMINS_ACCESS_MODE--}:</strong></td>
        </tr>
        $content
        <tr>
                <td colspan="5" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" class="form_submit" name="change" value="{--ADMINS_CHANGE_ACLS--}" />
+                       <input type="submit" class="form_submit" name="change" value="{--ADMIN_ADMINS_CHANGE_ACLS_SUBMIT--}" />
                </td>
        </tr>
 </table>
index 97f9683..66021b6 100644 (file)
@@ -2,18 +2,18 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td colspan="3" align="center" class="table_header">
-                       <strong>{--ADMIN_CONFIG_HOME--}</strong>
+                       <strong>{--ADMIN_CONFIG_SET_HOME--}</strong>
                </td>
        </tr>
        <tr>
                <td align="center" class="header_column bottom right"><strong>{--ID_SELECT--}</strong></td>
-               <td align="center" class="header_column bottom right"><strong>{--MENU_WHAT--}</strong></td>
-               <td align="center" class="header_column bottom"><strong>{--HOME_ACTION--}</strong></td>
+               <td align="center" class="header_column bottom right"><strong>{--ADMIN_MENU_WHAT--}</strong></td>
+               <td align="center" class="header_column bottom"><strong>{--ADMIN_HOME_ACTION--}</strong></td>
        </tr>
        $content
        <tr>
                <td colspan="3" class="table_footer">
-                       <div class="notice">{--HOME_BOTTOM_NOTE--}</div>
+                       <div class="notice">{--ADMIN_CONFIG_SET_HOME_NOTE--}</div>
                </td>
        </tr>
 </table>
index 24dcf21..2562746 100644 (file)
@@ -11,8 +11,8 @@
        <td align="center" width="10%" class="header_column bottom right"><strong>{--REMOTE_IP--}:</strong></td>
        <td align="center" width="5%" class="header_column bottom right"><strong>{--_REFID--}:</strong></td>
        <td align="center" width="10%" class="header_column bottom right"><strong>{--_MODULE--}:</strong></td>
-       <td align="center" width="10%" class="header_column bottom right"><strong>{--MENU_ACTION--}:</strong></td>
-       <td align="center" width="5%" class="header_column bottom right"><strong>{--MENU_WHAT--}:</strong></td>
+       <td align="center" width="10%" class="header_column bottom right"><strong>{--ADMIN_MENU_ACTION--}:</strong></td>
+       <td align="center" width="5%" class="header_column bottom right"><strong>{--ADMIN_MENU_WHAT--}:</strong></td>
        <td align="center" width="10%" class="header_column bottom"><strong>{--LAST_SEEN--}:</strong></td>
 </tr>
 $content[rows]