Naming convention applied to language strings, new API function added:

- Naming convention applied on many language strings (guest/admin)
- New API function getConfirmationMessageFromUserStatus() introduced
- TODOs.txt updated

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index ecde42a1f5b48991284c2156a2ca0df1c39e8200..1ae53b9adc727c764d6af8d3260f3a238b066ee5 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -49,10 +49,10 @@
 ./inc/functions.php:2261:      // @TODO This is still very static, rewrite it somehow
 ./inc/gen_sql_patches.php:96:// @TODO Rewrite this to a filter
 ./inc/install-functions.php:59:        // @TODO DEACTIVATED: changeDataInFile(getCachePath() . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0);
-./inc/language/de.php:1099:// @TODO Rewrite these two constants
-./inc/language/de.php:1114:// @TODO Rewrite these three constants
+./inc/language/de.php:1101:// @TODO Rewrite these two constants
+./inc/language/de.php:1116:// @TODO Rewrite these three constants
 ./inc/language/de.php:300:     // @TODO Following two are unused?
-./inc/language/de.php:799:// @TODO Are these constants longer used?
+./inc/language/de.php:801:// @TODO Are these constants longer used?
 ./inc/language-functions.php:234:      // @TODO These are all valid languages, again hard-coded
 ./inc/language-functions.php:46:// @TODO Rewrite all language constants to this function.
 ./inc/language/newsletter_de.php:13: * @TODO This language file is completely out-dated, please do no       *

