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/en_US.php

@@ -6,9 +6,6 @@ return array(
     '(edit)' => '(edit)',
     '<a href="http://en.wikipedia.org/wiki/ISO_639-1_language_matrix" target="_other">Check the list</a> of ISO 639-1 codes' => '<a href="http://en.wikipedia.org/wiki/ISO_639-1_language_matrix" target="_other">Check the list</a> of ISO 639-1 codes',
     '<span id="number_of_generated_combinations">0</span> combinations' => '<span id="number_of_generated_combinations">0</span> combinations',
-    '<strong>Cannot translate all fields.</strong> According to your PHP configuration, forms cannot contains more than
-	                                        %current_max_input_vars input fields, but at least %required_max_input_vars are required. Please change the value of max_input_vars in your PHP configuration
-	                                        of change the translation file by hand.' => '<strong>Cannot translate all fields.</strong> According to your PHP configuration, forms cannot contains more than	                                        %current_max_input_vars input fields, but at least %required_max_input_vars are required. Please change the value of max_input_vars in your PHP configuration	                                        of change the translation file by hand.',
     '<strong>Congratulations</strong>, all text is now translated !' => '<strong>Congratulations</strong>, all text is now translated !',
     '<strong>Did not found any text to translate</strong>. It\'s probably normal. If not, please be sure to use Smarty\'s "intl" function in templates, or the Translator::trans() method in PHP files.' => '<strong>Did not found any text to translate</strong>. It\'s probably normal. If not, please be sure to use Smarty\'s "intl" function in templates, or the Translator::trans() method in PHP files.',
     'A content could be attached to more than one folder. Select here the additional folders for this content.' => 'A content could be attached to more than one folder. Select here the additional folders for this content.',
@@ -35,7 +32,6 @@ return array(
     'Add a new product attribute' => 'Add a new product attribute',
     'Add a new product feature' => 'Add a new product feature',
     'Add a new product template' => 'Add a new product template',
-    'Add a new shipping configuration' => 'Add a new shipping configuration',
     'Add a new variable' => 'Add a new variable',
     'Add tax to this group' => 'Add tax to this group',
     'Add this attribute to all product templates' => 'Add this attribute to all product templates',
@@ -103,7 +99,6 @@ return array(
     'Change this product feature' => 'Change this product feature',
     'Change this product template' => 'Change this product template',
     'Change this profile' => 'Change this profile',
-    'Change this shipping configuration' => 'Change this shipping configuration',
     'Change this shipping zone' => 'Change this shipping zone',
     'Change this tax' => 'Change this tax',
     'Change this tax rule' => 'Change this tax rule',
@@ -166,7 +161,6 @@ return array(
     'Create a new product' => 'Create a new product',
     'Create a new product template' => 'Create a new product template',
     'Create a new profile' => 'Create a new profile',
-    'Create a new shipping configuration' => 'Create a new shipping configuration',
     'Create a new tax' => 'Create a new tax',
     'Create a new tax rule' => 'Create a new tax rule',
     'Create a new variable' => 'Create a new variable',
@@ -186,7 +180,6 @@ return array(
     'Create this mailing template' => 'Create this mailing template',
     'Create this product' => 'Create this product',
     'Create this product template' => 'Create this product template',
-    'Create this shipping configuration' => 'Create this shipping configuration',
     'Create this value' => 'Create this value',
     'Create this variable' => 'Create this variable',
     'Currencies' => 'Currencies',
@@ -232,7 +225,6 @@ return array(
     'Delete mailing template' => 'Delete mailing template',
     'Delete product' => 'Delete product',
     'Delete profile' => 'Delete profile',
-    'Delete shipping configuration' => 'Delete shipping configuration',
     'Delete tax' => 'Delete tax',
     'Delete tax rule' => 'Delete tax rule',
     'Delete template' => 'Delete template',
@@ -255,7 +247,6 @@ return array(
     'Delete this product feature' => 'Delete this product feature',
     'Delete this product template' => 'Delete this product template',
     'Delete this profile' => 'Delete this profile',
-    'Delete this shipping configuration' => 'Delete this shipping configuration',
     'Delete this tax' => 'Delete this tax',
     'Delete this tax rule' => 'Delete this tax rule',
     'Delete this value' => 'Delete this value',
@@ -292,7 +283,6 @@ return array(
     'Do you really want to delete this module ?' => 'Do you really want to delete this module ?',
     'Do you really want to delete this product ?' => 'Do you really want to delete this product ?',
     'Do you really want to delete this profile ?' => 'Do you really want to delete this profile ?',
-    'Do you really want to delete this shipping configuration ?' => 'Do you really want to delete this shipping configuration ?',
     'Do you really want to delete this tax ?' => 'Do you really want to delete this tax ?',
     'Do you really want to delete this tax rule ?' => 'Do you really want to delete this tax rule ?',
     'Do you really want to delete this template ? It will be removed from all products.' => 'Do you really want to delete this template ? It will be removed from all products.',
@@ -303,7 +293,6 @@ return array(
     'Do you really want to remove this accessory from the product ?' => 'Do you really want to remove this accessory from the product ?',
     'Do you really want to remove this attribute from all product templates ? You\'ll loose all product related data for this attribute.' => 'Do you really want to remove this attribute from all product templates ? You\'ll loose all product related data for this attribute.',
     'Do you really want to remove this attribute from the template ?' => 'Do you really want to remove this attribute from the template ?',
-    'Do you really want to remove this country ?' => 'Do you really want to remove this country ?',
     'Do you really want to remove this feature from all product templates ? You\'ll loose all product related data for this feature.' => 'Do you really want to remove this feature from all product templates ? You\'ll loose all product related data for this feature.',
     'Do you really want to remove this feature from the template ?' => 'Do you really want to remove this feature from the template ?',
     'Do you really want to remove this related content ?' => 'Do you really want to remove this related content ?',
@@ -373,8 +362,6 @@ return array(
     'Edit prices in %curr' => 'Edit prices in %curr',
     'Edit product' => 'Edit product',
     'Edit product %title' => 'Edit product %title',
-    'Edit shipping configuration %title' => 'Edit shipping configuration %title',
-    'Edit shipping zone %title' => 'Edit shipping zone %title',
     'Edit tax rule taxes' => 'Edit tax rule taxes',
     'Edit template "%name"' => 'Edit template "%name"',
     'Edit this address' => 'Edit this address',
@@ -392,14 +379,12 @@ return array(
     'Editing attribute "%name"' => 'Editing attribute "%name"',
     'Editing country "%name"' => 'Editing country "%name"',
     'Editing currency "%name"' => 'Editing currency "%name"',
-    'Editing customer "%name"' => 'Editing customer "%name"',
     'Editing document "%name"' => 'Editing document "%name"',
     'Editing feature "%name"' => 'Editing feature "%name"',
     'Editing image "%name"' => 'Editing image "%name"',
     'Editing mailing template "%name"' => 'Editing mailing template "%name"',
     'Editing module' => 'Editing module',
     'Editing profile' => 'Editing profile',
-    'Editing shipping configuration "%name"' => 'Editing shipping configuration "%name"',
     'Editing shipping zone "%name"' => 'Editing shipping zone "%name"',
     'Editing tax' => 'Editing tax',
     'Editing tax rule' => 'Editing tax rule',
@@ -423,9 +408,7 @@ return array(
     'Enter here the folder name in the default language (%title)' => 'Enter here the folder name in the default language (%title)',
     'Enter here the mailing template purpose in the default language (%title)' => 'Enter here the mailing template purpose in the default language (%title)',
     'Enter here the product name in the default language (%title)' => 'Enter here the product name in the default language (%title)',
-    'Enter here the product price in the default currency (%title)' => 'Enter here the product price in the default currency (%title)',
     'Enter here the product reference' => 'Enter here the product reference',
-    'Enter here the product tax price in the default currency (%title)' => 'Enter here the product tax price in the default currency (%title)',
     'Enter here the product weight, in Kilogrammes' => 'Enter here the product weight, in Kilogrammes',
     'Enter here the template name in the default language (%title)' => 'Enter here the template name in the default language (%title)',
     'Enter here the value in the current edit language (%language_name)' => 'Enter here the value in the current edit language (%language_name)',
@@ -578,8 +561,6 @@ return array(
     'Online' => 'Online',
     'Online products' => 'Online products',
     'Oops! An Error Occurred' => 'Oops! An Error Occurred',
-    'Order #' => 'Order #',
-    'Order %ref' => 'Order %ref',
     'Order n°' => 'Order n°',
     'Order status:' => 'Order status:',
     'Ordered products' => 'Ordered products',
@@ -717,22 +698,13 @@ return array(
     'Select an attribute and click (+) to view available values' => 'Select an attribute and click (+) to view available values',
     'Select an attribute value...' => 'Select an attribute value...',
     'Select an attribute...' => 'Select an attribute...',
-    'Select an feature and click (+) to add it to this template' => 'Select an feature and click (+) to add it to this template',
-    'Select an feature...' => 'Select an feature...',
     'Select attribute values to combine. You may enter a default value for some of the fields of the generated combinations.' => 'Select attribute values to combine. You may enter a default value for some of the fields of the generated combinations.',
     'Select here the tax applicable to this product' => 'Select here the tax applicable to this product',
-    'Select the E-mail template you want to translate' => 'Select the E-mail template you want to translate',
-    'Select the PDF template you want to translate' => 'Select the PDF template you want to translate',
-    'Select the back-office template you want to translate' => 'Select the back-office template you want to translate',
-    'Select the front-office template you want to translate' => 'Select the front-office template you want to translate',
-    'Select the module you want to translate' => 'Select the module you want to translate',
-    'Select which items you want to translate' => 'Select which items you want to translate',
     'Send a mail to this customer' => 'Send a mail to this customer',
     'Send files' => 'Send files',
     'Sequential number of log line' => 'Sequential number of log line',
     'Set as default tax rule' => 'Set as default tax rule',
     'Shipping configuration' => 'Shipping configuration',
-    'Shipping configuration name' => 'Shipping configuration name',
     'Shipping zones' => 'Shipping zones',
     'Shop' => 'Shop',
     'Shop Informations' => 'Shop Information',
@@ -753,7 +725,6 @@ return array(
     'Sorry, variable ID=%id was not found.' => 'Sorry, variable ID=%id was not found.',
     'Source IP' => 'Source IP',
     'Source IP :' => 'Source IP :',
-    'Stats on %month/%year' => 'Stats on %month/%year',
     'Status' => 'Status',
     'Stock' => 'Stock',
     'Store' => 'Store',
@@ -892,7 +863,6 @@ return array(
     'Variable value' => 'Variable value',
     'Version %ver' => 'Version %ver',
     'View' => 'View',
-    'View only missing translations' => 'View only missing translations',
     'View shop' => 'View shop',
     'View site' => 'View site',
     'Visibility' => 'Visibility',
@@ -915,7 +885,6 @@ return array(
     'You don\'t need to use commas or other punctuations.' => 'You don\'t need to use commas or other punctuations.',
     'Your current IP address is %ip' => 'Your current IP address is %ip',
     'Zip code' => 'Zip code',
-    'Zones' => 'Zones',
     'activate' => 'activate',
     'activate %title module' => 'activate %title module',
     'activation' => 'activation',
@@ -938,6 +907,7 @@ return array(
     'max usage' => 'max usage',
     'order amount' => 'order amount',
     'orders for this customer' => 'orders for this customer',
+    'permanent discount' => 'permanent discount (in percent)',
     'short description' => 'short description',
     'tax rules' => 'tax rules',
     'taxes' => 'taxes',

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