From 0b3c15320cbefa1ae2ab0a0d6b6df525d08836d7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 12 Feb 2011 10:28:41 +0000 Subject: [PATCH] More usage of EL code in error messages --- inc/language/de.php | 4 ++-- modules.php | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/inc/language/de.php b/inc/language/de.php index 38b2952d26..62e0dc52bf 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -43,8 +43,8 @@ if (!defined('__SECURITY')) { // Installation/setup addMessages(array( // Language constants - 'MODULE_REGISTRY_404' => "Modul %s existiert nicht.", - 'MODULE_REGISTRY_IS_LOCKED' => "Das Modul %s wurde gesperrt.", + 'MODULE_REGISTRY_404' => "Modul {%pipe,getModule%} existiert nicht.", + 'MODULE_REGISTRY_IS_LOCKED' => "Das Modul {%pipe,getModule%} wurde gesperrt.", 'MODULE_ERROR_404' => "Fehler: Modul nicht gefunden", 'UNKNOWN_MODULE_DETECTED' => "Unbekanntes Modul %s", 'MAILER_WARNING' => "Warnung", diff --git a/modules.php b/modules.php index d4e00b3f87..2b1b2acf75 100644 --- a/modules.php +++ b/modules.php @@ -90,7 +90,7 @@ if ((isExtensionActive('maintenance')) && (isMaintenanceEnabled()) && (!isAdmin( setHttpStatus('404'); // Module not found - addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_REGISTRY_404', getModule())); + addFatalMessage(__FILE__, __LINE__, '{--MODULE_REGISTRY_404--}'); // Set module to error module (non-existent!) setModule('error'); @@ -102,7 +102,7 @@ if ((isExtensionActive('maintenance')) && (isMaintenanceEnabled()) && (!isAdmin( setHttpStatus('404'); // Add fatal message - addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_REGISTRY_404', getModule())); + addFatalMessage(__FILE__, __LINE__, '{--MODULE_REGISTRY_404--}'); break; case 'locked': @@ -114,11 +114,11 @@ if ((isExtensionActive('maintenance')) && (isMaintenanceEnabled()) && (!isAdmin( setHttpStatus('404 NOT FOUND'); // Module does addionally not exists - addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_REGISTRY_404', getModule())); + addFatalMessage(__FILE__, __LINE__, '{--MODULE_REGISTRY_404--}'); } // END - if // Add fatal message - addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_REGISTRY_IS_LOCKED', getModule())); + addFatalMessage(__FILE__, __LINE__, '{--MODULE_REGISTRY_IS_LOCKED--}'); break; default: -- 2.30.2