From 59de645ec91ee50620b3e2a24511532a355cfa2c Mon Sep 17 00:00:00 2001 From: rMalie Date: Mon, 13 Feb 2012 16:45:43 +0000 Subject: [PATCH] // Fix last smiley in installer + some translations git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13269 b9a71923-0436-4b27-9f14-aed3839534dd --- install-dev/langs/de/install.php | 2 +- install-dev/langs/es/install.php | 2 +- install-dev/langs/fr/install.php | 4 ++-- install-dev/langs/it/install.php | 2 +- install-dev/theme/js/process.js | 5 ++++- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/install-dev/langs/de/install.php b/install-dev/langs/de/install.php index 683d88784..1ced27345 100644 --- a/install-dev/langs/de/install.php +++ b/install-dev/langs/de/install.php @@ -129,7 +129,7 @@ 'Blog' => 'Blog', 'Done!' => NULL, 'An error occured during installation...' => NULL, - 'You can use the links on the left column to go back to the previous steps, or restart the installation process by clicking here' => NULL, + 'You can use the links on the left column to go back to the previous steps, or restart the installation process by clicking here.' => NULL, 'Your installation is finished!' => 'Die Installation ist abgeschlossen!', 'You have just finished to install and configure your shop, thank you for using PrestaShop!' => NULL, 'Please remember your login information:' => NULL, diff --git a/install-dev/langs/es/install.php b/install-dev/langs/es/install.php index 4b9306574..83d2a22ba 100644 --- a/install-dev/langs/es/install.php +++ b/install-dev/langs/es/install.php @@ -129,7 +129,7 @@ 'Blog' => 'El blog', 'Done!' => NULL, 'An error occured during installation...' => NULL, - 'You can use the links on the left column to go back to the previous steps, or restart the installation process by clicking here' => NULL, + 'You can use the links on the left column to go back to the previous steps, or restart the installation process by clicking here.' => NULL, 'Your installation is finished!' => '¡La instalación está terminada!', 'You have just finished to install and configure your shop, thank you for using PrestaShop!' => NULL, 'Please remember your login information:' => NULL, diff --git a/install-dev/langs/fr/install.php b/install-dev/langs/fr/install.php index a60b19691..6f65bc24d 100644 --- a/install-dev/langs/fr/install.php +++ b/install-dev/langs/fr/install.php @@ -55,7 +55,7 @@ return array( 'An error occurred while sending email, please verify your parameters' => 'Une erreur est survenue lors de l\'envoi de l\'e-mail, merci de vérifier vos paramètres', 'Create settings.inc file' => 'Création du fichier settings.inc', 'Create database tables' => 'Création des tables de la base', - 'Create default shop and languages ' => 'Création de la boutique par défaut et des langues', + 'Create default shop and languages' => 'Création de la boutique par défaut et des langues', 'Populate database tables' => 'Remplissage des tables de la base', 'Configure shop informations' => 'Configuration de la boutique', 'Install modules' => 'Installation des modules', @@ -132,7 +132,7 @@ return array( 'Blog' => 'Blog', 'Done!' => 'Fin !', 'An error occured during installation...' => 'Une erreur est survenue durant l\'installation', - 'You can use the links on the left column to go back to the previous steps, or restart the installation process by clicking here' => 'Vous pouvez utiliser les liens à gauche pour revenir aux étapes précédentes, ou redémarrer l\'installation en cliquant ici', + 'You can use the links on the left column to go back to the previous steps, or restart the installation process by clicking here.' => 'Vous pouvez utiliser les liens à gauche pour revenir aux étapes précédentes, ou redémarrer l\'installation en cliquant ici.', 'Your installation is finished!' => 'L\'installation est finie !', 'You have just finished to install and configure your shop, thank you for using PrestaShop!' => 'Vous venez d’installer et de configurer votre boutique en ligne, nous vous en remercions', 'Please remember your login information:' => 'Merci de conserver les informations de connexion suivantes :', diff --git a/install-dev/langs/it/install.php b/install-dev/langs/it/install.php index 757157d82..bffecb2fe 100644 --- a/install-dev/langs/it/install.php +++ b/install-dev/langs/it/install.php @@ -129,7 +129,7 @@ 'Blog' => 'Il blog', 'Done!' => NULL, 'An error occured during installation...' => NULL, - 'You can use the links on the left column to go back to the previous steps, or restart the installation process by clicking here' => NULL, + 'You can use the links on the left column to go back to the previous steps, or restart the installation process by clicking here.' => NULL, 'Your installation is finished!' => 'Installazione terminata!', 'You have just finished to install and configure your shop, thank you for using PrestaShop!' => NULL, 'Please remember your login information:' => NULL, diff --git a/install-dev/theme/js/process.js b/install-dev/theme/js/process.js index c7090a17a..d468b9a29 100644 --- a/install-dev/theme/js/process.js +++ b/install-dev/theme/js/process.js @@ -17,6 +17,7 @@ function start_install() $('.error_log').hide(); $('#progress_bar').show(); $('#progress_bar .installing').show(); + $('.stepList li:last-child').removeClass('ok').removeClass('ko'); process_pixel = parseInt($('#progress_bar .total').css('width')) / process_steps.length; process_install(); @@ -142,8 +143,9 @@ function install_error(step, errors) $('#error_process').show(); $('#process_step_'+step.key).show().addClass('fail'); - $('#progress_bar .total .progress').stop().css('width', '0px'); + $('#progress_bar .total .progress').stop(); $('#progress_bar .installing').hide(); + $('.stepList li:last-child').addClass('ko'); if (errors) { @@ -168,4 +170,5 @@ function install_success() is_installing = false; $('#install_process_form').slideUp(); $('#install_process_success').slideDown(); + $('.stepList li:last-child').addClass('ok'); } \ No newline at end of file