From 9855a72b56c69e9fe409828bdfa6e56b1beb39e2 Mon Sep 17 00:00:00 2001 From: quix0r Date: Mon, 4 Jul 2011 00:39:21 +0000 Subject: [PATCH] Introduced translateTaskType() --- DOCS/TODOs.txt | 2 +- inc/functions.php | 18 ++++++++++++++++++ inc/language/de.php | 9 +++++---- inc/language/holiday_de.php | 2 +- inc/language/order_de.php | 2 +- inc/language/payout_de.php | 2 +- inc/language/rallye_de.php | 4 ++-- inc/language/support_de.php | 2 +- inc/modules/admin/overview-inc.php | 3 --- inc/modules/admin/what-list_task.php | 6 ------ .../de/html/admin/admin_list_task_ext_rows.tpl | 2 +- .../de/html/admin/admin_list_task_rows.tpl | 2 +- .../admin/admin_overview_list_ext_rows.tpl | 2 +- .../de/html/admin/admin_overview_list_rows.tpl | 2 +- 14 files changed, 34 insertions(+), 24 deletions(-) diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 55b9d06a2e..fe1ae14eb9 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -35,7 +35,7 @@ ./inc/extensions/ext-network.php:38: * @TODO Yoo!Media: What is LayerAd compared to Layer click? * ./inc/extensions/ext-network.php:93: // @TODO network_type_handle is an internal name and needs documentation ./inc/extensions/ext-newsletter.php:218: // @TODO Move these into configuration -./inc/extensions/ext-order.php:356: // @TODO This should be moved out to inc/daily/ +./inc/extensions/ext-order.php:354: // @TODO This should be moved out to inc/daily/ ./inc/extensions/ext-rallye.php:329: // @TODO Move this code into a hook ./inc/extensions/ext-rallye.php:92: // @TODO Fix config_rallye_prices to list_rallye_prices ./inc/extensions/ext-yoomedia.php:121: // @TODO Can this be moved into a database table? diff --git a/inc/functions.php b/inc/functions.php index 4b5a7854cb..7e6e5f8adb 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -2373,6 +2373,24 @@ function convertBooleanToYesNo ($boolean) { return $converted; } +// Translates task type to a human-readable version +function translateTaskType ($taskType) { + // Construct message id + $messageId = 'ADMIN_TASK_TYPE_' . strtoupper($taskType) . ''; + + // Is the message id there? + if (isMessageIdValid($messageId)) { + // Then construct message + $message = '{--' . $messageId . '--}'; + } else { + // Else it is an unknown task type + $message = '{%message,ADMIN_TASK_TYPE_UNKNOWN=' . $taskType . '%}'; + } // END - if + + // Return message + return $message; +} + //----------------------------------------------------------------------------- // Automatically re-created functions, all taken from user comments on www.php.net //----------------------------------------------------------------------------- diff --git a/inc/language/de.php b/inc/language/de.php index d41405542d..1f0fb9c8ad 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -1115,10 +1115,11 @@ addMessages(array( 'ADMIN_LIST_MODE_NOREFS_ACCOUNTS' => "Alle Mitglieder-Accounts ohne Referals auflisten", // Admin task lines - 'ADMIN_TASK_IS_MEMBER_SUPPORT' => "Support-Anfrage eines Mitgliedes", - 'ADMIN_TASK_IS_EXTENSION' => "Erweiterung-Installation", - 'ADMIN_TASK_IS_EXTENSION_UPDATE' => "Erweiterungsupdate", - 'ADMIN_TASK_IS_EXTENSION_DEACTIVATION' => "Erweiterung-Deaktivierung", + 'ADMIN_TASK_TYPE_MEMBER_SUPPORT' => "Support-Anfrage eines Mitgliedes", + 'ADMIN_TASK_TYPE_EXTENSION' => "Erweiterung-Installation", + 'ADMIN_TASK_TYPE_EXTENSION_UPDATE' => "Erweiterungsupdate", + 'ADMIN_TASK_TYPE_EXTENSION_DEACTIVATION' => "Erweiterung-Deaktivierung", + 'ADMIN_TASK_TYPE_UNKNOWN' => "Unbekannter Task-Typ %s detected.", // Filter sub-system 'FILTER_FAILED_ALREADY_INIT' => "Filter-System ist bereits initialisiert.", diff --git a/inc/language/holiday_de.php b/inc/language/holiday_de.php index 84eaab4383..461f3805d7 100644 --- a/inc/language/holiday_de.php +++ b/inc/language/holiday_de.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { // Language definitions addMessages(array( // Admin strings - 'ADMIN_TASK_IS_HOLIDAY_REQUEST' => "Urlaubsanfrage", + 'ADMIN_TASK_TYPE_HOLIDAY_REQUEST' => "Urlaubsanfrage", 'ADMIN_HOLIDAY_NOTHING_FOUND' => "Niemand hat Urlaub beantragt.", 'ADMIN_HOLIDAY_TSTART' => "Anfang", 'ADMIN_HOLIDAY_TEND' => "Ende", diff --git a/inc/language/order_de.php b/inc/language/order_de.php index e070c508d0..f6f8db3ccc 100644 --- a/inc/language/order_de.php +++ b/inc/language/order_de.php @@ -88,7 +88,7 @@ addMessages(array( 'ADMIN_CONFIG_REPAY_POINTS_SHRED' => "Nicht gutschreiben (verfällt dann)", 'ADMIN_REPAY_ON_DELETE_MODE' => "Wenn Sie eine Mailbuchung löschen, wie sollen die ausgegebenen {?POINTS?} gehandhabt werden?", - 'ADMIN_TASK_IS_MEMBER_ORDER' => "Mailbuchung vom Mitglied", + 'ADMIN_TASK_TYPE_MEMBER_ORDER' => "Mailbuchung vom Mitglied", 'ADMIN_UNLOCK_EMAIL_LINK' => "Mailbuchung ansehen", )); diff --git a/inc/language/payout_de.php b/inc/language/payout_de.php index c7d5e3e621..dd95305f7b 100644 --- a/inc/language/payout_de.php +++ b/inc/language/payout_de.php @@ -74,7 +74,7 @@ addMessages(array( 'ADMIN_PAYOUT_YOUR_RET_FAILED' => "Return-Code: Fehlgeschlagen", 'ADMIN_PAYOUT_OPTIONAL_SETTINGS' => "Optionale Einstellungen", 'ADMIN_PAYOUT_YOUR_PASS_TRANSFER' => "Passwortverschlüsslung zur Übertragung", - 'ADMIN_TASK_IS_PAYOUT_REQUEST' => "Auszahlungsanfrage", + 'ADMIN_TASK_TYPE_PAYOUT_REQUEST' => "Auszahlungsanfrage", 'ADMIN_PAYOUT_LIST_REQUESTS' => "Jetzt alle Auszahlungsanfragen auflisten.", 'ADMIN_PAYOUT_TRANSFER_FAILED' => "Transfer nicht abgeschlossen:", 'ADMIN_PAYOUT_ALLOW_URLS' => "URLs erlauben", diff --git a/inc/language/rallye_de.php b/inc/language/rallye_de.php index 67c931700e..b15bafd73b 100644 --- a/inc/language/rallye_de.php +++ b/inc/language/rallye_de.php @@ -131,8 +131,8 @@ addMessages(array( 'RALLYE_REFERAL_POINTS' => "Verdienst durch Refs", 'RALLYE_REGISTER_NOW' => "Jetzt kostenlos und unverbindlich anmelden.", 'RALLYE_GET_REFERAL_LINK' => "Jetzt dran teilnehmen.", - 'ADMIN_TASK_IS_RALLYE_EXPIRED' => "Rallye wurde beendet", - 'ADMIN_TASK_IS_RALLYE_PURGED' => "Rallye wurde gelöscht", + 'ADMIN_TASK_TYPE_RALLYE_EXPIRED' => "Rallye wurde beendet", + 'ADMIN_TASK_TYPE_RALLYE_PURGED' => "Rallye wurde gelöscht", 'RALLYE_LIST_USERS_TITLE' => "Alle teilnehmenden Mitglieder auflisten.", 'RALLYE_REFERAL_POINTS_NOTE' => "Die {?POINTS?} in der Spalte Verdienst durch Refs geben den Verdienst in erster Ebene vor der Referal-Rallye an und wird sich bis Ende der Referal-Rallye nicht verändern.", 'RALLYE_MIN_USERS' => "Gesamtzahl der Mitglieder, ab der Referal-Rallye automatisch endet.", diff --git a/inc/language/support_de.php b/inc/language/support_de.php index c22eb5c50e..199b4cd65c 100644 --- a/inc/language/support_de.php +++ b/inc/language/support_de.php @@ -48,7 +48,7 @@ addMessages(array( 'MEMBER_SUPPORT_ORDER_SUBJECT' => "Ihr Anfrage an den Support: Mailbuchung", 'MEMBER_SUPPORT_REFERAL_LINK_SUBJECT' => "Ihr Anfrage an den Support: Referal-Link", 'MEMBER_SUPPORT_UNCONFIRMED_SUBJECT' => "Ihr Anfrage an den Support: Unbestätigte Mails", - 'ADMIN_TASK_IS_MEMBER_SUPPORT' => "Mitglieder-Support", + 'ADMIN_TASK_TYPE_MEMBER_SUPPORT' => "Mitglieder-Support", 'ADMIN_UNKNOWN_SUPPORT_MODE' => "Unbekannter Support-Modus %s erkannt.", 'ADMIN_TASK_SUPPORT_MODE' => "Support-Art", )); diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index 11acac5e80..b8ed4070ad 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -431,9 +431,6 @@ LIMIT 1", break; } // END - switch - // Get task type - $content['task_type_msg'] = '{--ADMIN_TASK_IS_' . strtoupper($content['task_type']) . '--}'; - if (isValidUserId($content['userid'])) { // Member found otherwise it's a system task $content['userid'] = generateUserProfileLink($content['userid']); diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php index 29e6a73c96..16fce750b6 100644 --- a/inc/modules/admin/what-list_task.php +++ b/inc/modules/admin/what-list_task.php @@ -145,9 +145,6 @@ ORDER BY // Init infos $content['infos'] = ''; - // Get admin task - $content['task_type_msg'] = '{--ADMIN_TASK_IS_' . strtoupper($content['task_type']) . '--}'; - // Generate infos switch ($content['task_type']) { case 'EXTENSION': @@ -167,9 +164,6 @@ ORDER BY // Prepare content $content = merge_array($content, array( - 'assign_admin' => $content['assigned_admin'], - 'userid' => $content['userid'], - 'task_type_msg' => $content['task_type_msg'], 'task_created' => generateDateTime($content['task_created'], 2) )); diff --git a/templates/de/html/admin/admin_list_task_ext_rows.tpl b/templates/de/html/admin/admin_list_task_ext_rows.tpl index 2743c81314..e3fbf2eb9b 100644 --- a/templates/de/html/admin/admin_list_task_ext_rows.tpl +++ b/templates/de/html/admin/admin_list_task_ext_rows.tpl @@ -15,7 +15,7 @@ $content[userid] - $content[task_type_msg] + {%pipe,translateTaskType=$content[task_type]%} $content[task_created] diff --git a/templates/de/html/admin/admin_list_task_rows.tpl b/templates/de/html/admin/admin_list_task_rows.tpl index 8a46935ec6..cf309a408e 100644 --- a/templates/de/html/admin/admin_list_task_rows.tpl +++ b/templates/de/html/admin/admin_list_task_rows.tpl @@ -15,7 +15,7 @@ $content[userid] - $content[task_type_msg] + {%pipe,translateTaskType=$content[task_type]%} $content[task_created] diff --git a/templates/de/html/admin/admin_overview_list_ext_rows.tpl b/templates/de/html/admin/admin_overview_list_ext_rows.tpl index caa2805281..545970eb09 100644 --- a/templates/de/html/admin/admin_overview_list_ext_rows.tpl +++ b/templates/de/html/admin/admin_overview_list_ext_rows.tpl @@ -15,7 +15,7 @@ $content[userid] - $content[task_type_msg] + {%pipe,translateTaskType=$content[task_type]%} $content[task_created] diff --git a/templates/de/html/admin/admin_overview_list_rows.tpl b/templates/de/html/admin/admin_overview_list_rows.tpl index 21697ba33b..d429a36426 100644 --- a/templates/de/html/admin/admin_overview_list_rows.tpl +++ b/templates/de/html/admin/admin_overview_list_rows.tpl @@ -15,7 +15,7 @@ $content[userid] - $content[task_type_msg] + {%pipe,translateTaskType=$content[task_type]%} $content[task_created] -- 2.39.5