complete changelog and add missing translations

CHANGELOG.md

@@ -1,3 +1,9 @@
+#2.0.1
+- possibility to apply a permanent discount on a customer
+- display estimated shipping on cart page
+- export newsletter subscribers list
+- Fix redirect issues
+
 #2.0.0
 - Coupons values are re-evaluated when a product quantity is changed in the shopping cart
 - You can declare new compilerPass in modules. See Thelia\Module\BaseModule::getCompilers phpDoc

core/lib/Thelia/Config/I18n/en_US.php

@@ -23,7 +23,6 @@ return array(
     'Alpha code 3 *' => 'Alpha code 3 *',
     'Amount removed from the cart' => 'Amount removed from the cart',
     'Apply exchange rates on price in %sym' => 'Apply exchange rates on price in %sym',
-    'Area' => 'Area',
     'Attribute ID:Attribute AV ID' => 'Attribute ID:Attribute AV ID',
     'Auth mode' => 'Auth mode',
     'Available quantity' => 'Available quantity',
@@ -212,7 +211,6 @@ return array(
     'Value *' => 'Value *',
     'Warnings' => 'Warnings',
     'Weight' => 'Weight',
-    'Weight *' => 'Weight *',
     'Yes, I have a password :' => 'Yes, I have a password :',
     'You are already registered!' => 'You are already registered!',
     'Your Email Address' => 'Your Email Address',
@@ -221,13 +219,13 @@ return array(
     'Zip code' => 'Zip code',
     'date format' => 'date format',
     'delivery module %s is not a Thelia\Module\DeliveryModuleInterface' => 'delivery module %s is not a Thelia\Module\DeliveryModuleInterface',
-    'payment module %s is not a Thelia\Module\PaymentModuleInterface' => 'payment module %s is not a Thelia\Module\PaymentModuleInterface',
     'language locale' => 'language locale',
     'mailing system modification' => 'mailing system modification',
     'password confirmation is not the same as password field' => 'password confirmation is not the same as password field',
     'password must be composed of at least 4 characters' => 'password must be composed of at least 4 characters',
+    'payment module %s is not a Thelia\Module\PaymentModuleInterface' => 'payment module %s is not a Thelia\Module\PaymentModuleInterface',
+    'permanent discount (in percent)' => 'permanent discount (in percent)',
     'quantity value is not valid' => 'quantity value is not valid',
-    'shipping area name' => 'shipping area name',
     'this product id does not exists : %d' => 'this product id does not exists : %d',
     'time format' => 'time format',
 );

core/lib/Thelia/Config/I18n/fr_FR.php

@@ -299,6 +299,7 @@ return array(
     'password confirmation is not the same as password field' => 'le mot de passe de confirmation n\'est pas le même que le champ mot de passe',
     'password must be composed of at least 4 characters' => 'le mot de passe doit être composé d\'au moins 4 caractères',
     'payment module %s is not a Thelia\Module\PaymentModuleInterface' => 'Le module de paiement %s n\'est pas une instance de Thelia\Module\PaymentModuleInterface ',
+    'permanent discount (in percent)' => 'Remise permanente (en pourcentage)',
     'quantity value is not valid' => 'la valeur de la quantité n\'est pas valide',
     'superior or equal to' => 'supérieur ou égal à',
     'superior to' => 'supérieur à',

core/lib/Thelia/Form/CustomerUpdateForm.php

@@ -159,7 +159,7 @@ class CustomerUpdateForm extends BaseForm
                 )
             ))
             ->add('discount', 'text', array(
-                'label' => Translator::getInstance()->trans('permanent discount'),
+                'label' => Translator::getInstance()->trans('permanent discount (in percent)'),
                 'label_attr' => array(
                     'for' => 'discount'
                 )

templates/backOffice/default/I18n/fr_FR.php

@@ -361,6 +361,7 @@ return array(
     'Edit country "%name"' => 'Modifier le pays "%name"',
     'Edit currency "%name"' => 'Modifier la devise "%name"',
     'Edit customer %firstname %lastname' => 'Modification du client %firstname %lastname ',
+    'Edit customer %firstname %lastname (Ref : %ref)' => 'Modification du client %firstname %lastname (Ref : %ref) ',
     'Edit delivery address' => 'Editer l\'adresse de livraison',
     'Edit document "%name"' => 'Modifier le document "%name"',
     'Edit feature "%name"' => 'Modifier la caractéristique "%name"',
@@ -413,6 +414,7 @@ return array(
     'Editing tax rule' => 'En cours de modification de la règle de taxe',
     'Editing template "%name"' => 'Modification du gabarit "%name"',
     'Editing variable "%name"' => 'Modification de la variable "%name" ',
+    'Email' => 'Email',
     'Email address' => 'Adresse e-mail',
     'Email used when you send an email to your customers (Order confirmations, etc).' => 'Adresse email utilisé pour envoyer les mails à vos clients',
     'Enable remote SMTP use : ' => 'Activer l\'utilisation d\'un serveur SMTP distant:',
@@ -986,6 +988,7 @@ return array(
     'newsletter subscribers' => 'Inscrits à la newsletter',
     'order amount' => 'Montant de la commande',
     'orders for this customer' => 'commandes pour ce client',
+    'permanent discount' => 'Remise permanente (en pourcentage)',
     'short description' => 'description court',
     'tax rules' => 'règles de taxe',
     'taxes' => 'taxes',