From 46d95664a0cb825bbe07ed010eb2edc7a3c88dfc Mon Sep 17 00:00:00 2001 From: Franck Allimant Date: Tue, 19 Nov 2013 15:35:15 +0100 Subject: [PATCH 1/2] Fixed typo --- core/lib/Thelia/Command/CacheClear.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/lib/Thelia/Command/CacheClear.php b/core/lib/Thelia/Command/CacheClear.php index 1d4e7919c..3b56cbf00 100755 --- a/core/lib/Thelia/Command/CacheClear.php +++ b/core/lib/Thelia/Command/CacheClear.php @@ -52,7 +52,7 @@ class CacheClear extends ContainerAwareCommand "without-assets", null, InputOption::VALUE_NONE, - "remove cache assets" + "do not clear the assets cache in the web space" ) ; } @@ -82,17 +82,17 @@ class CacheClear extends ContainerAwareCommand } catch (\UnexpectedValueException $e) { // throws same exception code for does not exist and permission denied ... if (!file_exists($dir)) { - $output->writeln(sprintf("%s cache dir already clear", $dir)); + $output->writeln(sprintf("%s cache dir already cleared", $dir)); return; } throw $e; } catch (IOException $e) { - $output->writeln(sprintf("Error during clearing cache : %s", $e->getMessage())); + $output->writeln(sprintf("Error during clearing of cache : %s", $e->getMessage())); } - $output->writeln(sprintf("%s cache dir cleared successfully", $dir)); + $output->writeln(sprintf("%s cache directory cleared successfully", $dir)); } } From 4b2a73c85d7933f3e711666b003414749956e02f Mon Sep 17 00:00:00 2001 From: David Rimbault Date: Tue, 19 Nov 2013 23:50:23 +0100 Subject: [PATCH 2/2] Added some translations in the Customer Creation Form --- core/lib/Thelia/Form/CustomerCreateForm.php | 3 ++- templates/frontOffice/default/I18n/fr_FR.php | 7 +++++++ templates/frontOffice/default/register.html | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/core/lib/Thelia/Form/CustomerCreateForm.php b/core/lib/Thelia/Form/CustomerCreateForm.php index 35954dc88..e8582bf6c 100755 --- a/core/lib/Thelia/Form/CustomerCreateForm.php +++ b/core/lib/Thelia/Form/CustomerCreateForm.php @@ -84,7 +84,7 @@ class CustomerCreateForm extends AddressCreateForm array($this, "verifyPasswordField") ))) ), - "label" => "Password confirmation", + "label" => Translator::getInstance()->trans("Password confirmation"), "label_attr" => array( "for" => "password_confirmation" ) @@ -102,6 +102,7 @@ class CustomerCreateForm extends AddressCreateForm "constraints" => array( new Constraints\True(array("message" => "Please accept the Terms and conditions in order to register.")) ), + "label"=>"Test", "label_attr" => array( "for" => "agreed" ) diff --git a/templates/frontOffice/default/I18n/fr_FR.php b/templates/frontOffice/default/I18n/fr_FR.php index 5137cfcdd..90c91b403 100755 --- a/templates/frontOffice/default/I18n/fr_FR.php +++ b/templates/frontOffice/default/I18n/fr_FR.php @@ -13,6 +13,7 @@ return array( 'Address %nb' => 'Adresse n°', 'Address Update' => 'Mise à jour de l\'adresse', 'Address' => 'Adresse', + 'Address Line 2'=>'Complément d\'adresse', 'Amount' => 'Montant', 'Availability' => 'Disponibilité', 'Available' => 'Disponible', @@ -22,6 +23,7 @@ return array( 'Cancel' => 'Annuler', 'Cart' => 'Panier', 'Categories' => 'Catégories', + 'Cellphone'=> 'Portable', 'Change address' => 'Changer d\'adresse', 'Change my account information' => 'Modifier mes informations personnelles', 'Change my password' => 'Changer mon mot de passe', @@ -32,6 +34,7 @@ return array( 'Choose your delivery method' => 'Choisissez votre moyen de livraison', 'Choose your payment method' => 'Choisissez voter moyen de paiement', 'Code :' => 'Code', + 'Company Name'=>'Entreprise', 'Complementary address' => 'Résidence secondaire', 'Contact Us' => 'Contactez-nous', 'Continue Shopping' => 'Continuer mes achats', @@ -53,6 +56,7 @@ return array( 'Edit this address' => 'Editer cette adresse', 'Edit' => 'Editer', 'Email address' => 'Adresse e-mail', + 'Email Address' => 'Adresse e-mail', 'Follow us' => 'Suivez-nous', 'Forgot your Password?' => 'Mot de passé oublié ?', 'Free shipping' => 'Livraison gratuite', @@ -63,6 +67,7 @@ return array( 'In Stock' => 'Disponible', 'instead of' => 'au lieu de', 'Item(s)' => 'Produit(s)', + 'I would like to receive the newsletter or the latest news.' => 'Je veux m\'inscrire à la newsletter pour rester informé.', 'Language:' => 'Langue', 'Latest articles' => 'Nouveaux articles', 'Latest products' => 'Derniers produits', @@ -106,6 +111,7 @@ return array( 'Pagination' => 'Pagination', 'Password Forgotten' => 'Mot de passe oublié', 'Password' => 'Mot de passe', + 'Password confirmation'=>"Confirmer le mot de passe", 'per page' => 'par page', 'Personal Information' => 'Informations personnelles', 'Placeholder address label' => 'Maison, Domicile, Travail...', @@ -170,6 +176,7 @@ return array( 'Sort By' => 'Trier par', 'Special Price:' => 'Prix en promotion :', 'Status' => 'Etat', + 'Street Address'=>"Adresse", 'Subscribe' => 'Inscription', 'Tax Inclusive' => 'TVA incluse', 'Thank you for the trust you place in us.' => 'Merci pour votre confiance. ', diff --git a/templates/frontOffice/default/register.html b/templates/frontOffice/default/register.html index 73d7f5f20..b94cdd2e8 100644 --- a/templates/frontOffice/default/register.html +++ b/templates/frontOffice/default/register.html @@ -265,7 +265,7 @@
{if $error } {$message}