diff --git a/install.php b/install.php index 5e1849be6..ce24e02bb 100644 --- a/install.php +++ b/install.php @@ -239,7 +239,8 @@ header('Content-Type: text/html; charset=UTF-8'); //------------------------------------------------- check php version if (version_compare(PHP_VERSION, REQUIRED_PHP_VERSION, '<')) { - include(PHPWG_ROOT_PATH.'install/php5_apache_configuration.php'); + // include(PHPWG_ROOT_PATH.'install/php5_apache_configuration.php'); // to remove, with all its related content + $errors[] = l10n('PHP version %s required (you are running on PHP %s)', REQUIRED_PHP_VERSION, PHP_VERSION); } //----------------------------------------------------- template initialization diff --git a/language/en_UK/install.lang.php b/language/en_UK/install.lang.php index bc5d2b5cb..a684ed775 100644 --- a/language/en_UK/install.lang.php +++ b/language/en_UK/install.lang.php @@ -33,6 +33,7 @@ $lang['verification'] = "verification"; $lang['Need help ? Ask your question on Piwigo message board.'] = 'Need help? Ask your question on the Piwigo message board.'; $lang['Visitors will be able to contact site administrator with this mail'] = 'Visitors will be able to use this email to contact the site administrator'; $lang['PHP 5 is required'] = 'PHP 5.3 is required'; +$lang['PHP version %s required (you are running on PHP %s)'] = 'PHP version %s required (you are running on PHP %s)'; $lang['It appears your webhost is currently running PHP %s.'] = "It appears your webhost is currently running PHP %s."; $lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo may try to switch your configuration to PHP 5.3 by creating or modifying a .htaccess file.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = 'Note you can change your configuration by yourself and then restart Piwigo.'; diff --git a/language/fr_FR/install.lang.php b/language/fr_FR/install.lang.php index da089f9f4..94704ef14 100644 --- a/language/fr_FR/install.lang.php +++ b/language/fr_FR/install.lang.php @@ -33,6 +33,7 @@ $lang['verification'] = "vérification"; $lang['Need help ? Ask your question on Piwigo message board.'] = "Besoin d'aide ? Posez votre question sur le forum de Piwigo."; $lang['Visitors will be able to contact site administrator with this mail'] = "Les visiteurs pourront contacter l'administrateur du site par ce mail"; $lang['PHP 5 is required'] = 'PHP 5.2 est requis'; +$lang['PHP version %s required (you are running on PHP %s)'] = 'Piwigo requiert PHP en version %s (ce serveur tourne sur PHP %s)'; $lang['It appears your webhost is currently running PHP %s.'] = "Apparemment, la version PHP de votre hébergeur est PHP %s."; $lang['Piwigo may try to switch your configuration to PHP 5 by creating or modifying a .htaccess file.'] = 'Piwigo va essayer de passer en PHP 5.2 en créant ou modifiant le fichier .htaccess.'; $lang['Note you can change your configuration by yourself and restart Piwigo after that.'] = "Notez que vous pouvez modifier vous-même la configuration PHP et re-lancer Piwigo ensuite.";