From eb2da977098f0240829e52cd22a91687d6835c1d Mon Sep 17 00:00:00 2001 From: quix0r Date: Tue, 24 Aug 2010 14:59:55 +0000 Subject: [PATCH] Moved language strings, more EL in templates --- DOCS/TODOs.txt | 8 ++++---- inc/footer.php | 2 +- inc/language/de.php | 12 ------------ inc/language/user_de.php | 12 ++++++++++++ inc/modules/admin/what-list_user.php | 7 ++----- inc/template-functions.php | 4 ++-- templates/de/html/admin/admin_list_user_row.tpl | 2 +- 7 files changed, 22 insertions(+), 25 deletions(-) diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 654edc9242..37cff7e40d 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -47,10 +47,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:1111:// @TODO Rewrite these two constants -./inc/language/de.php:1126:// @TODO Rewrite these three constants +./inc/language/de.php:1099:// @TODO Rewrite these two constants +./inc/language/de.php:1114:// @TODO Rewrite these three constants ./inc/language/de.php:300: // @TODO Following two are unused? -./inc/language/de.php:804:// @TODO Are these constants longer used? +./inc/language/de.php:799:// @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 * @@ -136,7 +136,7 @@ ./inc/modules/admin/what-list_unconfirmed.php:98: // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus ./inc/modules/admin/what-list_user.php:151: // @TODO Rewrite these to filters ./inc/modules/admin/what-list_user.php:257: // @TODO Rewrite this into a filter -./inc/modules/admin/what-list_user.php:300: // @TODO Rewrite this into a filter +./inc/modules/admin/what-list_user.php:297: // @TODO Rewrite this into a filter ./inc/modules/admin/what-list_user.php:59:// @TODO Rewrite these if-blocks in a filter ./inc/modules/admin/what-logs.php:66: // @TODO Fix content-type here ./inc/modules/admin/what-logs.php:72: // @TODO Fix content-type here diff --git a/inc/footer.php b/inc/footer.php index a036830ee2..610d1d951d 100644 --- a/inc/footer.php +++ b/inc/footer.php @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { $GLOBALS['page_footer'] = ''; // Footer disabled or already sent? -// 1234 5 54 45 5 5 543 3 321 +// 1234 5 54 45 5 5 543 3 44321 if ((((!isset($GLOBALS['footer_sent'])) || (($GLOBALS['footer_sent'] != 1) && ($GLOBALS['footer_sent'] != 2))) && (!isCssOutputMode()))) { // Run the filter, sweet huh? runFilterChain('page_footer'); diff --git a/inc/language/de.php b/inc/language/de.php index 14001c6398..2fa3562fba 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -503,11 +503,6 @@ addMessages(array( 'TOTAL_POINTS' => "{?POINTS?} gesamt", 'TOTAL_REFERALS' => "Referals gesamt", 'ADMIN_MEMBER_FUNCTIONS' => "Administrative Funktionen", - 'ADMIN_DELETE_USER' => "Löschen", - 'ADMIN_LOCK_USER' => "Sperren", - 'ADMIN_UNLOCK_USER' => "Entsperren", - 'ADMIN_ADD_POINTS' => "{?POINTS?} aufbuchen", - 'ADMIN_EDIT_USER' => "Ändern", 'ADMIN_ALL_REFS' => "Alle Refs auflisten", 'BIRTHDAY2' => "Geburtstag", 'TOTAL_CATEGORIES' => "Ausgewählte Kategorien", @@ -893,7 +888,6 @@ addMessages(array( 'ADMIN_SUB_POINTS_FROM_USER' => "Abzug von {?POINTS?} eines Mitgliedes", 'ADMIN_ENTER_POINTS_SUB' => "Abzuziehende {?POINTS?}", 'ADMIN_ENTER_SUB_REASON' => "Grund des Abzuges", - 'ADMIN_SUB_POINTS' => "{?POINTS?} abziehen", 'ADMIN_SUB_POINTS_FROM_ALL' => "Allen Mitgliedern {?POINTS?} abziehen", 'ADMIN_DOWNLOAD_SVN' => "SVN-Version herunterladen", 'ADMIN_SVN_REPOSITORY' => "SVN-Repository", @@ -958,12 +952,6 @@ addMessages(array( 'PROBLEM_POINTS_OVERVIEW_UNAVAILABLE' => "{?POINTS?}-Übersicht derzeit nicht verfügbar.", 'ADMIN_NOTHING_SELECTED_CHANGE' => "Sie haben nichts zum Ändern des Status ausgewählt.", 'TEMPLATE_CONTENT' => "Templatedaten:", - 'ADMIN_LINK_DELETE_USER_TITLE' => "Mitglied löschen (mit Abfrage)", - 'ADMIN_LINK_EDIT_USER_TITLE' => "Mitglied editieren", - 'ADMIN_LINK_LOCK_USER_TITLE' => "Mitglied sperren", - 'ADMIN_LINK_UNLOCK_USER_TITLE' => "Mitglied entsperren", - 'ADMIN_LINK_ADD_POINTS_TITLE' => "{?POINTS?} aufbuchen", - 'ADMIN_LINK_SUB_POINTS_TITLE' => "{?POINTS?} abziehen", 'MESSAGE_HEADER' => "Hinweis:", 'WARNING_MESSAGE_HEADER' => "Warnung:", 'ADMIN_ALPHA_SELCTION' => "Alphabetische Suche:", diff --git a/inc/language/user_de.php b/inc/language/user_de.php index fd24b2ebd4..3ae7bf5eb8 100644 --- a/inc/language/user_de.php +++ b/inc/language/user_de.php @@ -52,6 +52,18 @@ addMessages(array( 'ADMIN_USER_ACCOUNT_NOT_SAVED' => "Mitgliedsaccount nicht gespeichert.", 'ADMIN_USER_ACCOUNT_LOCKED' => "Mitgliedsaccount %s wurde gesperrt.", 'ADMIN_USER_ACCOUNT_UNLOCKED' => "Mitgliedsaccount %s wurde freigegeben.", + 'ADMIN_USER_ACTION_LINK_DEL_USER' => "Löschen", + 'ADMIN_USER_ACTION_LINK_EDIT_USER' => "Ändern", + 'ADMIN_USER_ACTION_LINK_LOCK_USER' => "Sperren", + 'ADMIN_USER_ACTION_LINK_UNLOCK_USER' => "Entsperren", + 'ADMIN_USER_ACTION_LINK_ADD_POINTS' => "{?POINTS?} aufbuchen", + 'ADMIN_USER_ACTION_LINK_SUB_POINTS' => "{?POINTS?} abziehen", + 'ADMIN_USER_ACTION_LINK_DEL_USER_TITLE' => "Mitglied löschen (mit Abfrage)", + 'ADMIN_USER_ACTION_LINK_EDIT_USER_TITLE' => "Mitglied editieren", + 'ADMIN_USER_ACTION_LINK_LOCK_USER_TITLE' => "Mitglied sperren (mit Sperrgrund)", + 'ADMIN_USER_ACTION_LINK_UNLOCK_USER_TITLE' => "Mitglied entsperren", + 'ADMIN_USER_ACTION_LINK_ADD_POINTS_TITLE' => "Dem Mitglied {?POINTS?} aufbuchen", + 'ADMIN_USER_ACTION_LINK_SUB_POINTS_TITLE' => "Dem Mitglied {?POINTS?} abziehen", )); // [EOF] diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index 53e8a7c657..71d580f60a 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -269,18 +269,15 @@ LIMIT 1", // Get number of unconfirmed mails $content['links'] = countSumTotalData($content['userid'], 'user_links', 'id', 'userid', true); - if ($content['links'] > 0) $content['links'] = $base . '&what=list_links&userid=' . $content['userid'] . '%}">' . translateComma($content['links']) . ']'; + if ($content['links'] > 0) $content['links'] = $base . '&what=list_links&userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['links'] . '%}]'; // Set link to sent mails if present - if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&what=email_details&userid=' . $content['userid'] . '%}">' . translateComma($content['emails_sent']) . ']'; + if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&what=email_details&userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['emails_sent'] . '%}]'; // Add nickname $content['nickname'] = '{--EXT_NICKNAME_404--}'; if (isExtensionInstalled('nickname')) $content['nickname'] = getNickname($content['userid']); - // Calculate total points - $content['points'] = getTotalPoints($content['userid']); - // Clickrate $content['rate'] = '0'; if ($content['emails_received'] > 0) { diff --git a/inc/template-functions.php b/inc/template-functions.php index b838f086a0..1c2fac4d40 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -1040,7 +1040,7 @@ function generateMemberAdminActionLinks ($userid) { $OUT = '['; foreach ($targetArray as $tar) { - $OUT .= '{--ADMIN_'; + $OUT .= '_TITLE--}">{--ADMIN_USER_ACTION_LINK_'; if (($tar == 'lock_user') && ($status == 'LOCKED')) { // Locked accounts shall be unlocked $OUT .= 'UNLOCK_USER'; diff --git a/templates/de/html/admin/admin_list_user_row.tpl b/templates/de/html/admin/admin_list_user_row.tpl index 6aa22b8948..d2278f31b3 100644 --- a/templates/de/html/admin/admin_list_user_row.tpl +++ b/templates/de/html/admin/admin_list_user_row.tpl @@ -34,7 +34,7 @@ {--TOTAL_REFERALS--}: - {%pipe,translateComma=$content[points]%} {?POINTS?} + {%pipe,getTotalPoints,translateComma=$content[userid]%} {?POINTS?} $content[emails_sent] {%pipe,translateComma=$content[rate]%}% {%pipe,translateComma=$content[locked]%} {?POINTS?} -- 2.39.2