TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed translations for coupon

Browse Source
This commit is contained in:
Julien Chanséaume
2014-07-21 12:26:24 +02:00
committed by Julien Chanseaume
parent c1c47ced52
commit fa134bb9a3
35 changed files with 87 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/lib/Thelia/Condition/Implementation/CartContainsCategories.php
View File

@@ -121,8 +121,7 @@ class CartContainsCategories extends ConditionAbstract
{
return $this->translator->trans(
'Cart contains categories condition',
[],
'condition'
[]
);
}
@@ -133,8 +132,7 @@ class CartContainsCategories extends ConditionAbstract
{
$toolTip = $this->translator->trans(
'The coupon applies if the cart contains at least one product of the selected categories',
[],
'condition'
[]
);
return $toolTip;
@@ -167,7 +165,7 @@ class CartContainsCategories extends ConditionAbstract
'At least one of cart products categories is %op% <strong>%categories_list%</strong>', [
'%categories_list%' => $catStrList,
'%op%' => $i18nOperator
], 'condition'
]
);
return $toolTip;

8
core/lib/Thelia/Condition/Implementation/CartContainsProducts.php
View File

@@ -113,8 +113,7 @@ class CartContainsProducts extends ConditionAbstract
{
return $this->translator->trans(
'Cart contains specific products',
[],
'condition'
[]
);
}
@@ -125,8 +124,7 @@ class CartContainsProducts extends ConditionAbstract
{
$toolTip = $this->translator->trans(
'The coupon applies if the cart contains at least one product of the specified product list',
[],
'condition'
[]
);
return $toolTip;
@@ -159,7 +157,7 @@ class CartContainsProducts extends ConditionAbstract
'Cart contains at least a product %op% <strong>%products_list%</strong>', [
'%products_list%' => $prodStrList,
'%op%' => $i18nOperator
], 'condition'
]
);
return $toolTip;

8
core/lib/Thelia/Condition/Implementation/ForSomeCustomers.php
View File

@@ -104,8 +104,7 @@ class ForSomeCustomers extends ConditionAbstract
{
return $this->translator->trans(
'For one ore more customers',
[],
'condition'
[]
);
}
@@ -116,8 +115,7 @@ class ForSomeCustomers extends ConditionAbstract
{
$toolTip = $this->translator->trans(
'The coupon applies to some customers only',
[],
'condition'
[]
);
return $toolTip;
@@ -150,7 +148,7 @@ class ForSomeCustomers extends ConditionAbstract
'Customer is %op% <strong>%customer_list%</strong>', [
'%customer_list%' => $custStrList,
'%op%' => $i18nOperator
], 'condition'
]
);
return $toolTip;

12
core/lib/Thelia/Condition/Implementation/MatchBillingCountries.php
View File

@@ -50,8 +50,7 @@ class MatchBillingCountries extends AbstractMatchCountries
{
return $this->translator->trans(
'Billing country',
[],
'condition'
[]
);
}
@@ -61,9 +60,8 @@ class MatchBillingCountries extends AbstractMatchCountries
public function getToolTip()
{
$toolTip = $this->translator->trans(
'The coupon applies to the selected delivery countries',
[],
'condition'
'The coupon applies to the selected billing countries',
[]
);
return $toolTip;
@@ -75,14 +73,14 @@ class MatchBillingCountries extends AbstractMatchCountries
'Only if order billing country is %op% <strong>%countries_list%</strong>', [
'%countries_list%' => $cntryStrList,
'%op%' => $i18nOperator
], 'condition'
]
);
}
protected function getFormLabel()
{
return $this->translator->trans(
'Billing coutry is', [], 'condition'
'Billing country is', []
);
}
}

10
core/lib/Thelia/Condition/Implementation/MatchDeliveryCountries.php
View File

@@ -50,8 +50,7 @@ class MatchDeliveryCountries extends AbstractMatchCountries
{
return $this->translator->trans(
'Delivery country',
[],
'condition'
[]
);
}
@@ -62,8 +61,7 @@ class MatchDeliveryCountries extends AbstractMatchCountries
{
$toolTip = $this->translator->trans(
'The coupon applies to the selected delivery countries',
[],
'condition'
[]
);
return $toolTip;
@@ -75,14 +73,14 @@ class MatchDeliveryCountries extends AbstractMatchCountries
'Only if order shipping country is %op% <strong>%countries_list%</strong>', [
'%countries_list%' => $cntryStrList,
'%op%' => $i18nOperator
], 'condition'
]
);
}
protected function getFormLabel()
{
return $this->translator->trans(
'Delivery coutry is', [], 'condition'
'Delivery country is', []
);
}
}

