More usage of EL code in error messages

diff --git a/inc/language/de.php b/inc/language/de.php
index 38b2952d2697e2a01a11dced03deac34122f347c..62e0dc52bf44f16054a3dde86a20345173d78ccf 100644 (file)
--- 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 <span class=\"data\">%s</span> existiert nicht.",
-       'MODULE_REGISTRY_IS_LOCKED' => "Das Modul <span class=\"data\">%s</span> wurde gesperrt.",
+       'MODULE_REGISTRY_404' => "Modul <span class=\"data\">{%pipe,getModule%}</span> existiert nicht.",
+       'MODULE_REGISTRY_IS_LOCKED' => "Das Modul <span class=\"data\">{%pipe,getModule%}</span> 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 d4e00b3f872b82034fe311f314f30cef8f846023..2b1b2acf75497a78a4f8f9fa8c6bd4d1e2d6cf35 100644 (file)
--- 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: