From 0535420334c9901112dab2b8f937b26390cd9cf5 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Sun, 1 May 2022 17:08:22 +0200 Subject: [PATCH] possibility to use complete string-identifier paths in standard_error and standard_success Signed-off-by: Michael Kaufmann --- admin_updates.php | 2 +- lib/Froxlor/UI/Response.php | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/admin_updates.php b/admin_updates.php index 2416aead..f53c120b 100644 --- a/admin_updates.php +++ b/admin_updates.php @@ -135,6 +135,6 @@ if ($page == 'overview') { 'alert_msg' => $ui_text . $message ]); } else { - Response::standardSuccess('noupdatesavail'); + Response::standardSuccess('update.noupdatesavail'); } } diff --git a/lib/Froxlor/UI/Response.php b/lib/Froxlor/UI/Response.php index 8882eca8..e8dd0279 100644 --- a/lib/Froxlor/UI/Response.php +++ b/lib/Froxlor/UI/Response.php @@ -114,7 +114,10 @@ class Response $error = ''; foreach ($errors as $single_error) { - $single_error = lng('error.' . $single_error, [htmlentities($replacer)]); + if (strpos($single_error, ".") === false) { + $single_error = 'error.'.$single_error; + } + $single_error = lng($single_error, [htmlentities($replacer)]); if (empty($error)) { $error = $single_error; } else { @@ -167,7 +170,10 @@ class Response */ public static function standardSuccess($success_message = '', $replacer = '', $params = [], $throw_exception = false) { - $success_message = lng('success.' . $success_message, [htmlentities($replacer)]); + if (strpos($success_message, ".") === false) { + $success_message = 'success.'.$success_message; + } + $success_message = lng($success_message, [htmlentities($replacer)]); if ($throw_exception) { throw new Exception(strip_tags($success_message), 200);