9
core/lib/Thelia/Condition/Implementation/MatchForEveryone.php
View File

@@ -68,8 +68,7 @@ class MatchForEveryone extends ConditionAbstract
{
return $this->translator->trans(
'Unconditional usage',
[],
'condition'
[]
);
}
@@ -80,8 +79,7 @@ class MatchForEveryone extends ConditionAbstract
{
$toolTip = $this->translator->trans(
'This condition is always true',
[],
'condition'
[]
);
return $toolTip;
@@ -94,8 +92,7 @@ class MatchForEveryone extends ConditionAbstract
{
$toolTip = $this->translator->trans(
'Unconditionnal usage',
[],
'condition'
[]
);
return $toolTip;

11
core/lib/Thelia/Condition/Implementation/MatchForTotalAmount.php
View File

@@ -120,8 +120,7 @@ class MatchForTotalAmount extends ConditionAbstract
{
return $this->translator->trans(
'Cart total amount',
[],
'condition'
[]
);
}
@@ -132,8 +131,7 @@ class MatchForTotalAmount extends ConditionAbstract
{
$toolTip = $this->translator->trans(
'Check the total Cart amount in the given currency',
[],
'condition'
[]
);
return $toolTip;
@@ -155,8 +153,7 @@ class MatchForTotalAmount extends ConditionAbstract
'%operator%' => $i18nOperator,
'%amount%' => $this->values[self::CART_TOTAL],
'%currency%' => $this->values[self::CART_CURRENCY]
),
'condition'
)
);
return $toolTip;
@@ -199,7 +196,7 @@ class MatchForTotalAmount extends ConditionAbstract
{
$labelPrice = $this->facade
->getTranslator()
->trans('Cart total amount is', [], 'condition');
->trans('Cart total amount is', []);
$html = $this->drawBackOfficeBaseInputsText($labelPrice, self::CART_TOTAL);

11
core/lib/Thelia/Condition/Implementation/MatchForXArticles.php
View File

@@ -103,8 +103,7 @@ class MatchForXArticles extends ConditionAbstract
{
return $this->translator->trans(
'Cart item count',
[],
'condition'
[]
);
}
@@ -115,8 +114,7 @@ class MatchForXArticles extends ConditionAbstract
{
$toolTip = $this->translator->trans(
'The cart item count should match the condition',
[],
'condition'
[]
);
return $toolTip;
@@ -136,8 +134,7 @@ class MatchForXArticles extends ConditionAbstract
array(
'%operator%' => $i18nOperator,
'%quantity%' => $this->values[self::CART_QUANTITY]
),
'condition'
)
);
return $toolTip;
@@ -164,7 +161,7 @@ class MatchForXArticles extends ConditionAbstract
{
$labelQuantity = $this->facade
->getTranslator()
->trans('Cart item count is', [], 'condition');
->trans('Cart item count is');
$html = $this->drawBackOfficeBaseInputsText($labelQuantity, self::CART_QUANTITY);

6
core/lib/Thelia/Condition/Implementation/StartDate.php
View File

@@ -103,8 +103,7 @@ class StartDate extends ConditionAbstract
{
return $this->translator->trans(
'Start date',
[],
'condition'
[]
);
}
@@ -115,8 +114,7 @@ class StartDate extends ConditionAbstract
{
$toolTip = $this->translator->trans(
'The coupon is valid after a given date',
[],
'condition'
[]
);
return $toolTip;

24
core/lib/Thelia/Condition/Operators.php
View File

@@ -55,57 +55,49 @@ abstract class Operators
case self::INFERIOR:
$ret = $translator->trans(
'Less than',
[],
'condition'
[]
);
break;
case self::INFERIOR_OR_EQUAL:
$ret = $translator->trans(
'Less than or equals',
[],
'condition'
[]
);
break;
case self::EQUAL:
$ret = $translator->trans(
'Equal to',
[],
'condition'
[]
);
break;
case self::SUPERIOR_OR_EQUAL:
$ret = $translator->trans(
'Greater than or equals',
[],
'condition'
[]
);
break;
case self::SUPERIOR:
$ret = $translator->trans(
'Greater than',
[],
'condition'
[]
);
break;
case self::DIFFERENT:
$ret = $translator->trans(
'Not equal to',
[],
'condition'
[]
);
break;
case self::IN:
$ret = $translator->trans(
'In',
[],
'condition'
[]
);
break;
case self::OUT:
$ret = $translator->trans(
'Not in',
[],
'condition'
[]
);
break;
default:

10
core/lib/Thelia/Config/I18n/en_US.php
View File

@@ -43,7 +43,7 @@ return array(
'Available shipping zones' => 'Available shipping zones',
'Bad tax list JSON' => 'Bad tax list JSON',
'Billing country' => 'Billing country',
'Billing coutry is' => 'Le pays de facturation est',
'Billing country is' => 'Billing country is',
'Brand' => 'Brand',
'Brand / Supplier' => 'Brand / Supplier',
'Brand name' => 'Brand name',
@@ -87,7 +87,7 @@ return array(
'Default product sale element' => 'Default product sale element',
'Deleting %obj% for %id% with parent id %parentId%' => 'Deleting %obj% for %id% with parent id %parentId%',
'Delivery country' => 'Delivery country',
'Delivery coutry is' => 'Le pays de livraison est',
'Delivery country is' => 'Delivery country is',
'Delivery module ID not found' => 'Delivery module ID not found',
'Detailed description' => 'Detailed description',
'Disabled' => 'Disabled',
@@ -302,12 +302,12 @@ return array(
'The coupon applies if the cart contains at least one product of the selected categories' => 'The coupon applies if the cart contains at least one product of the selected categories',
'The coupon applies if the cart contains at least one product of the specified product list' => 'The coupon applies if the cart contains at least one product of the specified product list',
'The coupon applies to some customers only' => 'The coupon applies to some customers only',
'The coupon applies to the selected billing countries' => 'The coupon applies to the selected billing countries',
'The coupon applies to the selected delivery countries' => 'Ce code promo s\'applique seulement aux pays de facturation sélectionnés',
'The coupon is valid after a given date' => 'Le code promo est valide seulement à partir d\'une certaine date',
'The detailed description.' => 'The detailed description.',
'The image which replaces an undefined country flag (%file) was not found. Please check unknown-flag-path configuration variable, and check that the image exists.' => 'The image which replaces an undefined country flag (%file) was not found. Please check unknown-flag-path configuration variable, and check that the image exists.',
'The loop name \'%name\' is already defined in %className class' => 'The loop name \'%name\' is already defined in %className class',
'The product sale elements reference %ref doesn\'t exist' => 'The product sale elements reference %ref doesn\'t exist',
'This brand is online' => 'This brand is online',
'This category is online.' => 'This category is online.',
'This condition is always true' => 'This condition is always true',
@@ -366,8 +366,10 @@ return array(
'date format' => 'date format',
'decimal separator' => 'Séparateur décimal',
'delivery module %s is not a Thelia\Module\DeliveryModuleInterface' => 'delivery module %s is not a Thelia\Module\DeliveryModuleInterface',
'hour(s)' => 'hour(s)',
'language locale' => 'language locale',
'mailing system modification' => 'mailing system modification',
'minute(s)' => 'minute(s)',
'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',
@@ -376,6 +378,4 @@ return array(
'this product id does not exists : %d' => 'this product id does not exists : %d',
'thousands separator' => 'Séparateur de milliers',
'time format' => 'time format',
'hour(s)' => 'hour(s)',
'minute(s)' => 'minute(s)',
);

12
core/lib/Thelia/Config/I18n/fr_FR.php
View File

@@ -42,8 +42,8 @@ return array(
'Available quantity *' => 'Quantité disponible *',
'Available shipping zones' => 'Zones de livraison disponibles',
'Bad tax list JSON' => 'Mauvais JSON de la liste des taxes',
'Billing country' => 'Pays de livraison',
'Billing coutry is' => 'Pays de facturation',
'Billing country' => 'Pays de facturation',
'Billing country is' => 'Le pays de facturation est',
'Brand' => 'Marque',
'Brand / Supplier' => 'Marque / Fournisseur',
'Brand name' => 'Nom de la marque',
@@ -87,7 +87,7 @@ return array(
'Default product sale element' => 'Product Sale Element par défaut',
'Deleting %obj% for %id% with parent id %parentId%' => 'Suppresion de %obj%, ID %id%, ID parent %parentId%',
'Delivery country' => 'Pays de livraison',
'Delivery coutry is' => 'Le pays de livraison est',
'Delivery country is' => 'Le pays de livraison est',
'Delivery module ID not found' => 'Id du module de livraison non trouvé',
'Detailed description' => 'Description détaillée',
'Disabled' => 'Désactivé',
@@ -302,12 +302,12 @@ return array(
'The coupon applies if the cart contains at least one product of the selected categories' => 'Le code promo est valable si le panier contient/ne contient pas des produits appartenant aux catégories sélectionnées',
'The coupon applies if the cart contains at least one product of the specified product list' => 'Le code promo est valable si le panier contient/ne contient pas au moins un des produits selectionnés',
'The coupon applies to some customers only' => 'Ce code promo est valable pour les clients sélectionnés',
'The coupon applies to the selected billing countries' => 'Ce code promo s\'applique pour les pays de facturation sélectionnés',
'The coupon applies to the selected delivery countries' => 'Ce code promo s\'applique pour les pays de livraison sélectionnés',
'The coupon is valid after a given date' => 'Le code promo est valide à partir de cette date',
'The detailed description.' => 'La description détaillée',
'The image which replaces an undefined country flag (%file) was not found. Please check unknown-flag-path configuration variable, and check that the image exists.' => 'L\'image qui remplace un drapeau de pays manquant (%file) n\'a pas été trouvée. Merci de vérifier la variable de configuration unknown-flag-path.',
'The loop name \'%name\' is already defined in %className class' => 'La boucle \'%name\' est déjà définir dans la classe %className',
'The product sale elements reference %ref doesn\'t exist' => 'La déclinaison de produit %ref n\'existe pas',
'This brand is online' => 'Cette marque est en ligne',
'This category is online.' => 'Cette catégorie est en ligne.',
'This condition is always true' => 'Cette condition est troujours vérifiée',
@@ -366,8 +366,10 @@ return array(
'date format' => 'Format de date',
'decimal separator' => 'Séparateur décimal',
'delivery module %s is not a Thelia\Module\DeliveryModuleInterface' => 'le module de livraison %s n\'est pas un Thelia\Module\DeliveryModuleInterface',
'hour(s)' => 'heure(s)',
'language locale' => 'Langue locale',
'mailing system modification' => 'Modification du système d\'envoi de mail.',
'minute(s)' => 'minute(s)',
'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 ',
@@ -376,6 +378,4 @@ return array(
'this product id does not exists : %d' => 'l\'id du produit %d n\'existe pas',
'thousands separator' => 'Séparateur des milliers',
'time format' => 'Format d\'heure',
'hour(s)' => 'heure(s)',
'minute(s)' => 'minute(s)',
);

5
core/lib/Thelia/Coupon/Type/FreeProduct.php
View File

@@ -294,7 +294,7 @@ class FreeProduct extends AbstractRemoveOnProducts
{
return $this->facade
->getTranslator()
->trans('Free product when buying one or more selected products', array(), 'coupon');
->trans('Free product when buying one or more selected products', array());
}
/**
@@ -306,8 +306,7 @@ class FreeProduct extends AbstractRemoveOnProducts
->getTranslator()
->trans(
'This coupon adds a free product to the cart if one of the selected products is in the cart.',
array(),
'coupon'
array()
);
return $toolTip;

5
core/lib/Thelia/Coupon/Type/RemoveAmountOnAttributeValues.php
View File

@@ -36,7 +36,7 @@ class RemoveAmountOnAttributeValues extends AbstractRemoveOnAttributeValues
{
return $this->facade
->getTranslator()
->trans('Fixed amount discount for selected attribute values', array(), 'coupon');
->trans('Fixed amount discount for selected attribute values', array());
}
/**
@@ -48,8 +48,7 @@ class RemoveAmountOnAttributeValues extends AbstractRemoveOnAttributeValues
->getTranslator()
->trans(
'This coupon subtracts the specified amount from the order total for each product which uses the selected attribute values. If the discount is greater than the total order, the customer will only pay the shipping, or nothing if the coupon also provides free shipping.',
array(),
'coupon'
array()
);
return $toolTip;

5
core/lib/Thelia/Coupon/Type/RemoveAmountOnCategories.php
View File

@@ -37,7 +37,7 @@ class RemoveAmountOnCategories extends AbstractRemoveOnCategories
{
return $this->facade
->getTranslator()
->trans('Fixed amount discount for selected categories', array(), 'coupon');
->trans('Fixed amount discount for selected categories', array());
}
/**
@@ -49,8 +49,7 @@ class RemoveAmountOnCategories extends AbstractRemoveOnCategories
->getTranslator()
->trans(
'This coupon subtracts the specified amount from the order total for each product which belongs to the selected categories. If the discount is greater than the total order, the customer will only pay the shipping, or nothing if the coupon also provides free shipping.',
array(),
'coupon'
array()
);
return $toolTip;

5
core/lib/Thelia/Coupon/Type/RemoveAmountOnProducts.php
View File

@@ -41,7 +41,7 @@ class RemoveAmountOnProducts extends AbstractRemoveOnProducts
{
return $this->facade
->getTranslator()
->trans('Fixed amount discount for selected products', array(), 'coupon');
->trans('Fixed amount discount for selected products', array());
}
/**
@@ -53,8 +53,7 @@ class RemoveAmountOnProducts extends AbstractRemoveOnProducts
->getTranslator()
->trans(
'This coupon subtracts the specified amount from the order total for each selected product. If the discount is greater than the total order, the customer will only pay the shipping, or nothing if the coupon also provides free shipping.',
array(),
'coupon'
array()
);
return $toolTip;

5
core/lib/Thelia/Coupon/Type/RemovePercentageOnAttributeValues.php
View File

@@ -42,7 +42,7 @@ class RemovePercentageOnAttributeValues extends AbstractRemoveOnAttributeValues
{
return $this->facade
->getTranslator()
->trans('Percentage discount for selected attribute values', array(), 'coupon');
->trans('Percentage discount for selected attribute values', array());
}
/**
@@ -54,8 +54,7 @@ class RemovePercentageOnAttributeValues extends AbstractRemoveOnAttributeValues
->getTranslator()
->trans(
'This coupon subtracts from the order total the specified percentage of each product price which uses the selected attribute values. If the discount is greater than the total order, the customer will only pay the shipping, or nothing if the coupon also provides free shipping.',
array(),
'coupon'
array()
);
return $toolTip;

5
core/lib/Thelia/Coupon/Type/RemovePercentageOnCategories.php
View File

@@ -39,7 +39,7 @@ class RemovePercentageOnCategories extends AbstractRemoveOnCategories
{
return $this->facade
->getTranslator()
->trans('Percentage discount for selected categories', array(), 'coupon');
->trans('Percentage discount for selected categories', array());
}
/**
@@ -51,8 +51,7 @@ class RemovePercentageOnCategories extends AbstractRemoveOnCategories
->getTranslator()
->trans(
'This coupon subtracts from the order total a percentage of the price of each product which belongs to the selected categories. If the discount is greater than the total order, the customer will only pay the shipping, or nothing if the coupon also provides free shipping.',
array(),
'coupon'
array()
);
return $toolTip;

5
core/lib/Thelia/Coupon/Type/RemovePercentageOnProducts.php
View File

@@ -46,7 +46,7 @@ class RemovePercentageOnProducts extends AbstractRemoveOnProducts
{
return $this->facade
->getTranslator()
->trans('Percentage discount for selected products', array(), 'coupon');
->trans('Percentage discount for selected products', array());
}
/**
@@ -58,8 +58,7 @@ class RemovePercentageOnProducts extends AbstractRemoveOnProducts
->getTranslator()
->trans(
'This coupon subtracts from the order total the specified percentage of each selected product price. If the discount is greater than the total order, the customer will only pay the shipping, or nothing if the coupon also provides free shipping.',
array(),
'coupon'
array()
);
return $toolTip;

5
core/lib/Thelia/Coupon/Type/RemoveXAmount.php
View File

@@ -38,7 +38,7 @@ class RemoveXAmount extends AbstractRemove
{
return $this->facade
->getTranslator()
->trans('Fixed Amount Discount', array(), 'coupon');
->trans('Fixed Amount Discount', array());
}
/**
@@ -50,8 +50,7 @@ class RemoveXAmount extends AbstractRemove
->getTranslator()
->trans(
'This coupon will subtracts a set amount from the total cost of an order. If the discount is greater than the total order corst, the customer will only pay the shipping, or nothing if the coupon also provides free shipping.',
array(),
'coupon'
array()
);
return $toolTip;

5
core/lib/Thelia/Coupon/Type/RemoveXPercent.php
View File

@@ -41,7 +41,7 @@ class RemoveXPercent extends AbstractRemove
{
return $this->facade
->getTranslator()
->trans('Remove X percent to total cart', array(), 'coupon');
->trans('Remove X percent to total cart', array());
}
/**
@@ -53,8 +53,7 @@ class RemoveXPercent extends AbstractRemove
->getTranslator()
->trans(
'This coupon will offert a flat percentage off a shopper\'s entire order (not applied to shipping costs or tax rates). If the discount is greater than the total order corst, the customer will only pay the shipping, or nothing if the coupon also provides free shipping.',
array(),
'coupon'
array()
);
return $toolTip;