diff --git a/apps/maarch_entreprise/admin/update_control/update_control.php b/apps/maarch_entreprise/admin/update_control/update_control.php index 531be69ad81e2aa623228b30b47181eb02e5c93f..265fc490df26eff1a90b04ab2d386149bc0ecfae 100644 --- a/apps/maarch_entreprise/admin/update_control/update_control.php +++ b/apps/maarch_entreprise/admin/update_control/update_control.php @@ -151,7 +151,7 @@ foreach ($tags as $key => $value) { <?php if ($_SESSION['user']['UserId'] == 'superadmin') { ?> - <a href="<?php echo $_SESSION['config']['coreurl'];?>install/index.php?step=update_language"><?php echo ' ' . _CLICK_HERE_TO_GO_TO_UPDATE_MANAGEMENT;?></a> + <a href="<?php echo $_SESSION['config']['coreurl'];?>install/index.php?step=update_welcome"><?php echo ' ' . _CLICK_HERE_TO_GO_TO_UPDATE_MANAGEMENT;?></a> <?php } else { echo _CONNECT_YOU_IN_SUPERADMIN; diff --git a/apps/maarch_entreprise/lang/en.php b/apps/maarch_entreprise/lang/en.php index 28c36b9fee0e60e61189b1464bbe3ad0dcd70c06..ed2f0fe526f208501ef795c2be9c1873701a2096 100644 --- a/apps/maarch_entreprise/lang/en.php +++ b/apps/maarch_entreprise/lang/en.php @@ -1900,58 +1900,58 @@ if (!defined('_DELETED_EMAIL_SIGNATURE')) /**** admin update control ****/ if (!defined('_ADMIN_UPDATE_CONTROL')) - define('_ADMIN_UPDATE_CONTROL', 'Vérification mise à jour'); + define('_ADMIN_UPDATE_CONTROL', 'Verify update'); if (!defined('_ADMIN_UPDATE_CONTROL_DESC')) - define('_ADMIN_UPDATE_CONTROL_DESC', 'Vérification mise à jour'); + define('_ADMIN_UPDATE_CONTROL_DESC', 'Verify update'); if (!defined('_YOUR_VERSION')) - define('_YOUR_VERSION', 'Votre version'); + define('_YOUR_VERSION', 'Your version'); if (!defined('_AVAILABLE_VERSION_TO_UPDATE')) - define('_AVAILABLE_VERSION_TO_UPDATE', 'Versions disponibles'); + define('_AVAILABLE_VERSION_TO_UPDATE', 'Available versions'); if (!defined('_CLICK_HERE_TO_GO_TO_UPDATE_MANAGEMENT')) - define('_CLICK_HERE_TO_GO_TO_UPDATE_MANAGEMENT', 'Cliquez ici pour commencer la procédure de mise à jour'); + define('_CLICK_HERE_TO_GO_TO_UPDATE_MANAGEMENT', 'Click here to begin the update process'); if (!defined('_NEW_MAJOR_VERSION_AVAILABLE')) - define('_NEW_MAJOR_VERSION_AVAILABLE', 'Nouvelle version majeure disponible'); + define('_NEW_MAJOR_VERSION_AVAILABLE', 'New major version available'); if (!defined('_BRANCH_VERSION')) - define('_BRANCH_VERSION', 'Branche'); + define('_BRANCH_VERSION', 'Branch'); if (!defined('_TAG_VERSION')) define('_TAG_VERSION', 'Tag'); if (!defined('_CONNECT_YOU_IN_SUPERADMIN')) - define('_CONNECT_YOU_IN_SUPERADMIN', 'Vous devez être connecté en superadmin pour accéder à la procédure de mise à jour'); + define('_CONNECT_YOU_IN_SUPERADMIN', 'You have to be connected with superadmin profile to process update'); if (!defined('_UPDATE_WELCOME')) - define('_UPDATE_WELCOME', 'Mise à jour'); + define('_UPDATE_WELCOME', 'Update'); if (!defined('_UPDATE_WELCOME_INSTALL')) - define('_UPDATE_WELCOME_INSTALL', 'Procédure de mise à jour'); + define('_UPDATE_WELCOME_INSTALL', 'Update process'); if (!defined('_UPDATE_DESC_INSTALL')) - define('_UPDATE_DESC_INSTALL', 'Procédure de mise à jour de MaarchCourrier (versions mineures uniquement)'); + define('_UPDATE_DESC_INSTALL', 'Update MaarchCourrier (only minor version)'); if (!defined('_UPDATE_BACKUP')) - define('_UPDATE_BACKUP', 'Sauvegarde'); + define('_UPDATE_BACKUP', 'Backup'); if (!defined('_UPDATE_BACKUP_INFOS')) - define('_UPDATE_BACKUP_INFOS', 'Sauvegarde de votre version actuelle'); + define('_UPDATE_BACKUP_INFOS', 'Backup your version'); if (!defined('_UPDATE_BACKUP_DETAILS')) - define('_UPDATE_BACKUP_DETAILS', 'Procédure de sauvegarde de votre version actuelle afin de pouvoir la restaurer si besoin'); + define('_UPDATE_BACKUP_DETAILS', 'Backup your version, you can restore it if necessary'); if (!defined('_ACTUAL_VERSION_PATH')) - define('_ACTUAL_VERSION_PATH', 'Chemin de votre installation'); + define('_ACTUAL_VERSION_PATH', 'Path of your installation'); if (!defined('_UPDATE_BACKUP_PATH')) - define('_UPDATE_BACKUP_PATH', 'Chemin de votre sauvegarde'); + define('_UPDATE_BACKUP_PATH', 'Path of your backup'); if (!defined('_BACKUP_ACTUAL_VERSION')) - define('_BACKUP_ACTUAL_VERSION', 'Sauvegarder votre version'); + define('_BACKUP_ACTUAL_VERSION', 'Backup your version'); if (!defined('_UPDATE_DOWNLOAD')) - define('_UPDATE_DOWNLOAD', 'Téléchargement'); + define('_UPDATE_DOWNLOAD', 'Download'); if (!defined('_LAST_RELEASE_INFOS')) - define('_LAST_RELEASE_INFOS', 'Téléchargement de la dernière version mineure'); + define('_LAST_RELEASE_INFOS', 'Download last minor version'); if (!defined('_LAST_RELEASE_DETAILS')) - define('_LAST_RELEASE_DETAILS', 'Détails des versions mineures disponibles'); + define('_LAST_RELEASE_DETAILS', 'Available minor versions'); if (!defined('_CHOOSE_VERSION_TO_UPDATE')) - define('_CHOOSE_VERSION_TO_UPDATE', 'Choisissez la version'); + define('_CHOOSE_VERSION_TO_UPDATE', 'Choose the version'); if (!defined('_UPDATE_DEPLOY')) - define('_UPDATE_DEPLOY', 'Déploiement'); + define('_UPDATE_DEPLOY', 'Deploiement'); if (!defined('_UPDATE_DEPLOY_INFOS')) - define('_UPDATE_DEPLOY_INFOS', 'Déploiement de la version téléchargée'); + define('_UPDATE_DEPLOY_INFOS', 'Deploiement of the downloaded version'); if (!defined('_UPDATE_DEPLOY_DETAILS')) - define('_UPDATE_DEPLOY_DETAILS', 'Déploiement de la version téléchargée'); + define('_UPDATE_DEPLOY_DETAILS', 'Deploiement of the downloaded version'); if (!defined('_DEPLOY_VERSION')) - define('_DEPLOY_VERSION', 'Déployer la version'); + define('_DEPLOY_VERSION', 'Deploy the version'); if (!defined('_UPDATE_END')) - define('_UPDATE_END', 'Mise à jour réussi'); + define('_UPDATE_END', 'Update sucessful'); if (!defined('_UPDATE_DESC_END')) - define('_UPDATE_DESC_END', 'Mise à jour réussi'); \ No newline at end of file + define('_UPDATE_DESC_END', 'Update sucessful'); \ No newline at end of file diff --git a/install/scripts/language_update.php b/install/scripts/language_update.php index 1c19feda5a6bc58a926f20dbfce256326bcf92ff..8874c6f755ed99a59f097dae181c035021cab557 100644 --- a/install/scripts/language_update.php +++ b/install/scripts/language_update.php @@ -30,7 +30,6 @@ //MODEL include_once '../../core/init.php'; - //CONTROLLER if (!isset($_REQUEST['languageSelect']) || empty($_REQUEST['languageSelect'])) { header("Location: ../error.php?error=badForm"); exit; diff --git a/install/view/update_welcome_view.php b/install/view/update_welcome_view.php index b5f59975b42137e5c25825c300bbff32b5e1a99e..6f9acec091ab1efb7fb0d153060e578d099728bd 100644 --- a/install/view/update_welcome_view.php +++ b/install/view/update_welcome_view.php @@ -38,11 +38,11 @@ if ($_SESSION['user']['UserId'] <> 'superadmin') { <div class="contentBlock" id="welcome"> <p> <div id="buttons"> - <div style="float: left;" class="previousButton" id="previous"> + <!--div style="float: left;" class="previousButton" id="previous"> <a href="#" onClick="goTo('index.php?step=update_language');"> <?php echo _PREVIOUS_INSTALL;?> </a> - </div> + </div--> <div style="float: right;" class="nextButton" id="next"> <a href="#" onClick="goTo('index.php?step=update_backup');"> <?php echo _NEXT_INSTALL;?>