From 06f77b41fd3c12e76d86178ccd74428db86fe9c6 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 18 Feb 2022 21:14:06 +0100 Subject: [PATCH] fix install-requirement messages for php Signed-off-by: Michael Kaufmann --- install/lib/class.FroxlorInstall.php | 2 +- install/lng/english.lng.php | 4 ++-- install/lng/french.lng.php | 3 ++- install/lng/german.lng.php | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/install/lib/class.FroxlorInstall.php b/install/lib/class.FroxlorInstall.php index fb247d08..95627ba3 100644 --- a/install/lib/class.FroxlorInstall.php +++ b/install/lib/class.FroxlorInstall.php @@ -1143,7 +1143,7 @@ class FroxlorInstall $check['result_txt'] = $this->_lng['requirements']['notfound'] . ' (' . PHP_VERSION . ')'; $_die = true; } else { - if (version_compare("7.4.0", PHP_VERSION, ">=")) { + if (version_compare("8.0.0", PHP_VERSION, ">=")) { $check['result'] = 2; $check['result_txt'] = $this->_lng['requirements']['newerphpprefered'] . ' (' . PHP_VERSION . ')'; } else { diff --git a/install/lng/english.lng.php b/install/lng/english.lng.php index ad1d6484..4efd653b 100644 --- a/install/lng/english.lng.php +++ b/install/lng/english.lng.php @@ -22,8 +22,8 @@ $lng['requirements']['not_true'] = 'no'; $lng['requirements']['notfound'] = 'not found'; $lng['requirements']['notinstalled'] = 'not installed'; $lng['requirements']['activated'] = 'enabled'; -$lng['requirements']['phpversion'] = 'PHP version >= 7.4 (8.x recommended)'; -$lng['requirements']['newerphpprefered'] = 'Good, but php-7.4 is preferred.'; +$lng['requirements']['phpversion'] = 'PHP version >= 7.4'; +$lng['requirements']['newerphpprefered'] = 'Good, but php-8.x is preferred.'; $lng['requirements']['phppdo'] = 'PHP PDO extension and PDO-MySQL driver...'; $lng['requirements']['phpsession'] = 'PHP session-extension...'; $lng['requirements']['phpctype'] = 'PHP ctype-extension...'; diff --git a/install/lng/french.lng.php b/install/lng/french.lng.php index 1464f654..4a50e37a 100644 --- a/install/lng/french.lng.php +++ b/install/lng/french.lng.php @@ -22,7 +22,8 @@ $lng['requirements']['not_true'] = 'non'; $lng['requirements']['notfound'] = 'introuvable'; $lng['requirements']['notinstalled'] = 'non installé'; $lng['requirements']['activated'] = 'activé'; -$lng['requirements']['phpversion'] = 'PHP version >= 7.4 (8.x recommandé)'; +$lng['requirements']['phpversion'] = 'PHP version >= 7.4'; +$lng['requirements']['newerphpprefered'] = 'Bien, mais php-8.x est recommandé.'; $lng['requirements']['phppdo'] = 'extension PHP PDO et pilote PDO-MySQL ...'; $lng['requirements']['phpxml'] = 'extension PHP XML...'; $lng['requirements']['phpfilter'] = 'extension PHP filter ...'; diff --git a/install/lng/german.lng.php b/install/lng/german.lng.php index a08d10ca..777c690f 100644 --- a/install/lng/german.lng.php +++ b/install/lng/german.lng.php @@ -22,8 +22,8 @@ $lng['requirements']['not_true'] = 'nein'; $lng['requirements']['notfound'] = 'nicht gefunden'; $lng['requirements']['notinstalled'] = 'nicht installiert'; $lng['requirements']['activated'] = 'ist aktiviert.'; -$lng['requirements']['phpversion'] = 'PHP Version >= 7.4 (8.x empfohlen)'; -$lng['requirements']['newerphpprefered'] = 'Passt, aber php-7.4 wird bevorzugt.'; +$lng['requirements']['phpversion'] = 'PHP Version >= 7.4'; +$lng['requirements']['newerphpprefered'] = 'Ausreichend, aber php-8.x wird bevorzugt.'; $lng['requirements']['phppdo'] = 'PHP PDO Erweiterung und PDO-MySQL Treiber...'; $lng['requirements']['phpsession'] = 'PHP session-Erweiterung...'; $lng['requirements']['phpctype'] = 'PHP ctype-Erweiterung...';