From: Roland Häder Date: Mon, 10 Jan 2011 09:06:13 +0000 (+0000) Subject: Fix for missing language string and variable renamed to better naming convention X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=9140111a2a60f5d20aef7139da8653d28a2a534c Fix for missing language string and variable renamed to better naming convention --- diff --git a/inc/language/de.php b/inc/language/de.php index 772503e97a..b5d97d0a83 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -407,6 +407,7 @@ addMessages(array( 'POOL_TYPE_NEW' => "Wartet auf Versand", 'POOL_TYPE_ACTIVE' => "Wird versendet", 'POOL_TYPE_ADMIN' => "Wartet auf Freischaltung", + 'POOL_TYPE_QUEUE' => "Eingereiht/Wird versendet" 'EMAIL_ID' => "Email-Id", 'EMAIL_SENDER' => "Versender", 'EMAIL_SUBJECT' => "Betreffzeile", diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php index 2d57bc6715..068e0cf8da 100644 --- a/inc/modules/admin/what-list_unconfirmed.php +++ b/inc/modules/admin/what-list_unconfirmed.php @@ -75,7 +75,7 @@ LIMIT 1", $col = 'stats_id'; $type = 'NORMAL'; $ID = '-1'; // Load admin_list_unconfirmed template - $listed = true; $DATA = getRequestParameter('mid'); $LINK = 'mailid'; + $listed = true; $DATA = getRequestParameter('mid'); $mailType = 'mailid'; } elseif ((isGetRequestParameterSet('bid')) && (isExtensionActive('bonus'))) { // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', '{--ADMIN_LIST_UNCONFIRMED_BONUS_LINKS--}'); @@ -94,7 +94,7 @@ LIMIT 1", $col = 'bonus_id'; $type = 'BONUS'; $ID = getRequestParameter('bid'); // Load admin_list_unconfirmed template - $listed = true; $DATA = $ID; $LINK = 'bonusid'; + $listed = true; $DATA = $ID; $mailType = 'bonusid'; } else { // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus loadTemplate('admin_settings_saved', false, '{--ADMIN_CALL_NOT_DIRECTLY--}'); @@ -146,7 +146,7 @@ LIMIT %s", // Prepare data for the row template $row = array( 'userid' => $row['userid'], - 'link' => $LINK, + 'link' => $mailType, 'id' => $ID, 'email' => '' . translateGender($row['gender']) . ' ' . $row['surname'] . ' ' . $row['family'] . '', 'status' => $row['status'], diff --git a/templates/de/html/admin/admin_list_unconfirmed_row_404.tpl b/templates/de/html/admin/admin_list_unconfirmed_row_404.tpl index 350b2b6473..f98287eeba 100644 --- a/templates/de/html/admin/admin_list_unconfirmed_row_404.tpl +++ b/templates/de/html/admin/admin_list_unconfirmed_row_404.tpl @@ -1,5 +1,5 @@ - {%message,ADMIN_USER_DATA_NOT_FOUND=$content[userid]%} + {%message,ADMIN_USER_ACCOUNT_404=$content[userid]%}