diff --git a/inc/language/de.php b/inc/language/de.php
index 96f5900eaae04c5929afdd7fb9a112dfd9322159..21f6321240a271c8bec30d122f37ffa67d747067 100644 (file)
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -127,9 +127,9 @@ addMessages(array(
        'YOU_ARE_HERE' => "Sie sind hier:",
        'ID_SELECT' => "ID:",
        'KEY_SELECT' => "Eintrag:",
-       'DISPLAY_ACTION' => "Aktion",
-       'DISPLAY_WHAT' => "Unteraktion",
-       'DISPLAY_TITLE' => "Titel",
+       'ADMIN_DISPLAY_ACTION' => "Aktion",
+       'ADMIN_DISPLAY_WHAT' => "Unteraktion",
+       'ADMIN_DISPLAY_TITLE' => "Titel",
        'UNDO_SELECTIONS' => "Auswahl zurücknehmen",
        'ADMIN_EDIT_MENUS' => "Menüs bearbeiten",
        'ADMIN_DELETE_MENUS' => "Menüs löschen",
@@ -149,16 +149,16 @@ addMessages(array(
        'ADMIN_ADD_MENU' => "Menü hinzufügen",
        'ADMIN_ENTER_TITLE' => "Geben Sie den Linktitel zum neuen Menüpunkt ein",
        'ADMIN_SELECT_PARENT_MENU' => "Wählen Sie das übergeordnete Hauptmenü aus",
-       'IS_TOP_MENU' => "Ist ein Hauptmenü",
+       'ADMIN_IS_TOP_MENU' => "Ist ein Hauptmenü",
        'ADMIN_SELECT_WHAT_NAME' => "Wählen Sie den passenden Suffix aus der Liste aus",
-       'ENTER_DESCR' => "Geben Sie eine kurze aussagekräftige Beschreibung des Menüpunktes ein",
+       'ADMIN_ENTER_MENU_DESCRIPTION' => "Geben Sie eine kurze aussagekräftige Beschreibung des Menüpunktes ein",
        'ADMIN_SELECT_BELOW_MENU' => "Wählen Sie den Menüpunkt aus, unterhalb dem der neue Punkt erscheinen soll",
        'ADMIN_EDIT_DESCRIPTION' => "Beschreibung ändern",
-       'CREATE_WHAT_FIRST' => "Bitte erstellen Sie zuerst die what-xxxxx.php Datei. Dann können Sie sie hier auswählen.",
-       'MENU_IS_VISIBLE' => "Menüpunkt ist sichtbar",
-       'MENU_IS_ACTIVE' => "Menüpunkt ist aktiviert",
-       'CREATE_ACTION_FIRST' => "Bitte erstellen Sie zuerst die action-xxxxx.php Datei. Dann können Sie sie hier auswählen.",
-       'IS_FIRST_MENU' => "Ist das erste Hauptmenü",
+       'ADMIN_CREATE_WHAT_FIRST' => "Bitte erstellen Sie zuerst die what-xxxxx.php Datei. Dann können Sie sie hier auswählen.",
+       'ADMIN_MENU_IS_VISIBLE' => "Menüpunkt ist sichtbar",
+       'ADMIN_MENU_IS_ACTIVE' => "Menüpunkt ist aktiviert",
+       'ADMIN_CREATE_ACTION_FIRST' => "Bitte erstellen Sie zuerst die action-xxxxx.php Datei. Dann können Sie sie hier auswählen.",
+       'ADMIN_IS_FIRST_MENU' => "Ist das erste Hauptmenü",
        'NO_DB_LINK' => "Keine Verbindung zur Datenbank.",
        'NO_DB_LINK_SHUTDOWN' => "Keine Verbindung zur Datenbank beim Schliessen der Verbindung.",
        'MYSQL_DATA_MISSING' => "Die Konfiguration Ihrer Datenbankverbindung ist unnvollst&auml;ndig. Bitte in <strong>{?CACHE_PATH?}/config-local.php</strong> mindestens den Hostnamen, Datenbanknamen und Login zur Datenbank eingeben.",
@@ -710,12 +710,14 @@ addMessages(array(
        'GUEST_STATS_MODULES' => "Klicks in allen Modulen (TOP-10)",
        'GUEST_STATS_MEMBERS' => "Statistiken &uuml;ber unsere Mitglieder",
        'ADMIN_EDIT_REFERAL_BANNER_TITLE' => "Werbebanner editieren",
-       'REQUEST_CONFIRM_LINK_TITLE' => "Best&auml;tigungslink erneut anfordern",
+       'GUEST_LOGIN_ID_UNKNOWN_STATUS' => "Ihr Account weist einen unbekannten Status <span class=\"data\">%s</span> auf. Bitte melden Sie sich beim Support.",
+       'GUEST_REQUEST_CONFIRM_LINK_TITLE' => "Best&auml;tigungslink erneut anfordern",
        'GUEST_CONFIRM_LINK_NOTE' => "Sie haben Ihren Best&auml;tigungslink verlegt? Kein Problem, hier k&ouml;nnen Sie ihn erneut anfordern. Geben Sie einfach Ihre angemeldete eMail-Adresse an. Der Link wird Ihnen dann per Mail zugesandt.",
-       'REQUEST_CONFIRM_LINK' => "Erneut anfordern",
-       'LOGIN_ID_CONFIRMED' => "Sie haben bereits Ihre E-Mail Adresse best&auml;tigt.",
-       'CONFIRM_LINK_SENT' => "Der Best&auml;tigungslink wurde an Ihre E-Mail Adresse ausgesandt.",
-       'REQUEST_CONFIRM_LINK_SUBJECT' => "Anforderung Ihres Best&auml;tigunglinkes",
+       'GUEST_REQUEST_CONFIRM_LINK' => "Erneut anfordern",
+       'GUEST_LOGIN_ID_CONFIRMED' => "Sie haben bereits Ihre E-Mail Adresse best&auml;tigt.",
+       'GUEST_LOGIN_ID_LOCKED' => "Ihr Account ist gesperrt. Bitte melden Sie sich beim Support.",
+       'GUEST_CONFIRM_LINK_SENT' => "Der Best&auml;tigungslink wurde an Ihre E-Mail Adresse ausgesandt.",
+       'GUEST_REQUEST_CONFIRM_LINK_SUBJECT' => "Anforderung Ihres Best&auml;tigunglinkes",
        'EMAIL_404' => "Unter der angegebenen E-Mail Adresse konnten wir keinen Account finden! Bitte versuchen Sie es erneut.",
        'SELECT_NONE' => "Keine/s/r",
        'ADMIN_CONFIG_STATS_TITLE' => "Einstellungen an den Gast-Statistiken",
@@ -726,7 +728,7 @@ addMessages(array(
        'ADMIN_GSTATS_MODULES_NOTE' => "Zeigt Klicks in den 10 am h&auml;ufigsten angeklickten Gast- und Mitgliedsmodulen an.",
        'ADMIN_GSTATS_INACTIVE_NOTE' => "Deaktiviert die Gast-Statistiken komplett.",
        'ADMIN_DELETE_PAYMENT_TITLE' => "Mailverg&uuml;tungen l&ouml;schen",
-       'REFERAL_PAYOUT' => "Wie viele Mails m&uuml;ssen die Mitglieder mindestens best&auml;tigen, um den Willkommensbonus, einmaliger Referal-Bonus usw. gutgeschrieben zu bekommen?",
+       'ADMIN_CONFIG_REFERAL_PAYOUT' => "Wie viele Mails m&uuml;ssen die Mitglieder mindestens best&auml;tigen, um den Willkommensbonus, einmaliger Referal-Bonus usw. gutgeschrieben zu bekommen?",
        'ADMIN_EXTENSION_UPDATED' => "Erweiterung aktualisiert.",
        'ADMIN_UPDATE_EXTENSION_SUBJECT' => "Erweiterung-Update installiert",
        'MEMBER_ORDER_PAGE1_INTRO' => "Mailbuchung - Schritt 1 von 4: PLZ eingeben",
@@ -739,9 +741,9 @@ addMessages(array(
        'LOCKED_POINTS' => "Nicht verg&uuml;tete {?POINTS?}",
        'LAST_UPDATE' => "Letzte Profil&auml;nderung",
        'LAST_PROFILE_SENT' => "Erinnerung gesendet",
-       'USER_REFERAL_PAYOUT' => "Noch zu best. Mails",
+       'ADMIN_USER_REFERAL_PAYOUT' => "Noch zu best. Mails",
        'DISPLAY_REFID' => "Ref-Id anzeigen",
-       'SORT_NAVIGATION' => "Sortieren",
+       'ADMIN_SORT_NAVIGATION' => "Sortieren",
        'HIGHER' => "H&ouml;her",
        'LOWER' => "Niedriger",
        'MEMBER_SETTINGS_SAVED' => "Einstellungen gespeichert.",

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 4a24b2d73bbd37c49e4334163e4f45e2362b7f29..c3304a72fee35db3c32684f3d7932a8b34cb5dc3 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -651,36 +651,59 @@ LIMIT 1",
 
 // Does resend the user's confirmation link for given email address
 function doResendUserConfirmationLink ($email) {
+       // Email address not registered is default message
+       $message = '{--EMAIL_404--}';
+
        // Confirmation link requested
        if (fetchUserData($email, 'email')) {
                // Email address found
                $content = getUserDataArray();
 
-               // Detect status
-               switch ($content['status']) {
-                       case 'UNCONFIRMED': // Account not confirmed
-                               // Load email template
-                               $message = loadEmailTemplate('guest_request_confirm', array('hash' => $content['user_hash']), $content['userid']);
+               // Is the account unconfirmed?
+               if ($content['status'] == 'UNCONFIRMED') {
+                       // Load email template
+                       $message = loadEmailTemplate('guest_request_confirm', array('hash' => $content['user_hash']), $content['userid']);
 
-                               // Send email
-                               sendEmail($email, '{--REQUEST_CONFIRM_LINK_SUBJECT--}', $message);
+                       // Send email
+                       sendEmail($email, '{--GUEST_REQUEST_CONFIRM_LINK_SUBJECT--}', $message);
+               } // END - if
 
-                               // And set message
-                               $content['message'] = '{--CONFIRM_LINK_SENT--}';
-                               break;
+               // Create message based on the status
+               $message = getConfirmationMessageFromUserStatus($content['status']);
+       } // END - if
 
-                       case 'CONFIRMED': // Account already confirmed
-                               $content['message'] = '{--LOGIN_ID_CONFIRMED--}';
-                               break;
+       // Output message
+       loadTemplate('admin_settings_saved', false, $message);
+}
 
-                       case 'LOCKED': // Account is locked
-                               $content['message'] = '{--LOGIN_ID_LOCKED--}';
-                               break;
-               } // END - switch
-       } else {
-               // Email address not registered
-               $content['message'] = '{--EMAIL_404--}';
-       }
+// Get a message (somewhat translation) from user status for confirmation link.
+// This is different to translateUserStatus() in text messages.
+function getConfirmationMessageFromUserStatus ($status) {
+       // Default is 'UNKNOWN'
+       $message = getMaskedMessage('GUEST_LOGIN_ID_UNKNOWN_STATUS', $status);
+
+       // Which status is it?
+       switch ($status) {
+               case 'UNCONFIRMED': // Account is unconfirmed
+                       // And set message
+                       $message = '{--GUEST_CONFIRM_LINK_SENT--}';
+                       break;
+
+               case 'CONFIRMED': // Account already confirmed
+                       $message = '{--GUEST_LOGIN_ID_CONFIRMED--}';
+                       break;
+
+               case 'LOCKED': // Account is locked
+                       $message = '{--GUEST_LOGIN_ID_LOCKED--}';
+                       break;
+
+               default: // This should not happen
+                       debug_report_bug(__FUNCTION__, __LINE__, 'Unknown user status ' . $status . ' detected.');
+                       break;
+       } // END - switch
+
+       // Return message
+       return $message;
 }
 
 // Expression call-back function for fetching user data

diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index df3a61d2e1332d79cc6db03b22193adcc3f89305..d22f14cc417c3b93a5b6eb9b40d2eb58827e77c9 100644 (file)
--- a/inc/libs/wernis_functions.php
+++ b/inc/libs/wernis_functions.php
@@ -320,6 +320,8 @@ function WERNIS_EXECUTE_PAYOUT ($wdsId, $amount) {
 function translateWernisTransferStatus ($status) {
        // Default status
        $return = getMaskedMessage('WERNIS_STATUS_UNKNWOWN', $status);
+
+       // Which status?
        switch ($status) {
                case 'IN': // Withdraw
                        $return = '{--WERNIS_STATUS_WITHDRAW--}';
@@ -332,7 +334,7 @@ function translateWernisTransferStatus ($status) {
                case 'FAILED': // Payout
                        $return = '{--WERNIS_STATUS_FAILED--}';
                        break;
-       }
+       } // END - switch
 
        // Return the status
        return $return;

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 9a3c519451559394035eaff311f7f65e0571a03e..7638b2fc067c98e0dd2b0ae7e9fa1ba180398ac4 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -589,7 +589,7 @@ function adminAddMenuSelectionBox ($menu, $type, $name, $default = '') {
        $menuArray = getArrayFromDirectory(sprintf("inc/modules/%s/", $menu), '', false, false);
 
        // Init the selection box
-       $OUT = '<select name="' . $name . '" class="form_select" size="1"><option value="">{--IS_TOP_MENU--}</option>';
+       $OUT = '<select name="' . $name . '" class="form_select" size="1"><option value="">{--ADMIN_IS_TOP_MENU--}</option>';
 
        // Walk through all files
        foreach ($menuArray as $file) {

diff --git a/inc/modules/admin/what-admin_add.php b/inc/modules/admin/what-admin_add.php
index a661994fc2ed202d2b7e7e7ffac203f81ac30aa8..c5ae169766daf58e12dc92da595d2360c360a90f 100644 (file)
--- a/inc/modules/admin/what-admin_add.php
+++ b/inc/modules/admin/what-admin_add.php
@@ -136,7 +136,7 @@ if (!isFormSent()) {
        }
 
        $OUT = '    <select class="form_select" name="sort" size="1">
-      <option value="0">{--IS_FIRST_MENU--}</option>';
+      <option value="0">{--ADMIN_IS_FIRST_MENU--}</option>';
        foreach ($below as $key => $m) {
                if (is_array($m)) {
                        foreach ($m as $key2 => $m2) {

diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php
index 7ddbce146220f3c7259db959696e92563fcf3b43..14383f6230a96fa7f5605c8f15a4f48d103eb509 100644 (file)
--- a/inc/modules/admin/what-guest_add.php
+++ b/inc/modules/admin/what-guest_add.php
@@ -155,7 +155,7 @@ ORDER BY `sort` ASC",
        SQL_FREERESULT($result_menu);
 
        $OUT = '<select class="form_select" name="sort" size="1">
-      <option value="0">{--IS_FIRST_MENU--}</option>';
+      <option value="0">{--ADMIN_IS_FIRST_MENU--}</option>';
        foreach ($below as $key => $m) {
                if (is_array($m)) {
                        foreach ($m as $key2 => $m2) {

diff --git a/inc/modules/admin/what-mem_add.php b/inc/modules/admin/what-mem_add.php
index 78e06a63aba82f7ece5016af475cfa09057cd293..6986b682b8fed51829eb472377c3eea973d1e337 100644 (file)
--- a/inc/modules/admin/what-mem_add.php
+++ b/inc/modules/admin/what-mem_add.php
@@ -144,7 +144,7 @@ if (!isFormSent()) {
        } // END - if
 
        $OUT = '<select class="form_select" name="sort" size="1">
-      <option value="">{--IS_FIRST_MENU--}</option>';
+      <option value="">{--ADMIN_IS_FIRST_MENU--}</option>';
        foreach ($below as $key => $m) {
                if (is_array($m)) {
                        foreach ($m as $key2 => $m2) {

diff --git a/templates/de/html/admin/admin_add_admin_menu.tpl b/templates/de/html/admin/admin_add_admin_menu.tpl
index e0376529e78cd3759ba7430459c005b49b9e0438..590005581de5c91b5ab3253382e671d96b4a6e99 100644 (file)
--- a/templates/de/html/admin/admin_add_admin_menu.tpl
+++ b/templates/de/html/admin/admin_add_admin_menu.tpl
@@ -2,33 +2,33 @@
 <form accept-charset="utf-8" action="{%url=modules.php?module=admin&amp;what=admin_add%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
-               <td align="right" width="245">{--ENTER_TITLE--}:</td>
+               <td align="right" width="245">{--ADMIN_ENTER_TITLE--}:</td>
                <td width="245" align="center">
                        <input type="text" name="title" class="form_field" size="30" maxlength="50" />
                </td>
        </tr>
        <tr>
-               <td align="right">{--SELECT_WHAT_NAME--}:</td>
+               <td align="right">{--ADMIN_SELECT_WHAT_NAME--}:</td>
                <td align="center">
                        $content[what_selection]<br />
-                       <span class="notice">({--CREATE_WHAT_FIRST--})</span>
+                       <span class="notice">({--ADMIN_CREATE_WHAT_FIRST--})</span>
                </td>
        </tr>
        <tr>
-               <td align="right">{--SELECT_PARENT_MENU--}:</td>
+               <td align="right">{--ADMIN_SELECT_PARENT_MENU--}:</td>
                <td align="center">
                        $content[action_selection]<br />
-                       <span class="notice">({--CREATE_ACTION_FIRST--})</span>
+                       <span class="notice">({--ADMIN_CREATE_ACTION_FIRST--})</span>
                </td>
        </tr>
        <tr>
-               <td align="right">{--ENTER_DESCR--}:</td>
+               <td align="right">{--ADMIN_ENTER_MENU_DESCRIPTION--}:</td>
                <td align="center">
                        <textarea name="descr" rows="6" cols="45" class="form_field"></textarea>
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right">{--SELECT_BELOW_MENU--}:</td>
+               <td class="bottom" align="right">{--ADMIN_SELECT_BELOW_MENU--}:</td>
                <td class="bottom" align="center">$content[below_selection]</td>
        </tr>
        <tr>

diff --git a/templates/de/html/admin/admin_add_guest_menu.tpl b/templates/de/html/admin/admin_add_guest_menu.tpl
index cddf51f8f8a221c453536f5a8e081a1caa84f6e8..22fac0251630b4570589b055e818e49f7ce5ecb9 100644 (file)
--- a/templates/de/html/admin/admin_add_guest_menu.tpl
+++ b/templates/de/html/admin/admin_add_guest_menu.tpl
@@ -11,14 +11,14 @@
                <td align="right">{--ADMIN_SELECT_WHAT_NAME--}:</td>
                <td align="center">
                        $content[what_selection]<br />
-                       <span class="notice">({--CREATE_WHAT_FIRST--})</span>
+                       <span class="notice">({--ADMIN_CREATE_WHAT_FIRST--})</span>
                </td>
        </tr>
        <tr>
                <td align="right">{--ADMIN_SELECT_PARENT_MENU--}:</td>
                <td align="center">
                        $content[action_selection]<br />
-                       <span class="notice">({--CREATE_ACTION_FIRST--})</span>
+                       <span class="notice">({--ADMIN_CREATE_ACTION_FIRST--})</span>
                </td>
        </tr>
        <tr>
@@ -26,7 +26,7 @@
                <td align="center">$content[below_selection]</td>
        </tr>
        <tr>
-               <td align="right">{--MENU_IS_VISIBLE--}:</td>
+               <td align="right">{--ADMIN_MENU_IS_VISIBLE--}:</td>
                <td align="center">
                        <select class="form_select" name="visible" size="1">
                                <option value="Y">{--YES--}</option>
@@ -35,7 +35,7 @@
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right">{--MENU_IS_ACTIVE--}:</td>
+               <td class="bottom" align="right">{--ADMIN_MENU_IS_ACTIVE--}:</td>
                <td class="bottom" align="center">
                        <select class="form_select" name="active" size="1">
                                <option value="N">{--YES--}</option>

diff --git a/templates/de/html/admin/admin_add_member_menu.tpl b/templates/de/html/admin/admin_add_member_menu.tpl
index 26c80bfa12ff15457f58fbd21ef9a47ed0f3d1c0..337bf92ecd1cbc10eeff7d3d549bfc53527e9beb 100644 (file)
--- a/templates/de/html/admin/admin_add_member_menu.tpl
+++ b/templates/de/html/admin/admin_add_member_menu.tpl
@@ -11,14 +11,14 @@
                <td align="right">{--ADMIN_SELECT_WHAT_NAME--}:</td>
                <td align="center">
                        $content[what_selection]<br />
-                       <span class="notice">({--CREATE_WHAT_FIRST--})</span>
+                       <span class="notice">({--ADMIN_CREATE_WHAT_FIRST--})</span>
                </td>
        </tr>
        <tr>
                <td align="right">{--ADMIN_SELECT_PARENT_MENU--}:</td>
                <td align="center">
                        $content[action_selection]<br />
-                       <span class="notice">({--CREATE_ACTION_FIRST--})</span>
+                       <span class="notice">({--ADMIN_CREATE_ACTION_FIRST--})</span>
                </td>
        </tr>
        <tr>
@@ -26,7 +26,7 @@
                <td align="center">$content[below_selection]</td>
        </tr>
        <tr>
-               <td align="right">{--MENU_IS_VISIBLE--}:</td>
+               <td align="right">{--ADMIN_MENU_IS_VISIBLE--}:</td>
                <td align="center">
                        <select class="form_select" name="visible" size="1">
                                <option value="Y">{--YES--}</option>
@@ -35,7 +35,7 @@
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right">{--MENU_IS_ACTIVE--}:</td>
+               <td class="bottom" align="right">{--ADMIN_MENU_IS_ACTIVE--}:</td>
                <td class="bottom" align="center">
                        <select class="form_select" name="active" size="1">
                                <option value="N">{--YES--}</option>

diff --git a/templates/de/html/admin/admin_config_point_settings.tpl b/templates/de/html/admin/admin_config_point_settings.tpl
index b89749b6539564c4108d25b0c1645e4c7f0b12ca..e30a64c7234c3a187a8674af4c497b16849b3178 100644 (file)
--- a/templates/de/html/admin/admin_config_point_settings.tpl
+++ b/templates/de/html/admin/admin_config_point_settings.tpl
@@ -29,7 +29,7 @@
                </td>
        </tr>
        <tr>
-               <td class="bottom" align="right">{--REFERAL_PAYOUT--}</td>
+               <td class="bottom" align="right">{--ADMIN_CONFIG_REFERAL_PAYOUT--}</td>
                <td class="bottom" align="center">
                        <input type="text" name="ref_payout" class="form_field" size="3" maxlength="3" value="{?ref_payout?}" />
                </td>

diff --git a/templates/de/html/admin/admin_edit_admin_menu.tpl b/templates/de/html/admin/admin_edit_admin_menu.tpl
index 3752310dc49968315b64eb6fe581684fd1e5300b..3cbc7a4a47e8aa1d6176d45d861cc47ed7734c8b 100644 (file)
--- a/templates/de/html/admin/admin_edit_admin_menu.tpl
+++ b/templates/de/html/admin/admin_edit_admin_menu.tpl
@@ -4,10 +4,10 @@
 <!-- @TODO Shouldn't we add a title here? //-->
 <tr>
        <td class="header_column bottom right" align="center" width="30"><strong>{--ID_SELECT--}</strong></td>
-       <td class="header_column bottom right" align="center"><strong>{--DISPLAY_ACTION--}</strong></td>
-       <td class="header_column bottom right" align="center"><strong>{--DISPLAY_WHAT--}</strong></td>
-       <td class="header_column bottom right" align="center"><strong>{--DISPLAY_TITLE--}</strong></td>
-       <td class="header_column bottom" align="center"><strong>{--SORT_NAVIGATION--}</strong></td>
+       <td class="header_column bottom right" align="center"><strong>{--ADMIN_DISPLAY_ACTION--}</strong></td>
+       <td class="header_column bottom right" align="center"><strong>{--ADMIN_DISPLAY_WHAT--}</strong></td>
+       <td class="header_column bottom right" align="center"><strong>{--ADMIN_DISPLAY_TITLE--}</strong></td>
+       <td class="header_column bottom" align="center"><strong>{--ADMIN_SORT_NAVIGATION--}</strong></td>
 </tr>
 $content[rows]
 <tr>

diff --git a/templates/de/html/admin/admin_edit_guest_menu.tpl b/templates/de/html/admin/admin_edit_guest_menu.tpl
index ac820e047396d1a2ba31d294849f64ba00350cbd..4761f0b42704b1b5d04ed627385e18b7bf55faad 100644 (file)
--- a/templates/de/html/admin/admin_edit_guest_menu.tpl
+++ b/templates/de/html/admin/admin_edit_guest_menu.tpl
@@ -3,10 +3,10 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td class="header_column bottom right" align="center" width="30"><strong>{--ID_SELECT--}</strong></td>
-       <td class="header_column bottom right" align="center"><strong>{--DISPLAY_ACTION--}</strong></td>
-       <td class="header_column bottom right" align="center"><strong>{--DISPLAY_WHAT--}</strong></td>
-       <td class="header_column bottom right" align="center"><strong>{--DISPLAY_TITLE--}</strong></td>
-       <td class="header_column bottom" align="center"><strong>{--SORT_NAVIGATION--}</strong></td>
+       <td class="header_column bottom right" align="center"><strong>{--ADMIN_DISPLAY_ACTION--}</strong></td>
+       <td class="header_column bottom right" align="center"><strong>{--ADMIN_DISPLAY_WHAT--}</strong></td>
+       <td class="header_column bottom right" align="center"><strong>{--ADMIN_DISPLAY_TITLE--}</strong></td>
+       <td class="header_column bottom" align="center"><strong>{--ADMIN_SORT_NAVIGATION--}</strong></td>
 </tr>
 $content[rows]
 <tr>

diff --git a/templates/de/html/admin/admin_expert_settings_form.tpl b/templates/de/html/admin/admin_expert_settings_form.tpl
index f01f9e561a3c0af70d172cd87a286048ab7c13c0..189d3441a03fac9520ba5c29db7bcb219cdf6470 100644 (file)
--- a/templates/de/html/admin/admin_expert_settings_form.tpl
+++ b/templates/de/html/admin/admin_expert_settings_form.tpl
@@ -1,3 +1,4 @@
+<div align="center">
 <form accept-charset="utf-8" action="{%url=modules.php?dummy=1%}&amp;{%server,query_string%}" method="post">
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed" align="center">
        <tr>
@@ -26,3 +27,4 @@
        </tr>
 </table>
 </form>
+</div>

diff --git a/templates/de/html/admin/admin_member_menu_overview.tpl b/templates/de/html/admin/admin_member_menu_overview.tpl
index 3877dbd7a8ffed41cb48cdb543b7396ec3d17c6b..9a18d40a3c28d848960dae8d20e07028c0971d04 100644 (file)
--- a/templates/de/html/admin/admin_member_menu_overview.tpl
+++ b/templates/de/html/admin/admin_member_menu_overview.tpl
@@ -3,10 +3,10 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
 <tr>
        <td class="header_column bottom right" align="center" width="5%"><strong>{--ID_SELECT--}</strong></td>
-       <td class="header_column bottom right" align="center" width="25%"><strong>{--DISPLAY_ACTION--}</strong></td>
-       <td class="header_column bottom right" align="center" width="25%"><strong>{--DISPLAY_WHAT--}</strong></td>
-       <td class="header_column bottom right" align="center" width="25%"><strong>{--DISPLAY_TITLE--}</strong></td>
-       <td class="header_column bottom" align="center" width="20%"><strong>{--SORT_NAVIGATION--}</strong></td>
+       <td class="header_column bottom right" align="center" width="25%"><strong>{--ADMIN_DISPLAY_ACTION--}</strong></td>
+       <td class="header_column bottom right" align="center" width="25%"><strong>{--ADMIN_DISPLAY_WHAT--}</strong></td>
+       <td class="header_column bottom right" align="center" width="25%"><strong>{--ADMIN_DISPLAY_TITLE--}</strong></td>
+       <td class="header_column bottom" align="center" width="20%"><strong>{--ADMIN_SORT_NAVIGATION--}</strong></td>
 </tr>
 $content[rows]
 <tr>

diff --git a/templates/de/html/admin/admin_user_details.tpl b/templates/de/html/admin/admin_user_details.tpl
index c8ee13497c1dfaa66f339137b03c1d873fb50196..4082e56b8c3f1f073076ac169d29ad34d964b3fe 100644 (file)
--- a/templates/de/html/admin/admin_user_details.tpl
+++ b/templates/de/html/admin/admin_user_details.tpl
@@ -133,7 +133,7 @@
        </tr>
        <tr>
                <td align="center" class="top right">
-                       {--USER_REFERAL_PAYOUT--}:<br />
+                       {--ADMIN_USER_REFERAL_PAYOUT--}:<br />
                        <strong>$content[ref_payout]</strong>
                </td>
                <td align="center" class="top right">

diff --git a/templates/de/html/guest/guest_confirm_link.tpl b/templates/de/html/guest/guest_confirm_link.tpl
index 9364485c67eda691a5c8c56dc0144375562cae55..dd98e4f25c616be92d246f0149d9eb9fb49babdd 100644 (file)
--- a/templates/de/html/guest/guest_confirm_link.tpl
+++ b/templates/de/html/guest/guest_confirm_link.tpl
@@ -3,7 +3,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="table dashed">
        <tr>
                <td align="center" colspan="2" class="table_header bottom">
-                       <div class="big">{--REQUEST_CONFIRM_LINK_TITLE--}</div>
+                       <div class="big">{--GUEST_REQUEST_CONFIRM_LINK_TITLE--}</div>
                </td>
        </tr>
        <tr>
@@ -20,7 +20,7 @@
        <tr>
                <td align="center" colspan="2" class="table_footer">
                        <input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
-                       <input type="submit" name="ok" class="form_submit" value="{--REQUEST_CONFIRM_LINK--}" />
+                       <input type="submit" name="ok" class="form_submit" value="{--GUEST_REQUEST_CONFIRM_LINK--}" />
                </td>
        </tr>
 </table>