Merge branch 'master' of github.com:thelia/thelia

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("<info>%s cache dir already clear</info>", $dir));
+                $output->writeln(sprintf("<info>%s cache dir already cleared</info>", $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("<info>%s cache dir cleared successfully</info>", $dir));
+        $output->writeln(sprintf("<info>%s cache directory cleared successfully</info>", $dir));
 
     }
 }

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"
                 )

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. ',

templates/frontOffice/default/register.html

@@ -265,7 +265,7 @@
                     <div class="control-input">
                         <div class="checkbox">
                             <label class="control-label" for="{$label_attr.for}">
-                                <input type="checkbox" name="{$name}" id="{$label_attr.for}" value="{$value}"{if $checked} checked{/if}  {if $required} aria-required="true" required{/if}>I've read and agreed on <a href="#">Terms &amp; Conditions</a></a>.
+                                <input type="checkbox" name="{$name}" id="{$label_attr.for}" value="{$value}"{if $checked} checked{/if}  {if $required} aria-required="true" required{/if}>I've read and agreed on <a href="#">Terms &amp; Conditions</a>.
                             </label>
                             {if $error }
                                 <span class="help-block">{$message}</span>