From 6b6dc1c80002ce8cd23afdfa4229e92d190c444c Mon Sep 17 00:00:00 2001 From: gmorel Date: Mon, 9 Sep 2013 19:22:07 +0200 Subject: [PATCH 1/9] Working - Allow to parse array and objects in Smarty Template --- core/lib/Thelia/Core/Template/Smarty/SmartyParser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php index ad656df32..30144a263 100755 --- a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php +++ b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php @@ -102,7 +102,7 @@ class SmartyParser extends Smarty implements ParserInterface public static function theliaEscape($content, $smarty) { - if(!is_object($content)) { + if(is_scalar($content)) { return htmlspecialchars($content ,ENT_QUOTES, Smarty::$_CHARSET); } else { return $content; From 0fe443f53de0b913515c07d642689ee8fa1cd30e Mon Sep 17 00:00:00 2001 From: gmorel Date: Mon, 9 Sep 2013 21:43:58 +0200 Subject: [PATCH 2/9] WIP - Coupon Add/Edit/Delete rule AJAX --- .../Constraint/Rule/CouponRuleAbstract.php | 6 +- .../Controller/Admin/CouponController.php | 21 ++- core/lib/Thelia/Core/Template/Loop/Coupon.php | 24 ++- install/faker.php | 2 + templates/admin/default/coupon-read.html | 177 +++++++++--------- templates/admin/default/coupon-update.html | 99 +++++++--- templates/admin/default/coupon/form.html | 42 ++++- .../admin/default/coupon/rule-input-ajax.html | 19 +- 8 files changed, 252 insertions(+), 138 deletions(-) diff --git a/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php b/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php index 868db4dd7..1cab6c48b 100644 --- a/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php +++ b/core/lib/Thelia/Constraint/Rule/CouponRuleAbstract.php @@ -203,8 +203,12 @@ abstract class CouponRuleAbstract implements CouponRuleInterface $validator['availableOperators'] = $translatedOperators; $translatedInputs[$key] = $validator; } + $validators = array(); + $validators['inputs'] = $translatedInputs; + $validators['setOperators'] = $this->operators; + $validators['setValues'] = $this->values; - return $translatedInputs; + return $validators; } /** diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php index d2368a573..dd2bfe54d 100755 --- a/core/lib/Thelia/Controller/Admin/CouponController.php +++ b/core/lib/Thelia/Controller/Admin/CouponController.php @@ -184,8 +184,9 @@ class CouponController extends BaseAdminController ); /** @var CouponRuleInterface $rule */ - foreach ($rules as $rule) { + foreach ($rules->getRules() as $rule) { $args['rulesObject'][] = array( + 'serviceId' => $rule->getServiceId(), 'name' => $rule->getName(), 'tooltip' => $rule->getToolTip(), 'validators' => $rule->getValidators() @@ -338,15 +339,15 @@ class CouponController extends BaseAdminController { $this->checkAuth('ADMIN', 'admin.coupon.read'); - if (!$this->getRequest()->isXmlHttpRequest()) { - $this->redirect( - $this->getRoute( - 'admin', - array(), - Router::ABSOLUTE_URL - ) - ); - } +// if (!$this->getRequest()->isXmlHttpRequest()) { +// $this->redirect( +// $this->getRoute( +// 'admin', +// array(), +// Router::ABSOLUTE_URL +// ) +// ); +// } /** @var ConstraintFactory $constraintFactory */ $constraintFactory = $this->container->get('thelia.constraint.factory'); diff --git a/core/lib/Thelia/Core/Template/Loop/Coupon.php b/core/lib/Thelia/Core/Template/Loop/Coupon.php index ee3cc0a5a..9b3ebb615 100755 --- a/core/lib/Thelia/Core/Template/Loop/Coupon.php +++ b/core/lib/Thelia/Core/Template/Loop/Coupon.php @@ -24,6 +24,9 @@ namespace Thelia\Core\Template\Loop; use Propel\Runtime\ActiveQuery\Criteria; +use Thelia\Constraint\ConstraintFactory; +use Thelia\Constraint\Rule\CouponRuleInterface; +use Thelia\Core\HttpFoundation\Request; use Thelia\Core\Template\Element\BaseI18nLoop; use Thelia\Core\Template\Element\LoopResult; use Thelia\Core\Template\Element\LoopResultRow; @@ -84,10 +87,27 @@ class Coupon extends BaseI18nLoop $coupons = $this->search($search, $pagination); $loopResult = new LoopResult(); + /** @var ConstraintFactory $constraintFactory */ + $constraintFactory = $this->container->get('thelia.constraint.factory'); + + /** @var Request $request */ + $request = $this->container->get('request'); + /** @var Lang $lang */ + $lang = $request->getSession()->getLang(); + /** @var MCoupon $coupon */ foreach ($coupons as $coupon) { $loopResultRow = new LoopResultRow(); + $rules = $constraintFactory->unserializeCouponRuleCollection( + $coupon->getSerializedRules() + ); + + $cleanedRules = array(); + /** @var CouponRuleInterface $rule */ + foreach ($rules->getRules() as $key => $rule) { + $cleanedRules[] = $rule->getToolTip(); + } $loopResultRow->set("ID", $coupon->getId()) ->set("IS_TRANSLATED", $coupon->getVirtualColumn('IS_TRANSLATED')) ->set("LOCALE", $locale) @@ -95,13 +115,13 @@ class Coupon extends BaseI18nLoop ->set("TITLE", $coupon->getVirtualColumn('i18n_TITLE')) ->set("SHORT_DESCRIPTION", $coupon->getVirtualColumn('i18n_SHORT_DESCRIPTION')) ->set("DESCRIPTION", $coupon->getVirtualColumn('i18n_DESCRIPTION')) - ->set("EXPIRATION_DATE", $coupon->getExpirationDate()) + ->set("EXPIRATION_DATE", $coupon->getExpirationDate($lang->getDateFormat())) ->set("USAGE_LEFT", $coupon->getMaxUsage()) ->set("IS_CUMULATIVE", $coupon->getIsCumulative()) ->set("IS_REMOVING_POSTAGE", $coupon->getIsRemovingPostage()) ->set("IS_ENABLED", $coupon->getIsEnabled()) ->set("AMOUNT", $coupon->getAmount()) - ->set("APPLICATION_CONDITIONS", $coupon->getRules()); + ->set("APPLICATION_CONDITIONS", $cleanedRules); $loopResult->addRow($loopResultRow); } diff --git a/install/faker.php b/install/faker.php index 04495a15e..5bb21d4fa 100755 --- a/install/faker.php +++ b/install/faker.php @@ -556,6 +556,7 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua $serializedRules = $constraintFactory->serializeCouponRuleCollection($rules); $coupon1->setSerializedRules($serializedRules); + $coupon1->setMaxUsage(40); $coupon1->setIsCumulative(1); $coupon1->setIsRemovingPostage(0); $coupon1->save(); @@ -606,6 +607,7 @@ Sed facilisis pellentesque nisl, eu tincidunt erat scelerisque a. Nullam malesua $serializedRules = $constraintFactory->serializeCouponRuleCollection($rules); $coupon2->setSerializedRules($serializedRules); + $coupon1->setMaxUsage(-1); $coupon2->setIsCumulative(0); $coupon2->setIsRemovingPostage(1); $coupon2->save(); diff --git a/templates/admin/default/coupon-read.html b/templates/admin/default/coupon-read.html index f187df7a0..3c2d4bff1 100755 --- a/templates/admin/default/coupon-read.html +++ b/templates/admin/default/coupon-read.html @@ -10,103 +10,103 @@ {include file="includes/coupon_breadcrumb.html"} - + + {loop type="coupon" name="read_coupon" id={$couponId} backend_context="true"}
-

Coupons : Read coupon n°1

+

{intl l='Coupon : '}#CODE

- {loop type="coupon" name="read_coupon" id=1 backend_context="true"} -
- - {if #IS_ENABLED}{else}This coupon is disabled, you can enable to the bottom of this form.{/if} -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + +
Code#CODE
Title#TITLE
Expiration dateEXPIRATION_DATE
Usage left - {if #USAGE_LEFT} - - #USAGE_LEFT - - {else} - - 0 - - {/if} -
#SHORT_DESCRIPTION
#DESCRIPTION
- {if #IS_CUMULATIVE} - - {intl l="May be cumulative"} - - {else} - - {intl l="Can't be cumulative"} - - {/if} -
- {if #IS_REMOVING_POSTAGE} - - {intl l="Will remove postage"} - - {else} +
+ + {if #IS_ENABLED}{else}{intl l='This coupon is disabled, you can enable to the bottom of this form.'}{/if} +
+ + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - -
{intl l='Title'}#TITLE
{intl l='Expiration date'}#EXPIRATION_DATE
{intl l='Usage left'} + {if #USAGE_LEFT} - {intl l="Won't remove postage"} + #USAGE_LEFT + + {else} + + 0 + + {/if} +
#SHORT_DESCRIPTION
#DESCRIPTION
+ {if #IS_CUMULATIVE} + + {intl l="May be cumulative"} + + {else} + + {intl l="Can't be cumulative"} {/if} -
Amount#AMOUNT
Conditions of application -
    -
  • Total cart supperior to 400 €
    • -
  • OR
    • -
  • At least 4 products
    • -
-
Actions - Edit - Enabled -
+
+ {if #IS_REMOVING_POSTAGE} + + {intl l="Will remove postage"} + + {else} + + {intl l="Won't remove postage"} + + {/if} +
{intl l='Amount'}#AMOUNT
{intl l='Application field'} +
    + {foreach from=$APPLICATION_CONDITIONS item=rule name=rulesForeach} + {if !$smarty.foreach.rulesForeach.first} +
  • {intl l='And'}
    • + {/if} +
  • {$rule nofilter}
    • + {/foreach} +
+
{intl l='Actions'} + {intl l='Edit'} + {intl l='Enabled'} +
{/loop}
@@ -121,7 +121,4 @@ {/javascripts} - {javascripts file='assets/bootstrap-editable/js/bootstrap-editable.js'} - - {/javascripts} {/block} diff --git a/templates/admin/default/coupon-update.html b/templates/admin/default/coupon-update.html index 425d9a7ac..9a69ee8a0 100755 --- a/templates/admin/default/coupon-update.html +++ b/templates/admin/default/coupon-update.html @@ -37,29 +37,86 @@ $(function($){ miniBrowser(0, '/test_to_remove/datas_coupon_edit.json'); - $('#effect').on('change', function (e) { - var optionSelected = $("option:selected", this); - $('#effectToolTip').html(optionSelected.attr("data-description")); - }); - $('#category-rule').on('change', function (e) { - $('#rule-add-operators-values').html('
'); - var url = "{$urlAjaxGetRuleInput}"; - url = url.replace('ruleId', $(this).val()) - console.log(url); - $.ajax({ - url: url, - statusCode: { - 404: function() { - $('#rule-add-operators-values').html( - '{intl l='Please select another rule'}' - ); - } - } - }).done(function(data) { - $('#rule-add-operators-values').html(data); + + + + + // Init Rules + var initRule = function() { + var rules = []; + {foreach from=$rulesObject key=k item=rule} + var rule = []; + rule['serviceId'] = '{$rule.serviceId nofilter}'; + rule['operators'] = []; + rule['values'] = []; + + {foreach from=$rule.validators.setOperators key=input item=operator} + rule['operators']['{$input nofilter}'] = '{$operator nofilter}'; + rule['values']['{$input nofilter}'] = '{$rule.validators.setValues[$input] nofilter}'; + {/foreach} + rules.push(rule); + {/foreach} + + return rules; + } + + // Save Rules AJAX + var saveRuleAjax = function() { + console.log(rules); + console.log('save'); + } + + // Remove 1 Rule then Save Rules AJAX + var removeRuleAjax = function($id) { + rules.slice($id, 1); + saveRuleAjax(); + } + + // Add 1 Rule then Save Rules AJAX + var addRuleAjax = function() { + rules.pop(ruleToSave); + saveRuleAjax(); + } + + + var rules = initRule(); + console.log(rules); + + + // Reload effect inputs when changing effect + var onEffectChange = function() { + $('#effect').on('change', function (e) { + var optionSelected = $("option:selected", this); + $('#effectToolTip').html(optionSelected.attr("data-description")); }); - }); + } + onEffectChange(); + + // Reload rule inputs when changing effect + var onRuleChange = function() { + $('#category-rule').on('change', function (e) { + $('#rule-add-operators-values').html('
'); + var url = "{$urlAjaxGetRuleInput}"; + url = url.replace('ruleId', $(this).val()) + console.log(url); + $.ajax({ + url: url, + statusCode: { + 404: function() { + $('#rule-add-operators-values').html( + '{intl l='Please select another rule'}' + ); + } + } + }).done(function(data) { + $('#rule-add-operators-values').html(data); + }); + }); + } + onRuleChange(); + + }); diff --git a/templates/admin/default/coupon/form.html b/templates/admin/default/coupon/form.html index b092e30b1..8ebd64ec1 100644 --- a/templates/admin/default/coupon/form.html +++ b/templates/admin/default/coupon/form.html @@ -167,9 +167,6 @@ @@ -178,9 +175,15 @@ - {foreach from=$rulesObject item=rule} + {foreach from=$rulesObject item=rule name=rulesForeach} - + + *} {*
{intl l='Rules'} - - -
{$rule.tooltip} + {if !$smarty.foreach.rulesForeach.first} + {intl l='And'} + {/if} + {$rule.tooltip nofilter} + {intl l='Edit'} {intl l='Delete'} @@ -194,9 +197,32 @@
- - - + + + + + + + + + + + + + + + + + + +
+ {intl l='Add a Rule'} + + + +
{intl l='Conditions link'}{intl l='Rule Type'}{intl l='Operator'}{intl l='Value'}
+ +
diff --git a/templates/admin/default/coupon/rule-input-ajax.html b/templates/admin/default/coupon/rule-input-ajax.html index 4e7ab4533..1d4502a1c 100644 --- a/templates/admin/default/coupon/rule-input-ajax.html +++ b/templates/admin/default/coupon/rule-input-ajax.html @@ -1,8 +1,4 @@ -{*test*} -{*{$ruleId}*} -{*{$inputs|var_dump}*} - -{foreach from=$inputs key=name item=input} +{foreach from=$inputs.inputs key=name item=input}
@@ -71,4 +67,15 @@ {*
*} {**} - {**} \ No newline at end of file + {**} + + \ No newline at end of file From f8c907d79eb5785fd204b902f3b5cacd3facb19c Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Tue, 10 Sep 2013 14:57:56 +0200 Subject: [PATCH 3/9] update customer loop in template customer --- templates/admin/default/customers.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin/default/customers.html b/templates/admin/default/customers.html index 923941c4e..ea498f72c 100644 --- a/templates/admin/default/customers.html +++ b/templates/admin/default/customers.html @@ -59,7 +59,7 @@ - {loop name="customer_list" type="customer" visible="*" last_order="1" backend_context="1" page={$customer_page} limit={$display_customer}} + {loop name="customer_list" type="customer" current="false" visible="*" last_order="1" backend_context="1" page={$customer_page} limit={$display_customer}} {#REF} From f481da7a2f5d141fe1341f9db7b644539e05fea2 Mon Sep 17 00:00:00 2001 From: gmorel Date: Tue, 10 Sep 2013 15:41:23 +0200 Subject: [PATCH 4/9] WIP - Coupon Add/Edit/Delete rule AJAX --- core/lib/Thelia/Action/Coupon.php | 1 - .../Thelia/Config/Resources/routing/admin.xml | 3 + .../Controller/Admin/CouponController.php | 142 ++++- core/lib/Thelia/Controller/BaseController.php | 10 + core/lib/Thelia/Core/Event/TheliaEvents.php | 16 - templates/admin/default/assets/js/json2.js | 486 ++++++++++++++++++ templates/admin/default/coupon-update.html | 62 ++- templates/admin/default/coupon/form.html | 188 +++---- .../admin/default/coupon/rule-input-ajax.html | 39 +- templates/admin/default/coupon/rules.html | 18 + 10 files changed, 809 insertions(+), 156 deletions(-) create mode 100644 templates/admin/default/assets/js/json2.js create mode 100644 templates/admin/default/coupon/rules.html diff --git a/core/lib/Thelia/Action/Coupon.php b/core/lib/Thelia/Action/Coupon.php index cc32d2c68..fee349585 100755 --- a/core/lib/Thelia/Action/Coupon.php +++ b/core/lib/Thelia/Action/Coupon.php @@ -172,7 +172,6 @@ class Coupon extends BaseAction implements EventSubscriberInterface TheliaEvents::COUPON_DISABLE => array("disable", 128), TheliaEvents::COUPON_ENABLE => array("enable", 128), TheliaEvents::COUPON_CONSUME => array("consume", 128), - TheliaEvents::COUPON_RULE_CREATE => array("createRule", 128), TheliaEvents::COUPON_RULE_UPDATE => array("updateRule", 128), TheliaEvents::COUPON_RULE_DELETE => array("deleteRule", 128) ); diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml index 3235171df..f4ad23d67 100755 --- a/core/lib/Thelia/Config/Resources/routing/admin.xml +++ b/core/lib/Thelia/Config/Resources/routing/admin.xml @@ -95,6 +95,9 @@ Thelia\Controller\Admin\CouponController::getRuleInputAction + + Thelia\Controller\Admin\CouponController::updateRulesAction + diff --git a/core/lib/Thelia/Controller/Admin/CouponController.php b/core/lib/Thelia/Controller/Admin/CouponController.php index dd2bfe54d..e11fcf09e 100755 --- a/core/lib/Thelia/Controller/Admin/CouponController.php +++ b/core/lib/Thelia/Controller/Admin/CouponController.php @@ -202,13 +202,18 @@ class CouponController extends BaseAdminController $args['availableCoupons'] = $this->getAvailableCoupons(); $args['availableRules'] = $this->getAvailableRules(); - $args['urlAjaxGetRuleInput'] = $this->getRouteFromRouter( - 'router.admin', + $args['urlAjaxGetRuleInput'] = $this->getRoute( 'admin.coupon.rule.input', array('ruleId' => 'ruleId'), Router::ABSOLUTE_URL ); + $args['urlAjaxUpdateRules'] = $this->getRoute( + 'admin.coupon.rule.update', + array('couponId' => $couponId), + Router::ABSOLUTE_URL + ); + $args['formAction'] = 'admin/coupon/update/' . $couponId; return $this->render( @@ -289,6 +294,8 @@ class CouponController extends BaseAdminController ); } +// $args['rules'] = $this->cleanRuleForTemplate($coupon->getRules()->getRules()); + // Setup the object form $changeForm = new CouponCreationForm($this->getRequest(), 'form', $data); @@ -339,15 +346,17 @@ class CouponController extends BaseAdminController { $this->checkAuth('ADMIN', 'admin.coupon.read'); -// if (!$this->getRequest()->isXmlHttpRequest()) { -// $this->redirect( -// $this->getRoute( -// 'admin', -// array(), -// Router::ABSOLUTE_URL -// ) -// ); -// } + if ($this->isDebug()) { + if (!$this->getRequest()->isXmlHttpRequest()) { + $this->redirect( + $this->getRoute( + 'admin', + array(), + Router::ABSOLUTE_URL + ) + ); + } + } /** @var ConstraintFactory $constraintFactory */ $constraintFactory = $this->container->get('thelia.constraint.factory'); @@ -366,6 +375,102 @@ class CouponController extends BaseAdminController ); } + + /** + * Manage Coupons read display + * + * @param int $couponId Coupon id + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function updateRulesAction($couponId) + { + $this->checkAuth('ADMIN', 'admin.coupon.read'); + + if ($this->isDebug()) { + if (!$this->getRequest()->isXmlHttpRequest()) { + $this->redirect( + $this->getRoute( + 'admin', + array(), + Router::ABSOLUTE_URL + ) + ); + } + } + + $search = CouponQuery::create(); + /** @var Coupon $coupon */ + $coupon = $search->findOneById($couponId); + + if (!$coupon) { + return $this->pageNotFound(); + } + + $rules = new CouponRuleCollection(); + + /** @var ConstraintFactory $constraintFactory */ + $constraintFactory = $this->container->get('thelia.constraint.factory'); + $rulesReceived = json_decode($this->getRequest()->get('rules')); + foreach ($rulesReceived as $ruleReceived) { + var_dump('building ', $ruleReceived->values); + $rule = $constraintFactory->build( + $ruleReceived->serviceId, + (array) $ruleReceived->operators, + (array) $ruleReceived->values + ); + $rules->add(clone $rule); + } + + $coupon->setSerializedRules( + $constraintFactory->serializeCouponRuleCollection($rules) + ); + + $couponEvent = new CouponCreateOrUpdateEvent( + $coupon->getCode(), + $coupon->getTitle(), + $coupon->getAmount(), + $coupon->getType(), + $coupon->getShortDescription(), + $coupon->getDescription(), + $coupon->getIsEnabled(), + $coupon->getExpirationDate(), + $coupon->getIsAvailableOnSpecialOffers(), + $coupon->getIsCumulative(), + $coupon->getIsRemovingPostage(), + $coupon->getMaxUsage(), + $rules, + $coupon->getLocale() + ); + + $eventToDispatch = TheliaEvents::COUPON_RULE_UPDATE; + // Dispatch Event to the Action + $this->dispatch( + $eventToDispatch, + $couponEvent + ); + + $this->adminLogAppend( + sprintf( + 'Coupon %s (ID %s) rules updated', + $couponEvent->getTitle(), + $couponEvent->getCoupon()->getId() + ) + ); + + $cleanedRules = $this->cleanRuleForTemplate($rules); + + return $this->render( + 'coupon/rules', + array( + 'couponId' => $couponId, + 'rules' => $cleanedRules, + 'urlEdit' => $couponId, + 'urlDelete' => $couponId + ) + ); + } + /** * Build a Coupon from its form * @@ -555,6 +660,21 @@ class CouponController extends BaseAdminController return $cleanedRules; } + /** + * @param $rules + * @return array + */ + protected function cleanRuleForTemplate($rules) + { + $cleanedRules = array(); + /** @var $rule CouponRuleInterface */ + foreach ($rules->getRules() as $rule) { + $cleanedRules[] = $rule->getToolTip(); + } + + return $cleanedRules; + } + // /** // * Validation Rule creation // * diff --git a/core/lib/Thelia/Controller/BaseController.php b/core/lib/Thelia/Controller/BaseController.php index 666e8ca32..12e1e8e12 100755 --- a/core/lib/Thelia/Controller/BaseController.php +++ b/core/lib/Thelia/Controller/BaseController.php @@ -251,4 +251,14 @@ class BaseController extends ContainerAware { throw new NotFoundHttpException(); } + + /** + * Check if environment is in debug mode + * + * @return bool + */ + protected function isDebug() + { + return $this->container->getParameter('kernel.debug'); + } } \ No newline at end of file diff --git a/core/lib/Thelia/Core/Event/TheliaEvents.php b/core/lib/Thelia/Core/Event/TheliaEvents.php index c5ae0afbf..500803f53 100755 --- a/core/lib/Thelia/Core/Event/TheliaEvents.php +++ b/core/lib/Thelia/Core/Event/TheliaEvents.php @@ -281,22 +281,6 @@ final class TheliaEvents */ const AFTER_CONSUME_COUPON = "action.after_consume_coupon"; - - /** - * Sent when attempting to create Coupon Rule - */ - const COUPON_RULE_CREATE = "action.create_coupon_rule"; - - /** - * Sent just before an attempt to create a Coupon Rule - */ - const BEFORE_COUPON_RULE_CREATE = "action.before_create_coupon_rule"; - - /** - * Sent just after an attempt to create a Coupon Rule - */ - const AFTER_COUPON_RULE_CREATE = "action.after_create_coupon_rule"; - /** * Sent when attempting to update Coupon Rule */ diff --git a/templates/admin/default/assets/js/json2.js b/templates/admin/default/assets/js/json2.js new file mode 100644 index 000000000..286c98ebe --- /dev/null +++ b/templates/admin/default/assets/js/json2.js @@ -0,0 +1,486 @@ +/* + json2.js + 2013-05-26 + + Public Domain. + + NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK. + + See http://www.JSON.org/js.html + + + This code should be minified before deployment. + See http://javascript.crockford.com/jsmin.html + + USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO + NOT CONTROL. + + + This file creates a global JSON object containing two methods: stringify + and parse. + + JSON.stringify(value, replacer, space) + value any JavaScript value, usually an object or array. + + replacer an optional parameter that determines how object + values are stringified for objects. It can be a + function or an array of strings. + + space an optional parameter that specifies the indentation + of nested structures. If it is omitted, the text will + be packed without extra whitespace. If it is a number, + it will specify the number of spaces to indent at each + level. If it is a string (such as '\t' or ' '), + it contains the characters used to indent at each level. + + This method produces a JSON text from a JavaScript value. + + When an object value is found, if the object contains a toJSON + method, its toJSON method will be called and the result will be + stringified. A toJSON method does not serialize: it returns the + value represented by the name/value pair that should be serialized, + or undefined if nothing should be serialized. The toJSON method + will be passed the key associated with the value, and this will be + bound to the value + + For example, this would serialize Dates as ISO strings. + + Date.prototype.toJSON = function (key) { + function f(n) { + // Format integers to have at least two digits. + return n < 10 ? '0' + n : n; + } + + return this.getUTCFullYear() + '-' + + f(this.getUTCMonth() + 1) + '-' + + f(this.getUTCDate()) + 'T' + + f(this.getUTCHours()) + ':' + + f(this.getUTCMinutes()) + ':' + + f(this.getUTCSeconds()) + 'Z'; + }; + + You can provide an optional replacer method. It will be passed the + key and value of each member, with this bound to the containing + object. The value that is returned from your method will be + serialized. If your method returns undefined, then the member will + be excluded from the serialization. + + If the replacer parameter is an array of strings, then it will be + used to select the members to be serialized. It filters the results + such that only members with keys listed in the replacer array are + stringified. + + Values that do not have JSON representations, such as undefined or + functions, will not be serialized. Such values in objects will be + dropped; in arrays they will be replaced with null. You can use + a replacer function to replace those with JSON values. + JSON.stringify(undefined) returns undefined. + + The optional space parameter produces a stringification of the + value that is filled with line breaks and indentation to make it + easier to read. + + If the space parameter is a non-empty string, then that string will + be used for indentation. If the space parameter is a number, then + the indentation will be that many spaces. + + Example: + + text = JSON.stringify(['e', {pluribus: 'unum'}]); + // text is '["e",{"pluribus":"unum"}]' + + + text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t'); + // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]' + + text = JSON.stringify([new Date()], function (key, value) { + return this[key] instanceof Date ? + 'Date(' + this[key] + ')' : value; + }); + // text is '["Date(---current time---)"]' + + + JSON.parse(text, reviver) + This method parses a JSON text to produce an object or array. + It can throw a SyntaxError exception. + + The optional reviver parameter is a function that can filter and + transform the results. It receives each of the keys and values, + and its return value is used instead of the original value. + If it returns what it received, then the structure is not modified. + If it returns undefined then the member is deleted. + + Example: + + // Parse the text. Values that look like ISO date strings will + // be converted to Date objects. + + myData = JSON.parse(text, function (key, value) { + var a; + if (typeof value === 'string') { + a = + /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value); + if (a) { + return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4], + +a[5], +a[6])); + } + } + return value; + }); + + myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) { + var d; + if (typeof value === 'string' && + value.slice(0, 5) === 'Date(' && + value.slice(-1) === ')') { + d = new Date(value.slice(5, -1)); + if (d) { + return d; + } + } + return value; + }); + + + This is a reference implementation. You are free to copy, modify, or + redistribute. + */ + +/*jslint evil: true, regexp: true */ + +/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply, + call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours, + getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join, + lastIndex, length, parse, prototype, push, replace, slice, stringify, + test, toJSON, toString, valueOf + */ + + +// Create a JSON object only if one does not already exist. We create the +// methods in a closure to avoid creating global variables. + +if (typeof JSON !== 'object') { + JSON = {}; +} + +(function () { + 'use strict'; + + function f(n) { + // Format integers to have at least two digits. + return n < 10 ? '0' + n : n; + } + + if (typeof Date.prototype.toJSON !== 'function') { + + Date.prototype.toJSON = function () { + + return isFinite(this.valueOf()) + ? this.getUTCFullYear() + '-' + + f(this.getUTCMonth() + 1) + '-' + + f(this.getUTCDate()) + 'T' + + f(this.getUTCHours()) + ':' + + f(this.getUTCMinutes()) + ':' + + f(this.getUTCSeconds()) + 'Z' + : null; + }; + + String.prototype.toJSON = + Number.prototype.toJSON = + Boolean.prototype.toJSON = function () { + return this.valueOf(); + }; + } + + var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g, + escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g, + gap, + indent, + meta = { // table of character substitutions + '\b': '\\b', + '\t': '\\t', + '\n': '\\n', + '\f': '\\f', + '\r': '\\r', + '"' : '\\"', + '\\': '\\\\' + }, + rep; + + + function quote(string) { + +// If the string contains no control characters, no quote characters, and no +// backslash characters, then we can safely slap some quotes around it. +// Otherwise we must also replace the offending characters with safe escape +// sequences. + + escapable.lastIndex = 0; + return escapable.test(string) ? '"' + string.replace(escapable, function (a) { + var c = meta[a]; + return typeof c === 'string' + ? c + : '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4); + }) + '"' : '"' + string + '"'; + } + + + function str(key, holder) { + +// Produce a string from holder[key]. + + var i, // The loop counter. + k, // The member key. + v, // The member value. + length, + mind = gap, + partial, + value = holder[key]; + +// If the value has a toJSON method, call it to obtain a replacement value. + + if (value && typeof value === 'object' && + typeof value.toJSON === 'function') { + value = value.toJSON(key); + } + +// If we were called with a replacer function, then call the replacer to +// obtain a replacement value. + + if (typeof rep === 'function') { + value = rep.call(holder, key, value); + } + +// What happens next depends on the value's type. + + switch (typeof value) { + case 'string': + return quote(value); + + case 'number': + +// JSON numbers must be finite. Encode non-finite numbers as null. + + return isFinite(value) ? String(value) : 'null'; + + case 'boolean': + case 'null': + +// If the value is a boolean or null, convert it to a string. Note: +// typeof null does not produce 'null'. The case is included here in +// the remote chance that this gets fixed someday. + + return String(value); + +// If the type is 'object', we might be dealing with an object or an array or +// null. + + case 'object': + +// Due to a specification blunder in ECMAScript, typeof null is 'object', +// so watch out for that case. + + if (!value) { + return 'null'; + } + +// Make an array to hold the partial results of stringifying this object value. + + gap += indent; + partial = []; + +// Is the value an array? + + if (Object.prototype.toString.apply(value) === '[object Array]') { + +// The value is an array. Stringify every element. Use null as a placeholder +// for non-JSON values. + + length = value.length; + for (i = 0; i < length; i += 1) { + partial[i] = str(i, value) || 'null'; + } + +// Join all of the elements together, separated with commas, and wrap them in +// brackets. + + v = partial.length === 0 + ? '[]' + : gap + ? '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']' + : '[' + partial.join(',') + ']'; + gap = mind; + return v; + } + +// If the replacer is an array, use it to select the members to be stringified. + + if (rep && typeof rep === 'object') { + length = rep.length; + for (i = 0; i < length; i += 1) { + if (typeof rep[i] === 'string') { + k = rep[i]; + v = str(k, value); + if (v) { + partial.push(quote(k) + (gap ? ': ' : ':') + v); + } + } + } + } else { + +// Otherwise, iterate through all of the keys in the object. + + for (k in value) { + if (Object.prototype.hasOwnProperty.call(value, k)) { + v = str(k, value); + if (v) { + partial.push(quote(k) + (gap ? ': ' : ':') + v); + } + } + } + } + +// Join all of the member texts together, separated with commas, +// and wrap them in braces. + + v = partial.length === 0 + ? '{}' + : gap + ? '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}' + : '{' + partial.join(',') + '}'; + gap = mind; + return v; + } + } + +// If the JSON object does not yet have a stringify method, give it one. + + if (typeof JSON.stringify !== 'function') { + JSON.stringify = function (value, replacer, space) { + +// The stringify method takes a value and an optional replacer, and an optional +// space parameter, and returns a JSON text. The replacer can be a function +// that can replace values, or an array of strings that will select the keys. +// A default replacer method can be provided. Use of the space parameter can +// produce text that is more easily readable. + + var i; + gap = ''; + indent = ''; + +// If the space parameter is a number, make an indent string containing that +// many spaces. + + if (typeof space === 'number') { + for (i = 0; i < space; i += 1) { + indent += ' '; + } + +// If the space parameter is a string, it will be used as the indent string. + + } else if (typeof space === 'string') { + indent = space; + } + +// If there is a replacer, it must be a function or an array. +// Otherwise, throw an error. + + rep = replacer; + if (replacer && typeof replacer !== 'function' && + (typeof replacer !== 'object' || + typeof replacer.length !== 'number')) { + throw new Error('JSON.stringify'); + } + +// Make a fake root object containing our value under the key of ''. +// Return the result of stringifying the value. + + return str('', {'': value}); + }; + } + + +// If the JSON object does not yet have a parse method, give it one. + + if (typeof JSON.parse !== 'function') { + JSON.parse = function (text, reviver) { + +// The parse method takes a text and an optional reviver function, and returns +// a JavaScript value if the text is a valid JSON text. + + var j; + + function walk(holder, key) { + +// The walk method is used to recursively walk the resulting structure so +// that modifications can be made. + + var k, v, value = holder[key]; + if (value && typeof value === 'object') { + for (k in value) { + if (Object.prototype.hasOwnProperty.call(value, k)) { + v = walk(value, k); + if (v !== undefined) { + value[k] = v; + } else { + delete value[k]; + } + } + } + } + return reviver.call(holder, key, value); + } + + +// Parsing happens in four stages. In the first stage, we replace certain +// Unicode characters with escape sequences. JavaScript handles many characters +// incorrectly, either silently deleting them, or treating them as line endings. + + text = String(text); + cx.lastIndex = 0; + if (cx.test(text)) { + text = text.replace(cx, function (a) { + return '\\u' + + ('0000' + a.charCodeAt(0).toString(16)).slice(-4); + }); + } + +// In the second stage, we run the text against regular expressions that look +// for non-JSON patterns. We are especially concerned with '()' and 'new' +// because they can cause invocation, and '=' because it can cause mutation. +// But just to be safe, we want to reject all unexpected forms. + +// We split the second stage into 4 regexp operations in order to work around +// crippling inefficiencies in IE's and Safari's regexp engines. First we +// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we +// replace all simple value tokens with ']' characters. Third, we delete all +// open brackets that follow a colon or comma or that begin the text. Finally, +// we look to see that the remaining characters are only whitespace or ']' or +// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval. + + if (/^[\],:{}\s]*$/ + .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@') + .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']') + .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) { + +// In the third stage we use the eval function to compile the text into a +// JavaScript structure. The '{' operator is subject to a syntactic ambiguity +// in JavaScript: it can begin a block or an object literal. We wrap the text +// in parens to eliminate the ambiguity. + + j = eval('(' + text + ')'); + +// In the optional fourth stage, we recursively walk the new structure, passing +// each name/value pair to a reviver function for possible transformation. + + return typeof reviver === 'function' + ? walk({'': j}, '') + : j; + } + +// If the text is not JSON parseable, then a SyntaxError is thrown. + + throw new SyntaxError('JSON.parse'); + }; + } +}()); \ No newline at end of file diff --git a/templates/admin/default/coupon-update.html b/templates/admin/default/coupon-update.html index 9a69ee8a0..9b6387cd7 100755 --- a/templates/admin/default/coupon-update.html +++ b/templates/admin/default/coupon-update.html @@ -33,6 +33,10 @@ {/javascripts} + {javascripts file='assets/js/json2.js'} + + {/javascripts} + \ No newline at end of file diff --git a/templates/admin/default/coupon/rules.html b/templates/admin/default/coupon/rules.html new file mode 100644 index 000000000..8dca66c49 --- /dev/null +++ b/templates/admin/default/coupon/rules.html @@ -0,0 +1,18 @@ +{foreach from=$rules item=rule name=rulesForeach} + + + {if !$smarty.foreach.rulesForeach.first} + {intl l='And'} + {/if} + {$rule nofilter} + + + + {intl l='Edit'} + + + {intl l='Delete'} + + + +{/foreach} From 281ec337aa0c4583c374dbb61f69be8195554e8a Mon Sep 17 00:00:00 2001 From: franck Date: Tue, 10 Sep 2013 15:45:29 +0200 Subject: [PATCH 5/9] Started product attributes management --- .../Thelia/Config/Resources/routing/admin.xml | 4 +- install/INSTALL-TODO.txt | 1 - install/insert.sql | 542 +++++++++--------- reset_install.bat | 4 +- templates/admin/default/admin-layout.tpl | 4 + templates/admin/default/configuration.html | 6 +- .../includes/generic-create-dialog.html | 3 +- 7 files changed, 283 insertions(+), 281 deletions(-) diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml index e8262117b..0f4e7bfae 100755 --- a/core/lib/Thelia/Config/Resources/routing/admin.xml +++ b/core/lib/Thelia/Config/Resources/routing/admin.xml @@ -149,11 +149,11 @@ - + Thelia\Controller\Admin\AttributeController::defaultAction - + Thelia\Controller\Admin\AttributeController::updateAction diff --git a/install/INSTALL-TODO.txt b/install/INSTALL-TODO.txt index 8ea68554e..0b8001fe9 100755 --- a/install/INSTALL-TODO.txt +++ b/install/INSTALL-TODO.txt @@ -3,7 +3,6 @@ A faire dans la procédure d'install Variables Config à initialiser: -- base_url : url de base de la boutique avec / final (ex. http://www.boutique.com/, ou http://www.boutique.com/path/to/thelia2/ ) - base_admin_template : chemin du template admin relatif au repertoire template (ex. admin/default) - default_locale : la locale par défaut (ex. en_US), à utiliser pour les fichiers de traduction - asset_dir_from_web_root : le chemin relatif à /web du repertoires des assets (ex. assets) diff --git a/install/insert.sql b/install/insert.sql index 344381a37..774d22472 100755 --- a/install/insert.sql +++ b/install/insert.sql @@ -1,6 +1,6 @@ INSERT INTO `lang`(`id`,`title`,`code`,`locale`,`url`,`date_format`,`time_format`,`datetime_format`,`decimal_separator`,`thousands_separator`,`decimals`,`by_default`,`created_at`,`updated_at`)VALUES (1, 'Français', 'fr', 'fr_FR', '', 'd/m/Y', 'H:i:s', 'd/m/y H:i:s', ',', ' ', '2', '1', NOW(), NOW()), -(2, 'English', 'en', 'en_EN', '', 'm-d-Y', 'h:i:s', 'm-d-Y h:i:s', '.', ' ', '2', '0', NOW(), NOW()), +(2, 'English', 'en', 'en_US', '', 'm-d-Y', 'h:i:s', 'm-d-Y h:i:s', '.', ' ', '2', '0', NOW(), NOW()), (3, 'castellano', 'es', 'es_ES', '', 'm-d-Y', 'h:i:s', 'm-d-Y h:i:s', ',', '.', '2', '0', NOW(), NOW()), (4, 'Italiano', 'it', 'it_IT', '', 'd/m/Y', 'H:i:s', 'd/m/y H:i:s', ',', ' ', '2', '0', NOW(), NOW()); @@ -28,11 +28,11 @@ INSERT INTO `customer_title`(`id`, `by_default`, `position`, `created_at`, `upda INSERT INTO `customer_title_i18n` (`id`, `locale`, `short`, `long`) VALUES (1, 'fr_FR', 'Mr', 'Monsieur'), -(1, 'en_UK', 'M', 'Mister'), +(1, 'en_US', 'M', 'Mister'), (2, 'fr_FR', 'Mrs', 'Madame'), -(2, 'en_UK', 'Mme', 'Misses'), +(2, 'en_US', 'Mme', 'Misses'), (3, 'fr_FR', 'Miss', 'Madamemoiselle'), -(3, 'en_UK', 'Mlle', 'Miss'); +(3, 'en_US', 'Mlle', 'Miss'); INSERT INTO `currency` (`id` ,`code` ,`symbol` ,`rate`, `position` ,`by_default` ,`created_at` ,`updated_at`) VALUES @@ -43,11 +43,11 @@ VALUES INSERT INTO `currency_i18n` (`id` ,`locale` ,`name`) VALUES (1, 'fr_FR', 'Euro'), -(1, 'en_UK', 'Euro'), +(1, 'en_US', 'Euro'), (2, 'fr_FR', 'Dollar Américain'), -(2, 'en_UK', 'United States Dollar'), +(2, 'en_US', 'United States Dollar'), (3, 'fr_FR', 'Livre anglaise'), -(3, 'en_UK', 'UK Pound'); +(3, 'en_US', 'UK Pound'); INSERT INTO `country` (`id`, `area_id`, `isocode`, `isoalpha2`, `isoalpha3`, `created_at`, `updated_at`) VALUES @@ -317,795 +317,795 @@ INSERT INTO `country` (`id`, `area_id`, `isocode`, `isoalpha2`, `isoalpha3`, `cr (268, NULL, '840', 'US', 'USA', NOW(), NOW()); INSERT INTO `country_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `postscriptum`) VALUES -(1, 'en_UK', 'Afghanistan', '', '', ''), +(1, 'en_US', 'Afghanistan', '', '', ''), (1, 'es_ES', 'Afganistán', '', '', ''), (1, 'fr_FR', 'Afghanistan', '', '', ''), -(2, 'en_UK', 'South Africa', '', '', ''), +(2, 'en_US', 'South Africa', '', '', ''), (2, 'es_ES', 'Sudáfrica', '', '', ''), (2, 'fr_FR', 'Afrique du Sud', '', '', ''), -(3, 'en_UK', 'Albania', '', '', ''), +(3, 'en_US', 'Albania', '', '', ''), (3, 'es_ES', 'Albania', '', '', ''), (3, 'fr_FR', 'Albanie', '', '', ''), -(4, 'en_UK', 'Algeria', '', '', ''), +(4, 'en_US', 'Algeria', '', '', ''), (4, 'es_ES', 'Argelia', '', '', ''), (4, 'fr_FR', 'Algérie', '', '', ''), -(5, 'en_UK', 'Germany', '', '', ''), +(5, 'en_US', 'Germany', '', '', ''), (5, 'es_ES', 'Alemania', '', '', ''), (5, 'fr_FR', 'Allemagne', '', '', ''), -(6, 'en_UK', 'Andorra', '', '', ''), +(6, 'en_US', 'Andorra', '', '', ''), (6, 'es_ES', 'Andorra', '', '', ''), (6, 'fr_FR', 'Andorre', '', '', ''), -(7, 'en_UK', 'Angola', '', '', ''), +(7, 'en_US', 'Angola', '', '', ''), (7, 'es_ES', 'Angola', '', '', ''), (7, 'fr_FR', 'Angola', '', '', ''), -(8, 'en_UK', 'Antigua and Barbuda', '', '', ''), +(8, 'en_US', 'Antigua and Barbuda', '', '', ''), (8, 'es_ES', 'Antigua y Barbuda', '', '', ''), (8, 'fr_FR', 'Antigua-et-Barbuda', '', '', ''), -(9, 'en_UK', 'Saudi Arabia', '', '', ''), +(9, 'en_US', 'Saudi Arabia', '', '', ''), (9, 'es_ES', 'Arabia Saudita', '', '', ''), (9, 'fr_FR', 'Arabie saoudite', '', '', ''), -(10, 'en_UK', 'Argentina', '', '', ''), +(10, 'en_US', 'Argentina', '', '', ''), (10, 'es_ES', 'Argentina', '', '', ''), (10, 'fr_FR', 'Argentine', '', '', ''), -(11, 'en_UK', 'Armenia', '', '', ''), +(11, 'en_US', 'Armenia', '', '', ''), (11, 'es_ES', 'Armenia', '', '', ''), (11, 'fr_FR', 'Arménie', '', '', ''), -(12, 'en_UK', 'Australia', '', '', ''), +(12, 'en_US', 'Australia', '', '', ''), (12, 'es_ES', 'Australia', '', '', ''), (12, 'fr_FR', 'Australie', '', '', ''), -(13, 'en_UK', 'Austria', '', '', ''), +(13, 'en_US', 'Austria', '', '', ''), (13, 'es_ES', 'Austria', '', '', ''), (13, 'fr_FR', 'Autriche', '', '', ''), -(14, 'en_UK', 'Azerbaijan', '', '', ''), +(14, 'en_US', 'Azerbaijan', '', '', ''), (14, 'es_ES', 'Azerbaiyán', '', '', ''), (14, 'fr_FR', 'Azerbaïdjan', '', '', ''), -(15, 'en_UK', 'Bahamas', '', '', ''), +(15, 'en_US', 'Bahamas', '', '', ''), (15, 'es_ES', 'Bahamas', '', '', ''), (15, 'fr_FR', 'Bahamas', '', '', ''), -(16, 'en_UK', 'Bahrain', '', '', ''), +(16, 'en_US', 'Bahrain', '', '', ''), (16, 'es_ES', 'Bahrein', '', '', ''), (16, 'fr_FR', 'Bahreïn', '', '', ''), -(17, 'en_UK', 'Bangladesh', '', '', ''), +(17, 'en_US', 'Bangladesh', '', '', ''), (17, 'es_ES', 'Bangladesh', '', '', ''), (17, 'fr_FR', 'Bangladesh', '', '', ''), -(18, 'en_UK', 'Barbados', '', '', ''), +(18, 'en_US', 'Barbados', '', '', ''), (18, 'es_ES', 'Barbados', '', '', ''), (18, 'fr_FR', 'Barbade', '', '', ''), -(19, 'en_UK', 'Belarus', '', '', ''), +(19, 'en_US', 'Belarus', '', '', ''), (19, 'es_ES', 'Belarús', '', '', ''), (19, 'fr_FR', 'Belau', '', '', ''), -(20, 'en_UK', 'Belgium', '', '', ''), +(20, 'en_US', 'Belgium', '', '', ''), (20, 'es_ES', 'Bélgica', '', '', ''), (20, 'fr_FR', 'Belgique', '', '', ''), -(21, 'en_UK', 'Belize', '', '', ''), +(21, 'en_US', 'Belize', '', '', ''), (21, 'es_ES', 'Belice', '', '', ''), (21, 'fr_FR', 'Belize', '', '', ''), -(22, 'en_UK', 'Benin', '', '', ''), +(22, 'en_US', 'Benin', '', '', ''), (22, 'es_ES', 'Benin', '', '', ''), (22, 'fr_FR', 'Bénin', '', '', ''), -(23, 'en_UK', 'Bhutan', '', '', ''), +(23, 'en_US', 'Bhutan', '', '', ''), (23, 'es_ES', 'Bhután', '', '', ''), (23, 'fr_FR', 'Bhoutan', '', '', ''), -(24, 'en_UK', 'Bielorussia', '', '', ''), +(24, 'en_US', 'Bielorussia', '', '', ''), (24, 'es_ES', 'Bielorusia', '', '', ''), (24, 'fr_FR', 'Biélorussie', '', '', ''), -(25, 'en_UK', 'Burma', '', '', ''), +(25, 'en_US', 'Burma', '', '', ''), (25, 'es_ES', 'Birmania', '', '', ''), (25, 'fr_FR', 'Birmanie', '', '', ''), -(26, 'en_UK', 'Bolivia', '', '', ''), +(26, 'en_US', 'Bolivia', '', '', ''), (26, 'es_ES', 'Bolivia', '', '', ''), (26, 'fr_FR', 'Bolivie', '', '', ''), -(27, 'en_UK', 'Bosnia and Herzegovina', '', '', ''), +(27, 'en_US', 'Bosnia and Herzegovina', '', '', ''), (27, 'es_ES', 'Bosnia y Herzegovina', '', '', ''), (27, 'fr_FR', 'Bosnie-Herzégovine', '', '', ''), -(28, 'en_UK', 'Botswana', '', '', ''), +(28, 'en_US', 'Botswana', '', '', ''), (28, 'es_ES', 'Botswana', '', '', ''), (28, 'fr_FR', 'Botswana', '', '', ''), -(29, 'en_UK', 'Brazil', '', '', ''), +(29, 'en_US', 'Brazil', '', '', ''), (29, 'es_ES', 'Brasil', '', '', ''), (29, 'fr_FR', 'Brésil', '', '', ''), -(30, 'en_UK', 'Brunei', '', '', ''), +(30, 'en_US', 'Brunei', '', '', ''), (30, 'es_ES', 'Brunei', '', '', ''), (30, 'fr_FR', 'Brunei', '', '', ''), -(31, 'en_UK', 'Bulgaria', '', '', ''), +(31, 'en_US', 'Bulgaria', '', '', ''), (31, 'es_ES', 'Bulgaria', '', '', ''), (31, 'fr_FR', 'Bulgarie', '', '', ''), -(32, 'en_UK', 'Burkina', '', '', ''), +(32, 'en_US', 'Burkina', '', '', ''), (32, 'es_ES', 'Burkina', '', '', ''), (32, 'fr_FR', 'Burkina', '', '', ''), -(33, 'en_UK', 'Burundi', '', '', ''), +(33, 'en_US', 'Burundi', '', '', ''), (33, 'es_ES', 'Burundi', '', '', ''), (33, 'fr_FR', 'Burundi', '', '', ''), -(34, 'en_UK', 'Cambodia', '', '', ''), +(34, 'en_US', 'Cambodia', '', '', ''), (34, 'es_ES', 'Camboya', '', '', ''), (34, 'fr_FR', 'Cambodge', '', '', ''), -(35, 'en_UK', 'Cameroon', '', '', ''), +(35, 'en_US', 'Cameroon', '', '', ''), (35, 'es_ES', 'Camerún', '', '', ''), (35, 'fr_FR', 'Cameroun', '', '', ''), -(37, 'en_UK', 'Cape Verde', '', '', ''), +(37, 'en_US', 'Cape Verde', '', '', ''), (37, 'es_ES', 'Cabo Verde', '', '', ''), (37, 'fr_FR', 'Cap-Vert', '', '', ''), -(38, 'en_UK', 'Chile', '', '', ''), +(38, 'en_US', 'Chile', '', '', ''), (38, 'es_ES', 'Chile', '', '', ''), (38, 'fr_FR', 'Chili', '', '', ''), -(39, 'en_UK', 'China', '', '', ''), +(39, 'en_US', 'China', '', '', ''), (39, 'es_ES', 'China', '', '', ''), (39, 'fr_FR', 'Chine', '', '', ''), -(40, 'en_UK', 'Cyprus', '', '', ''), +(40, 'en_US', 'Cyprus', '', '', ''), (40, 'es_ES', 'Chipre', '', '', ''), (40, 'fr_FR', 'Chypre', '', '', ''), -(41, 'en_UK', 'Colombia', '', '', ''), +(41, 'en_US', 'Colombia', '', '', ''), (41, 'es_ES', 'Colombia', '', '', ''), (41, 'fr_FR', 'Colombie', '', '', ''), -(42, 'en_UK', 'Comoros', '', '', ''), +(42, 'en_US', 'Comoros', '', '', ''), (42, 'es_ES', 'Comoras', '', '', ''), (42, 'fr_FR', 'Comores', '', '', ''), -(43, 'en_UK', 'Congo', '', '', ''), +(43, 'en_US', 'Congo', '', '', ''), (43, 'es_ES', 'Congo', '', '', ''), (43, 'fr_FR', 'Congo', '', '', ''), -(44, 'en_UK', 'Cook Islands', '', '', ''), +(44, 'en_US', 'Cook Islands', '', '', ''), (44, 'es_ES', 'Cook', '', '', ''), (44, 'fr_FR', 'Cook', '', '', ''), -(45, 'en_UK', 'North Korea', '', '', ''), +(45, 'en_US', 'North Korea', '', '', ''), (45, 'es_ES', 'Corea del Norte', '', '', ''), (45, 'fr_FR', 'Corée du Nord', '', '', ''), -(46, 'en_UK', 'South Korea', '', '', ''), +(46, 'en_US', 'South Korea', '', '', ''), (46, 'es_ES', 'Corea del Sur', '', '', ''), (46, 'fr_FR', 'Corée du Sud', '', '', ''), -(47, 'en_UK', 'Costa Rica', '', '', ''), +(47, 'en_US', 'Costa Rica', '', '', ''), (47, 'es_ES', 'Costa Rica', '', '', ''), (47, 'fr_FR', 'Costa Rica', '', '', ''), -(48, 'en_UK', 'Ivory Coast', '', '', ''), +(48, 'en_US', 'Ivory Coast', '', '', ''), (48, 'es_ES', 'Costa de Marfil', '', '', ''), (48, 'fr_FR', 'Côte dIvoire', '', '', ''), -(49, 'en_UK', 'Croatia', '', '', ''), +(49, 'en_US', 'Croatia', '', '', ''), (49, 'es_ES', 'Croacia', '', '', ''), (49, 'fr_FR', 'Croatie', '', '', ''), -(50, 'en_UK', 'Cuba', '', '', ''), +(50, 'en_US', 'Cuba', '', '', ''), (50, 'es_ES', 'Cuba', '', '', ''), (50, 'fr_FR', 'Cuba', '', '', ''), -(51, 'en_UK', 'Denmark', '', '', ''), +(51, 'en_US', 'Denmark', '', '', ''), (51, 'es_ES', 'Dinamarca', '', '', ''), (51, 'fr_FR', 'Danemark', '', '', ''), -(52, 'en_UK', 'Djibouti', '', '', ''), +(52, 'en_US', 'Djibouti', '', '', ''), (52, 'es_ES', 'Djibouti', '', '', ''), (52, 'fr_FR', 'Djibouti', '', '', ''), -(53, 'en_UK', 'Dominica', '', '', ''), +(53, 'en_US', 'Dominica', '', '', ''), (53, 'es_ES', 'Dominica', '', '', ''), (53, 'fr_FR', 'Dominique', '', '', ''), -(54, 'en_UK', 'Egypt', '', '', ''), +(54, 'en_US', 'Egypt', '', '', ''), (54, 'es_ES', 'Egipto', '', '', ''), (54, 'fr_FR', 'Égypte', '', '', ''), -(55, 'en_UK', 'United Arab Emirates', '', '', ''), +(55, 'en_US', 'United Arab Emirates', '', '', ''), (55, 'es_ES', 'Emiratos Árabes Unidos', '', '', ''), (55, 'fr_FR', 'Émirats arabes unis', '', '', ''), -(56, 'en_UK', 'Ecuador', '', '', ''), +(56, 'en_US', 'Ecuador', '', '', ''), (56, 'es_ES', 'Ecuador', '', '', ''), (56, 'fr_FR', 'Équateur', '', '', ''), -(57, 'en_UK', 'Eritrea', '', '', ''), +(57, 'en_US', 'Eritrea', '', '', ''), (57, 'es_ES', 'Eritrea', '', '', ''), (57, 'fr_FR', 'Érythrée', '', '', ''), -(58, 'en_UK', 'Spain', '', '', ''), +(58, 'en_US', 'Spain', '', '', ''), (58, 'es_ES', 'España', '', '', ''), (58, 'fr_FR', 'Espagne', '', '', ''), -(59, 'en_UK', 'Estonia', '', '', ''), +(59, 'en_US', 'Estonia', '', '', ''), (59, 'es_ES', 'Estonia', '', '', ''), (59, 'fr_FR', 'Estonie', '', '', ''), -(61, 'en_UK', 'Ethiopia', '', '', ''), +(61, 'en_US', 'Ethiopia', '', '', ''), (61, 'es_ES', 'Etiopía', '', '', ''), (61, 'fr_FR', 'Éthiopie', '', '', ''), -(62, 'en_UK', 'Fiji', '', '', ''), +(62, 'en_US', 'Fiji', '', '', ''), (62, 'es_ES', 'Fiji', '', '', ''), (62, 'fr_FR', 'Fidji', '', '', ''), -(63, 'en_UK', 'Finland', '', '', ''), +(63, 'en_US', 'Finland', '', '', ''), (63, 'es_ES', 'Finlandia', '', '', ''), (63, 'fr_FR', 'Finlande', '', '', ''), -(64, 'en_UK', 'France metropolitan', '', '', ''), +(64, 'en_US', 'France metropolitan', '', '', ''), (64, 'es_ES', 'Francia', '', '', ''), (64, 'fr_FR', 'France métropolitaine', '', '', ''), -(65, 'en_UK', 'Gabon', '', '', ''), +(65, 'en_US', 'Gabon', '', '', ''), (65, 'es_ES', 'Gabón', '', '', ''), (65, 'fr_FR', 'Gabon', '', '', ''), -(66, 'en_UK', 'Gambia', '', '', ''), +(66, 'en_US', 'Gambia', '', '', ''), (66, 'es_ES', 'Gambia', '', '', ''), (66, 'fr_FR', 'Gambie', '', '', ''), -(67, 'en_UK', 'Georgia', '', '', ''), +(67, 'en_US', 'Georgia', '', '', ''), (67, 'es_ES', 'Georgia', '', '', ''), (67, 'fr_FR', 'Géorgie', '', '', ''), -(68, 'en_UK', 'Ghana', '', '', ''), +(68, 'en_US', 'Ghana', '', '', ''), (68, 'es_ES', 'Ghana', '', '', ''), (68, 'fr_FR', 'Ghana', '', '', ''), -(69, 'en_UK', 'Greece', '', '', ''), +(69, 'en_US', 'Greece', '', '', ''), (69, 'es_ES', 'Grecia', '', '', ''), (69, 'fr_FR', 'Grèce', '', '', ''), -(70, 'en_UK', 'Grenada', '', '', ''), +(70, 'en_US', 'Grenada', '', '', ''), (70, 'es_ES', 'Granada', '', '', ''), (70, 'fr_FR', 'Grenade', '', '', ''), -(71, 'en_UK', 'Guatemala', '', '', ''), +(71, 'en_US', 'Guatemala', '', '', ''), (71, 'es_ES', 'Guatemala', '', '', ''), (71, 'fr_FR', 'Guatemala', '', '', ''), -(72, 'en_UK', 'Guinea', '', '', ''), +(72, 'en_US', 'Guinea', '', '', ''), (72, 'es_ES', 'Guinea', '', '', ''), (72, 'fr_FR', 'Guinée', '', '', ''), -(73, 'en_UK', 'Guinea-Bissau', '', '', ''), +(73, 'en_US', 'Guinea-Bissau', '', '', ''), (73, 'es_ES', 'Guinea-Bissau', '', '', ''), (73, 'fr_FR', 'Guinée-Bissao', '', '', ''), -(74, 'en_UK', 'Equatorial Guinea', '', '', ''), +(74, 'en_US', 'Equatorial Guinea', '', '', ''), (74, 'es_ES', 'Guinea Ecuatorial', '', '', ''), (74, 'fr_FR', 'Guinée équatoriale', '', '', ''), -(75, 'en_UK', 'Guyana', '', '', ''), +(75, 'en_US', 'Guyana', '', '', ''), (75, 'es_ES', 'Guyana', '', '', ''), (75, 'fr_FR', 'Guyana', '', '', ''), -(76, 'en_UK', 'Haiti', '', '', ''), +(76, 'en_US', 'Haiti', '', '', ''), (76, 'es_ES', 'Haití', '', '', ''), (76, 'fr_FR', 'Haïti', '', '', ''), -(77, 'en_UK', 'Honduras', '', '', ''), +(77, 'en_US', 'Honduras', '', '', ''), (77, 'es_ES', 'Honduras', '', '', ''), (77, 'fr_FR', 'Honduras', '', '', ''), -(78, 'en_UK', 'Hungary', '', '', ''), +(78, 'en_US', 'Hungary', '', '', ''), (78, 'es_ES', 'Hungría', '', '', ''), (78, 'fr_FR', 'Hongrie', '', '', ''), -(79, 'en_UK', 'India', '', '', ''), +(79, 'en_US', 'India', '', '', ''), (79, 'es_ES', 'India', '', '', ''), (79, 'fr_FR', 'Inde', '', '', ''), -(80, 'en_UK', 'Indonesia', '', '', ''), +(80, 'en_US', 'Indonesia', '', '', ''), (80, 'es_ES', 'Indonesia', '', '', ''), (80, 'fr_FR', 'Indonésie', '', '', ''), -(81, 'en_UK', 'Iran', '', '', ''), +(81, 'en_US', 'Iran', '', '', ''), (81, 'es_ES', 'Irán', '', '', ''), (81, 'fr_FR', 'Iran', '', '', ''), -(82, 'en_UK', 'Iraq', '', '', ''), +(82, 'en_US', 'Iraq', '', '', ''), (82, 'es_ES', 'Iraq', '', '', ''), (82, 'fr_FR', 'Iraq', '', '', ''), -(83, 'en_UK', 'Ireland', '', '', ''), +(83, 'en_US', 'Ireland', '', '', ''), (83, 'es_ES', 'Irlanda', '', '', ''), (83, 'fr_FR', 'Irlande', '', '', ''), -(84, 'en_UK', 'Iceland', '', '', ''), +(84, 'en_US', 'Iceland', '', '', ''), (84, 'es_ES', 'Islandia', '', '', ''), (84, 'fr_FR', 'Islande', '', '', ''), -(85, 'en_UK', 'Israel', '', '', ''), +(85, 'en_US', 'Israel', '', '', ''), (85, 'es_ES', 'Israel', '', '', ''), (85, 'fr_FR', 'Israël', '', '', ''), -(86, 'en_UK', 'Italy', '', '', ''), +(86, 'en_US', 'Italy', '', '', ''), (86, 'es_ES', 'Italia', '', '', ''), (86, 'fr_FR', 'Italie', '', '', ''), -(87, 'en_UK', 'Jamaica', '', '', ''), +(87, 'en_US', 'Jamaica', '', '', ''), (87, 'es_ES', 'Jamaica', '', '', ''), (87, 'fr_FR', 'Jamaïque', '', '', ''), -(88, 'en_UK', 'Japan', '', '', ''), +(88, 'en_US', 'Japan', '', '', ''), (88, 'es_ES', 'Japón', '', '', ''), (88, 'fr_FR', 'Japon', '', '', ''), -(89, 'en_UK', 'Jordan', '', '', ''), +(89, 'en_US', 'Jordan', '', '', ''), (89, 'es_ES', 'Jordania', '', '', ''), (89, 'fr_FR', 'Jordanie', '', '', ''), -(90, 'en_UK', 'Kazakhstan', '', '', ''), +(90, 'en_US', 'Kazakhstan', '', '', ''), (90, 'es_ES', 'Kazajstán', '', '', ''), (90, 'fr_FR', 'Kazakhstan', '', '', ''), -(91, 'en_UK', 'Kenya', '', '', ''), +(91, 'en_US', 'Kenya', '', '', ''), (91, 'es_ES', 'Kenia', '', '', ''), (91, 'fr_FR', 'Kenya', '', '', ''), -(92, 'en_UK', 'Kyrgyzstan', '', '', ''), +(92, 'en_US', 'Kyrgyzstan', '', '', ''), (92, 'es_ES', 'Kirguistán', '', '', ''), (92, 'fr_FR', 'Kirghizistan', '', '', ''), -(93, 'en_UK', 'Kiribati', '', '', ''), +(93, 'en_US', 'Kiribati', '', '', ''), (93, 'es_ES', 'Kiribati', '', '', ''), (93, 'fr_FR', 'Kiribati', '', '', ''), -(94, 'en_UK', 'Kuwait', '', '', ''), +(94, 'en_US', 'Kuwait', '', '', ''), (94, 'es_ES', 'Kuwait', '', '', ''), (94, 'fr_FR', 'Koweït', '', '', ''), -(95, 'en_UK', 'Laos', '', '', ''), +(95, 'en_US', 'Laos', '', '', ''), (95, 'es_ES', 'Laos', '', '', ''), (95, 'fr_FR', 'Laos', '', '', ''), -(96, 'en_UK', 'Lesotho', '', '', ''), +(96, 'en_US', 'Lesotho', '', '', ''), (96, 'es_ES', 'Lesotho', '', '', ''), (96, 'fr_FR', 'Lesotho', '', '', ''), -(97, 'en_UK', 'Latvia', '', '', ''), +(97, 'en_US', 'Latvia', '', '', ''), (97, 'es_ES', 'Letonia', '', '', ''), (97, 'fr_FR', 'Lettonie', '', '', ''), -(98, 'en_UK', 'Lebanon', '', '', ''), +(98, 'en_US', 'Lebanon', '', '', ''), (98, 'es_ES', 'Líbano', '', '', ''), (98, 'fr_FR', 'Liban', '', '', ''), -(99, 'en_UK', 'Liberia', '', '', ''), +(99, 'en_US', 'Liberia', '', '', ''), (99, 'es_ES', 'Liberia', '', '', ''), (99, 'fr_FR', 'Liberia', '', '', ''), -(100, 'en_UK', 'Libya', '', '', ''), +(100, 'en_US', 'Libya', '', '', ''), (100, 'es_ES', 'Libia', '', '', ''), (100, 'fr_FR', 'Libye', '', '', ''), -(101, 'en_UK', 'Liechtenstein', '', '', ''), +(101, 'en_US', 'Liechtenstein', '', '', ''), (101, 'es_ES', 'Liechtenstein', '', '', ''), (101, 'fr_FR', 'Liechtenstein', '', '', ''), -(102, 'en_UK', 'Lithuania', '', '', ''), +(102, 'en_US', 'Lithuania', '', '', ''), (102, 'es_ES', 'Lituania', '', '', ''), (102, 'fr_FR', 'Lituanie', '', '', ''), -(103, 'en_UK', 'Luxembourg', '', '', ''), +(103, 'en_US', 'Luxembourg', '', '', ''), (103, 'es_ES', 'Luxemburgo', '', '', ''), (103, 'fr_FR', 'Luxembourg', '', '', ''), -(104, 'en_UK', 'Macedonia', '', '', ''), +(104, 'en_US', 'Macedonia', '', '', ''), (104, 'es_ES', 'Macedonia', '', '', ''), (104, 'fr_FR', 'Macédoine', '', '', ''), -(105, 'en_UK', 'Madagascar', '', '', ''), +(105, 'en_US', 'Madagascar', '', '', ''), (105, 'es_ES', 'Madagascar', '', '', ''), (105, 'fr_FR', 'Madagascar', '', '', ''), -(106, 'en_UK', 'Malaysia', '', '', ''), +(106, 'en_US', 'Malaysia', '', '', ''), (106, 'es_ES', 'Malasia', '', '', ''), (106, 'fr_FR', 'Malaisie', '', '', ''), -(107, 'en_UK', 'Malawi', '', '', ''), +(107, 'en_US', 'Malawi', '', '', ''), (107, 'es_ES', 'Malawi', '', '', ''), (107, 'fr_FR', 'Malawi', '', '', ''), -(108, 'en_UK', 'Maldives', '', '', ''), +(108, 'en_US', 'Maldives', '', '', ''), (108, 'es_ES', 'Maldivas', '', '', ''), (108, 'fr_FR', 'Maldives', '', '', ''), -(109, 'en_UK', 'Mali', '', '', ''), +(109, 'en_US', 'Mali', '', '', ''), (109, 'es_ES', 'Malí', '', '', ''), (109, 'fr_FR', 'Mali', '', '', ''), -(110, 'en_UK', 'Malta', '', '', ''), +(110, 'en_US', 'Malta', '', '', ''), (110, 'es_ES', 'Malta', '', '', ''), (110, 'fr_FR', 'Malte', '', '', ''), -(111, 'en_UK', 'Morocco', '', '', ''), +(111, 'en_US', 'Morocco', '', '', ''), (111, 'es_ES', 'Marruecos', '', '', ''), (111, 'fr_FR', 'Maroc', '', '', ''), -(112, 'en_UK', 'Marshall Islands', '', '', ''), +(112, 'en_US', 'Marshall Islands', '', '', ''), (112, 'es_ES', 'Marshall', '', '', ''), (112, 'fr_FR', 'Marshall', '', '', ''), -(113, 'en_UK', 'Mauritius', '', '', ''), +(113, 'en_US', 'Mauritius', '', '', ''), (113, 'es_ES', 'Mauricio', '', '', ''), (113, 'fr_FR', 'Maurice', '', '', ''), -(114, 'en_UK', 'Mauritania', '', '', ''), +(114, 'en_US', 'Mauritania', '', '', ''), (114, 'es_ES', 'Mauritania', '', '', ''), (114, 'fr_FR', 'Mauritanie', '', '', ''), -(115, 'en_UK', 'Mexico', '', '', ''), +(115, 'en_US', 'Mexico', '', '', ''), (115, 'es_ES', 'Méjico', '', '', ''), (115, 'fr_FR', 'Mexique', '', '', ''), -(116, 'en_UK', 'Micronesia', '', '', ''), +(116, 'en_US', 'Micronesia', '', '', ''), (116, 'es_ES', 'Micronesia', '', '', ''), (116, 'fr_FR', 'Micronésie', '', '', ''), -(117, 'en_UK', 'Moldova', '', '', ''), +(117, 'en_US', 'Moldova', '', '', ''), (117, 'es_ES', 'Moldova', '', '', ''), (117, 'fr_FR', 'Moldavie', '', '', ''), -(118, 'en_UK', 'Monaco', '', '', ''), +(118, 'en_US', 'Monaco', '', '', ''), (118, 'es_ES', 'Mónaco', '', '', ''), (118, 'fr_FR', 'Monaco', '', '', ''), -(119, 'en_UK', 'Mongolia', '', '', ''), +(119, 'en_US', 'Mongolia', '', '', ''), (119, 'es_ES', 'Mongolia', '', '', ''), (119, 'fr_FR', 'Mongolie', '', '', ''), -(120, 'en_UK', 'Mozambique', '', '', ''), +(120, 'en_US', 'Mozambique', '', '', ''), (120, 'es_ES', 'Mozambique', '', '', ''), (120, 'fr_FR', 'Mozambique', '', '', ''), -(121, 'en_UK', 'Namibia', '', '', ''), +(121, 'en_US', 'Namibia', '', '', ''), (121, 'es_ES', 'Namibia', '', '', ''), (121, 'fr_FR', 'Namibie', '', '', ''), -(122, 'en_UK', 'Nauru', '', '', ''), +(122, 'en_US', 'Nauru', '', '', ''), (122, 'es_ES', 'Nauru', '', '', ''), (122, 'fr_FR', 'Nauru', '', '', ''), -(123, 'en_UK', 'Nepal', '', '', ''), +(123, 'en_US', 'Nepal', '', '', ''), (123, 'es_ES', 'Nepal', '', '', ''), (123, 'fr_FR', 'Népal', '', '', ''), -(124, 'en_UK', 'Nicaragua', '', '', ''), +(124, 'en_US', 'Nicaragua', '', '', ''), (124, 'es_ES', 'Nicaragua', '', '', ''), (124, 'fr_FR', 'Nicaragua', '', '', ''), -(125, 'en_UK', 'Niger', '', '', ''), +(125, 'en_US', 'Niger', '', '', ''), (125, 'es_ES', 'Níger', '', '', ''), (125, 'fr_FR', 'Niger', '', '', ''), -(126, 'en_UK', 'Nigeria', '', '', ''), +(126, 'en_US', 'Nigeria', '', '', ''), (126, 'es_ES', 'Nigeria', '', '', ''), (126, 'fr_FR', 'Nigeria', '', '', ''), -(127, 'en_UK', 'Niue', '', '', ''), +(127, 'en_US', 'Niue', '', '', ''), (127, 'es_ES', 'Niue', '', '', ''), (127, 'fr_FR', 'Niue', '', '', ''), -(128, 'en_UK', 'Norway', '', '', ''), +(128, 'en_US', 'Norway', '', '', ''), (128, 'es_ES', 'Noruega', '', '', ''), (128, 'fr_FR', 'Norvège', '', '', ''), -(129, 'en_UK', 'New Zealand', '', '', ''), +(129, 'en_US', 'New Zealand', '', '', ''), (129, 'es_ES', 'Nueva Zelandia', '', '', ''), (129, 'fr_FR', 'Nouvelle-Zélande', '', '', ''), -(130, 'en_UK', 'Oman', '', '', ''), +(130, 'en_US', 'Oman', '', '', ''), (130, 'es_ES', 'Omán', '', '', ''), (130, 'fr_FR', 'Oman', '', '', ''), -(131, 'en_UK', 'Uganda', '', '', ''), +(131, 'en_US', 'Uganda', '', '', ''), (131, 'es_ES', 'Uganda', '', '', ''), (131, 'fr_FR', 'Ouganda', '', '', ''), -(132, 'en_UK', 'Uzbekistan', '', '', ''), +(132, 'en_US', 'Uzbekistan', '', '', ''), (132, 'es_ES', 'Uzbekistán', '', '', ''), (132, 'fr_FR', 'Ouzbékistan', '', '', ''), -(133, 'en_UK', 'Pakistan', '', '', ''), +(133, 'en_US', 'Pakistan', '', '', ''), (133, 'es_ES', 'Pakistán', '', '', ''), (133, 'fr_FR', 'Pakistan', '', '', ''), -(134, 'en_UK', 'Panama', '', '', ''), +(134, 'en_US', 'Panama', '', '', ''), (134, 'es_ES', 'Panamá', '', '', ''), (134, 'fr_FR', 'Panama', '', '', ''), -(135, 'en_UK', 'Papua Nueva Guinea', '', '', ''), +(135, 'en_US', 'Papua Nueva Guinea', '', '', ''), (135, 'es_ES', 'Papua Nueva Guinea', '', '', ''), (135, 'fr_FR', 'Papouasie', '', '', ''), -(136, 'en_UK', 'Paraguay', '', '', ''), +(136, 'en_US', 'Paraguay', '', '', ''), (136, 'es_ES', 'Paraguay', '', '', ''), (136, 'fr_FR', 'Paraguay', '', '', ''), -(137, 'en_UK', 'Netherlands', '', '', ''), +(137, 'en_US', 'Netherlands', '', '', ''), (137, 'es_ES', 'Países Bajos', '', '', ''), (137, 'fr_FR', 'Pays-Bas', '', '', ''), -(138, 'en_UK', 'Peru', '', '', ''), +(138, 'en_US', 'Peru', '', '', ''), (138, 'es_ES', 'Perú', '', '', ''), (138, 'fr_FR', 'Pérou', '', '', ''), -(139, 'en_UK', 'Philippines', '', '', ''), +(139, 'en_US', 'Philippines', '', '', ''), (139, 'es_ES', 'Filipinas', '', '', ''), (139, 'fr_FR', 'Philippines', '', '', ''), -(140, 'en_UK', 'Poland', '', '', ''), +(140, 'en_US', 'Poland', '', '', ''), (140, 'es_ES', 'Polonia', '', '', ''), (140, 'fr_FR', 'Pologne', '', '', ''), -(141, 'en_UK', 'Portugal', '', '', ''), +(141, 'en_US', 'Portugal', '', '', ''), (141, 'es_ES', 'Portugal', '', '', ''), (141, 'fr_FR', 'Portugal', '', '', ''), -(142, 'en_UK', 'Qatar', '', '', ''), +(142, 'en_US', 'Qatar', '', '', ''), (142, 'es_ES', 'Qatar', '', '', ''), (142, 'fr_FR', 'Qatar', '', '', ''), -(143, 'en_UK', 'Central African Republic', '', '', ''), +(143, 'en_US', 'Central African Republic', '', '', ''), (143, 'es_ES', 'República Centroafricana', '', '', ''), (143, 'fr_FR', 'République centrafricaine', '', '', ''), -(144, 'en_UK', 'Dominican Republic', '', '', ''), +(144, 'en_US', 'Dominican Republic', '', '', ''), (144, 'es_ES', 'República Dominicana', '', '', ''), (144, 'fr_FR', 'République dominicaine', '', '', ''), -(145, 'en_UK', 'Czech Republic', '', '', ''), +(145, 'en_US', 'Czech Republic', '', '', ''), (145, 'es_ES', 'República Checa', '', '', ''), (145, 'fr_FR', 'République tchèque', '', '', ''), -(146, 'en_UK', 'Romania', '', '', ''), +(146, 'en_US', 'Romania', '', '', ''), (146, 'es_ES', 'Rumania', '', '', ''), (146, 'fr_FR', 'Roumanie', '', '', ''), -(147, 'en_UK', 'United Kingdom', '', '', ''), +(147, 'en_US', 'United Kingdom', '', '', ''), (147, 'es_ES', 'Reino Unido', '', '', ''), (147, 'fr_FR', 'Royaume-Uni', '', '', ''), -(148, 'en_UK', 'Russia', '', '', ''), +(148, 'en_US', 'Russia', '', '', ''), (148, 'es_ES', 'Rusia', '', '', ''), (148, 'fr_FR', 'Russie', '', '', ''), -(149, 'en_UK', 'Rwanda', '', '', ''), +(149, 'en_US', 'Rwanda', '', '', ''), (149, 'es_ES', 'Ruanda', '', '', ''), (149, 'fr_FR', 'Rwanda', '', '', ''), -(150, 'en_UK', 'Saint Kitts and Nevis', '', '', ''), +(150, 'en_US', 'Saint Kitts and Nevis', '', '', ''), (150, 'es_ES', 'San Cristóbal', '', '', ''), (150, 'fr_FR', 'Saint-Christophe-et-Niévès', '', '', ''), -(151, 'en_UK', 'Saint Lucia', '', '', ''), +(151, 'en_US', 'Saint Lucia', '', '', ''), (151, 'es_ES', 'Santa Lucía', '', '', ''), (151, 'fr_FR', 'Sainte-Lucie', '', '', ''), -(152, 'en_UK', 'San Marino', '', '', ''), +(152, 'en_US', 'San Marino', '', '', ''), (152, 'es_ES', 'San Marino', '', '', ''), (152, 'fr_FR', 'Saint-Marin', '', '', ''), -(153, 'en_UK', 'Saint Vincent and the Grenadines', '', '', ''), +(153, 'en_US', 'Saint Vincent and the Grenadines', '', '', ''), (153, 'es_ES', 'San Vicente y las Granadinas', '', '', ''), (153, 'fr_FR', 'Saint-Vincent-et-les Grenadines', '', '', ''), -(154, 'en_UK', 'Solomon Islands', '', '', ''), +(154, 'en_US', 'Solomon Islands', '', '', ''), (154, 'es_ES', 'Salomón', '', '', ''), (154, 'fr_FR', 'Salomon', '', '', ''), -(155, 'en_UK', 'El Salvador', '', '', ''), +(155, 'en_US', 'El Salvador', '', '', ''), (155, 'es_ES', 'El Salvador', '', '', ''), (155, 'fr_FR', 'Salvador', '', '', ''), -(156, 'en_UK', 'Western Samoa', '', '', ''), +(156, 'en_US', 'Western Samoa', '', '', ''), (156, 'es_ES', 'Samoa', '', '', ''), (156, 'fr_FR', 'Samoa occidentales', '', '', ''), -(157, 'en_UK', 'Sao Tome and Principe', '', '', ''), +(157, 'en_US', 'Sao Tome and Principe', '', '', ''), (157, 'es_ES', 'Santo Tomé y Príncipe', '', '', ''), (157, 'fr_FR', 'Sao Tomé-et-Principe', '', '', ''), -(158, 'en_UK', 'Senegal', '', '', ''), +(158, 'en_US', 'Senegal', '', '', ''), (158, 'es_ES', 'Senegal', '', '', ''), (158, 'fr_FR', 'Sénégal', '', '', ''), -(159, 'en_UK', 'Seychelles', '', '', ''), +(159, 'en_US', 'Seychelles', '', '', ''), (159, 'es_ES', 'Seychelles', '', '', ''), (159, 'fr_FR', 'Seychelles', '', '', ''), -(160, 'en_UK', 'Sierra Leone', '', '', ''), +(160, 'en_US', 'Sierra Leone', '', '', ''), (160, 'es_ES', 'Sierra Leona', '', '', ''), (160, 'fr_FR', 'Sierra Leone', '', '', ''), -(161, 'en_UK', 'Singapore', '', '', ''), +(161, 'en_US', 'Singapore', '', '', ''), (161, 'es_ES', 'Singapur', '', '', ''), (161, 'fr_FR', 'Singapour', '', '', ''), -(162, 'en_UK', 'Slovakia', '', '', ''), +(162, 'en_US', 'Slovakia', '', '', ''), (162, 'es_ES', 'Eslovaquia', '', '', ''), (162, 'fr_FR', 'Slovaquie', '', '', ''), -(163, 'en_UK', 'Slovenia', '', '', ''), +(163, 'en_US', 'Slovenia', '', '', ''), (163, 'es_ES', 'Eslovenia', '', '', ''), (163, 'fr_FR', 'Slovénie', '', '', ''), -(164, 'en_UK', 'Somalia', '', '', ''), +(164, 'en_US', 'Somalia', '', '', ''), (164, 'es_ES', 'Somalia', '', '', ''), (164, 'fr_FR', 'Somalie', '', '', ''), -(165, 'en_UK', 'Sudan', '', '', ''), +(165, 'en_US', 'Sudan', '', '', ''), (165, 'es_ES', 'Sudán', '', '', ''), (165, 'fr_FR', 'Soudan', '', '', ''), -(166, 'en_UK', 'Sri Lanka', '', '', ''), +(166, 'en_US', 'Sri Lanka', '', '', ''), (166, 'es_ES', 'Sri Lanka', '', '', ''), (166, 'fr_FR', 'Sri Lanka', '', '', ''), -(167, 'en_UK', 'Sweden', '', '', ''), +(167, 'en_US', 'Sweden', '', '', ''), (167, 'es_ES', 'Suecia', '', '', ''), (167, 'fr_FR', 'Suède', '', '', ''), -(168, 'en_UK', 'Switzerland', '', '', ''), +(168, 'en_US', 'Switzerland', '', '', ''), (168, 'es_ES', 'Suiza', '', '', ''), (168, 'fr_FR', 'Suisse', '', '', ''), -(169, 'en_UK', 'Suriname', '', '', ''), +(169, 'en_US', 'Suriname', '', '', ''), (169, 'es_ES', 'Suriname', '', '', ''), (169, 'fr_FR', 'Suriname', '', '', ''), -(170, 'en_UK', 'Swaziland', '', '', ''), +(170, 'en_US', 'Swaziland', '', '', ''), (170, 'es_ES', 'Swazilandia', '', '', ''), (170, 'fr_FR', 'Swaziland', '', '', ''), -(171, 'en_UK', 'Syria', '', '', ''), +(171, 'en_US', 'Syria', '', '', ''), (171, 'es_ES', 'Siria', '', '', ''), (171, 'fr_FR', 'Syrie', '', '', ''), -(172, 'en_UK', 'Tajikistan', '', '', ''), +(172, 'en_US', 'Tajikistan', '', '', ''), (172, 'es_ES', 'Tayikistán', '', '', ''), (172, 'fr_FR', 'Tadjikistan', '', '', ''), -(173, 'en_UK', 'Tanzania', '', '', ''), +(173, 'en_US', 'Tanzania', '', '', ''), (173, 'es_ES', 'Tanzanía', '', '', ''), (173, 'fr_FR', 'Tanzanie', '', '', ''), -(174, 'en_UK', 'Chad', '', '', ''), +(174, 'en_US', 'Chad', '', '', ''), (174, 'es_ES', 'Chad', '', '', ''), (174, 'fr_FR', 'Tchad', '', '', ''), -(175, 'en_UK', 'Thailand', '', '', ''), +(175, 'en_US', 'Thailand', '', '', ''), (175, 'es_ES', 'Tailandia', '', '', ''), (175, 'fr_FR', 'Thaïlande', '', '', ''), -(176, 'en_UK', 'Togo', '', '', ''), +(176, 'en_US', 'Togo', '', '', ''), (176, 'es_ES', 'Togo', '', '', ''), (176, 'fr_FR', 'Togo', '', '', ''), -(177, 'en_UK', 'Tonga', '', '', ''), +(177, 'en_US', 'Tonga', '', '', ''), (177, 'es_ES', 'Tonga', '', '', ''), (177, 'fr_FR', 'Tonga', '', '', ''), -(178, 'en_UK', 'Trinidad and Tobago', '', '', ''), +(178, 'en_US', 'Trinidad and Tobago', '', '', ''), (178, 'es_ES', 'Trinidad y Tabago', '', '', ''), (178, 'fr_FR', 'Trinité-et-Tobago', '', '', ''), -(179, 'en_UK', 'Tunisia', '', '', ''), +(179, 'en_US', 'Tunisia', '', '', ''), (179, 'es_ES', 'Túnez', '', '', ''), (179, 'fr_FR', 'Tunisie', '', '', ''), -(180, 'en_UK', 'Turkmenistan', '', '', ''), +(180, 'en_US', 'Turkmenistan', '', '', ''), (180, 'es_ES', 'Turkmenistán', '', '', ''), (180, 'fr_FR', 'Turkménistan', '', '', ''), -(181, 'en_UK', 'Turkey', '', '', ''), +(181, 'en_US', 'Turkey', '', '', ''), (181, 'es_ES', 'Turquía', '', '', ''), (181, 'fr_FR', 'Turquie', '', '', ''), -(182, 'en_UK', 'Tuvalu', '', '', ''), +(182, 'en_US', 'Tuvalu', '', '', ''), (182, 'es_ES', 'Tuvalu', '', '', ''), (182, 'fr_FR', 'Tuvalu', '', '', ''), -(183, 'en_UK', 'Ukraine', '', '', ''), +(183, 'en_US', 'Ukraine', '', '', ''), (183, 'es_ES', 'Ucrania', '', '', ''), (183, 'fr_FR', 'Ukraine', '', '', ''), -(184, 'en_UK', 'Uruguay', '', '', ''), +(184, 'en_US', 'Uruguay', '', '', ''), (184, 'es_ES', 'Uruguay', '', '', ''), (184, 'fr_FR', 'Uruguay', '', '', ''), -(185, 'en_UK', 'The Vatican', '', '', ''), +(185, 'en_US', 'The Vatican', '', '', ''), (185, 'es_ES', 'El Vatican', '', '', ''), (185, 'fr_FR', 'Vatican', '', '', ''), -(186, 'en_UK', 'Vanuatu', '', '', ''), +(186, 'en_US', 'Vanuatu', '', '', ''), (186, 'es_ES', 'Vanuatu', '', '', ''), (186, 'fr_FR', 'Vanuatu', '', '', ''), -(187, 'en_UK', 'Venezuela', '', '', ''), +(187, 'en_US', 'Venezuela', '', '', ''), (187, 'es_ES', 'Venezuela', '', '', ''), (187, 'fr_FR', 'Venezuela', '', '', ''), -(188, 'en_UK', 'Vietnam', '', '', ''), +(188, 'en_US', 'Vietnam', '', '', ''), (188, 'es_ES', 'Viet Nam', '', '', ''), (188, 'fr_FR', 'Viêt Nam', '', '', ''), -(189, 'en_UK', 'Yemen', '', '', ''), +(189, 'en_US', 'Yemen', '', '', ''), (189, 'es_ES', 'Yemen', '', '', ''), (189, 'fr_FR', 'Yémen', '', '', ''), -(190, 'en_UK', 'Yougoslavia', '', '', ''), +(190, 'en_US', 'Yougoslavia', '', '', ''), (190, 'es_ES', 'Yugoslavia', '', '', ''), (190, 'fr_FR', 'Yougoslavie', '', '', ''), -(191, 'en_UK', 'Zaire', '', '', ''), +(191, 'en_US', 'Zaire', '', '', ''), (191, 'es_ES', 'Zaire', '', '', ''), (191, 'fr_FR', 'Zaïre', '', '', ''), -(192, 'en_UK', 'Zambia', '', '', ''), +(192, 'en_US', 'Zambia', '', '', ''), (192, 'es_ES', 'Zambia', '', '', ''), (192, 'fr_FR', 'Zambie', '', '', ''), -(193, 'en_UK', 'Zimbabwe', '', '', ''), +(193, 'en_US', 'Zimbabwe', '', '', ''), (193, 'es_ES', 'Zimbabwe', '', '', ''), (193, 'fr_FR', 'Zimbabwe', '', '', ''), -(196, 'en_UK', 'USA - Alaska', '', '', ''), +(196, 'en_US', 'USA - Alaska', '', '', ''), (196, 'es_ES', 'USA - Alaska', '', '', ''), (196, 'fr_FR', 'USA - Alaska', '', '', ''), -(197, 'en_UK', 'USA - Arizona', '', '', ''), +(197, 'en_US', 'USA - Arizona', '', '', ''), (197, 'es_ES', 'USA - Arizona', '', '', ''), (197, 'fr_FR', 'USA - Arizona', '', '', ''), -(198, 'en_UK', 'USA - Arkansas', '', '', ''), +(198, 'en_US', 'USA - Arkansas', '', '', ''), (198, 'es_ES', 'USA - Arkansas', '', '', ''), (198, 'fr_FR', 'USA - Arkansas', '', '', ''), -(199, 'en_UK', 'USA - California', '', '', ''), +(199, 'en_US', 'USA - California', '', '', ''), (199, 'es_ES', 'USA - California', '', '', ''), (199, 'fr_FR', 'USA - California', '', '', ''), -(200, 'en_UK', 'USA - Colorado', '', '', ''), +(200, 'en_US', 'USA - Colorado', '', '', ''), (200, 'es_ES', 'USA - Colorado', '', '', ''), (200, 'fr_FR', 'USA - Colorado', '', '', ''), -(201, 'en_UK', 'USA - Connecticut', '', '', ''), +(201, 'en_US', 'USA - Connecticut', '', '', ''), (201, 'es_ES', 'USA - Connecticut', '', '', ''), (201, 'fr_FR', 'USA - Connecticut', '', '', ''), -(202, 'en_UK', 'USA - Delaware', '', '', ''), +(202, 'en_US', 'USA - Delaware', '', '', ''), (202, 'es_ES', 'USA - Delaware', '', '', ''), (202, 'fr_FR', 'USA - Delaware', '', '', ''), -(203, 'en_UK', 'USA - District Of Columbia', '', '', ''), +(203, 'en_US', 'USA - District Of Columbia', '', '', ''), (203, 'es_ES', 'USA - District Of Columbia', '', '', ''), (203, 'fr_FR', 'USA - District Of Columbia', '', '', ''), -(204, 'en_UK', 'USA - Florida', '', '', ''), +(204, 'en_US', 'USA - Florida', '', '', ''), (204, 'es_ES', 'USA - Florida', '', '', ''), (204, 'fr_FR', 'USA - Florida', '', '', ''), -(205, 'en_UK', 'USA - Georgia', '', '', ''), +(205, 'en_US', 'USA - Georgia', '', '', ''), (205, 'es_ES', 'USA - Georgia', '', '', ''), (205, 'fr_FR', 'USA - Georgia', '', '', ''), -(206, 'en_UK', 'USA - Hawaii', '', '', ''), +(206, 'en_US', 'USA - Hawaii', '', '', ''), (206, 'es_ES', 'USA - Hawaii', '', '', ''), (206, 'fr_FR', 'USA - Hawaii', '', '', ''), -(207, 'en_UK', 'USA - Idaho', '', '', ''), +(207, 'en_US', 'USA - Idaho', '', '', ''), (207, 'es_ES', 'USA - Idaho', '', '', ''), (207, 'fr_FR', 'USA - Idaho', '', '', ''), -(208, 'en_UK', 'USA - Illinois', '', '', ''), +(208, 'en_US', 'USA - Illinois', '', '', ''), (208, 'es_ES', 'USA - Illinois', '', '', ''), (208, 'fr_FR', 'USA - Illinois', '', '', ''), -(209, 'en_UK', 'USA - Indiana', '', '', ''), +(209, 'en_US', 'USA - Indiana', '', '', ''), (209, 'es_ES', 'USA - Indiana', '', '', ''), (209, 'fr_FR', 'USA - Indiana', '', '', ''), -(210, 'en_UK', 'USA - Iowa', '', '', ''), +(210, 'en_US', 'USA - Iowa', '', '', ''), (210, 'es_ES', 'USA - Iowa', '', '', ''), (210, 'fr_FR', 'USA - Iowa', '', '', ''), -(211, 'en_UK', 'USA - Kansas', '', '', ''), +(211, 'en_US', 'USA - Kansas', '', '', ''), (211, 'es_ES', 'USA - Kansas', '', '', ''), (211, 'fr_FR', 'USA - Kansas', '', '', ''), -(212, 'en_UK', 'USA - Kentucky', '', '', ''), +(212, 'en_US', 'USA - Kentucky', '', '', ''), (212, 'es_ES', 'USA - Kentucky', '', '', ''), (212, 'fr_FR', 'USA - Kentucky', '', '', ''), -(213, 'en_UK', 'USA - Louisiana', '', '', ''), +(213, 'en_US', 'USA - Louisiana', '', '', ''), (213, 'es_ES', 'USA - Louisiana', '', '', ''), (213, 'fr_FR', 'USA - Louisiana', '', '', ''), -(214, 'en_UK', 'USA - Maine', '', '', ''), +(214, 'en_US', 'USA - Maine', '', '', ''), (214, 'es_ES', 'USA - Maine', '', '', ''), (214, 'fr_FR', 'USA - Maine', '', '', ''), -(215, 'en_UK', 'USA - Maryland', '', '', ''), +(215, 'en_US', 'USA - Maryland', '', '', ''), (215, 'es_ES', 'USA - Maryland', '', '', ''), (215, 'fr_FR', 'USA - Maryland', '', '', ''), -(216, 'en_UK', 'USA - Massachusetts', '', '', ''), +(216, 'en_US', 'USA - Massachusetts', '', '', ''), (216, 'es_ES', 'USA - Massachusetts', '', '', ''), (216, 'fr_FR', 'USA - Massachusetts', '', '', ''), -(217, 'en_UK', 'USA - Michigan', '', '', ''), +(217, 'en_US', 'USA - Michigan', '', '', ''), (217, 'es_ES', 'USA - Michigan', '', '', ''), (217, 'fr_FR', 'USA - Michigan', '', '', ''), -(218, 'en_UK', 'USA - Minnesota', '', '', ''), +(218, 'en_US', 'USA - Minnesota', '', '', ''), (218, 'es_ES', 'USA - Minnesota', '', '', ''), (218, 'fr_FR', 'USA - Minnesota', '', '', ''), -(219, 'en_UK', 'USA - Mississippi', '', '', ''), +(219, 'en_US', 'USA - Mississippi', '', '', ''), (219, 'es_ES', 'USA - Mississippi', '', '', ''), (219, 'fr_FR', 'USA - Mississippi', '', '', ''), -(220, 'en_UK', 'USA - Missouri', '', '', ''), +(220, 'en_US', 'USA - Missouri', '', '', ''), (220, 'es_ES', 'USA - Missouri', '', '', ''), (220, 'fr_FR', 'USA - Missouri', '', '', ''), -(221, 'en_UK', 'USA - Montana', '', '', ''), +(221, 'en_US', 'USA - Montana', '', '', ''), (221, 'es_ES', 'USA - Montana', '', '', ''), (221, 'fr_FR', 'USA - Montana', '', '', ''), -(222, 'en_UK', 'USA - Nebraska', '', '', ''), +(222, 'en_US', 'USA - Nebraska', '', '', ''), (222, 'es_ES', 'USA - Nebraska', '', '', ''), (222, 'fr_FR', 'USA - Nebraska', '', '', ''), -(223, 'en_UK', 'USA - Nevada', '', '', ''), +(223, 'en_US', 'USA - Nevada', '', '', ''), (223, 'es_ES', 'USA - Nevada', '', '', ''), (223, 'fr_FR', 'USA - Nevada', '', '', ''), -(224, 'en_UK', 'USA - New Hampshire', '', '', ''), +(224, 'en_US', 'USA - New Hampshire', '', '', ''), (224, 'es_ES', 'USA - New Hampshire', '', '', ''), (224, 'fr_FR', 'USA - New Hampshire', '', '', ''), -(225, 'en_UK', 'USA - New Jersey', '', '', ''), +(225, 'en_US', 'USA - New Jersey', '', '', ''), (225, 'es_ES', 'USA - New Jersey', '', '', ''), (225, 'fr_FR', 'USA - New Jersey', '', '', ''), -(226, 'en_UK', 'USA - New Mexico', '', '', ''), +(226, 'en_US', 'USA - New Mexico', '', '', ''), (226, 'es_ES', 'USA - New Mexico', '', '', ''), (226, 'fr_FR', 'USA - New Mexico', '', '', ''), -(227, 'en_UK', 'USA - New York', '', '', ''), +(227, 'en_US', 'USA - New York', '', '', ''), (227, 'es_ES', 'USA - New York', '', '', ''), (227, 'fr_FR', 'USA - New York', '', '', ''), -(228, 'en_UK', 'USA - North Carolina', '', '', ''), +(228, 'en_US', 'USA - North Carolina', '', '', ''), (228, 'es_ES', 'USA - North Carolina', '', '', ''), (228, 'fr_FR', 'USA - North Carolina', '', '', ''), -(229, 'en_UK', 'USA - North Dakota', '', '', ''), +(229, 'en_US', 'USA - North Dakota', '', '', ''), (229, 'es_ES', 'USA - North Dakota', '', '', ''), (229, 'fr_FR', 'USA - North Dakota', '', '', ''), -(230, 'en_UK', 'USA - Ohio', '', '', ''), +(230, 'en_US', 'USA - Ohio', '', '', ''), (230, 'es_ES', 'USA - Ohio', '', '', ''), (230, 'fr_FR', 'USA - Ohio', '', '', ''), -(231, 'en_UK', 'USA - Oklahoma', '', '', ''), +(231, 'en_US', 'USA - Oklahoma', '', '', ''), (231, 'es_ES', 'USA - Oklahoma', '', '', ''), (231, 'fr_FR', 'USA - Oklahoma', '', '', ''), -(232, 'en_UK', 'USA - Oregon', '', '', ''), +(232, 'en_US', 'USA - Oregon', '', '', ''), (232, 'es_ES', 'USA - Oregon', '', '', ''), (232, 'fr_FR', 'USA - Oregon', '', '', ''), -(233, 'en_UK', 'USA - Pennsylvania', '', '', ''), +(233, 'en_US', 'USA - Pennsylvania', '', '', ''), (233, 'es_ES', 'USA - Pennsylvania', '', '', ''), (233, 'fr_FR', 'USA - Pennsylvania', '', '', ''), -(234, 'en_UK', 'USA - Rhode Island', '', '', ''), +(234, 'en_US', 'USA - Rhode Island', '', '', ''), (234, 'es_ES', 'USA - Rhode Island', '', '', ''), (234, 'fr_FR', 'USA - Rhode Island', '', '', ''), -(235, 'en_UK', 'USA - South Carolina', '', '', ''), +(235, 'en_US', 'USA - South Carolina', '', '', ''), (235, 'es_ES', 'USA - South Carolina', '', '', ''), (235, 'fr_FR', 'USA - South Carolina', '', '', ''), -(236, 'en_UK', 'USA - South Dakota', '', '', ''), +(236, 'en_US', 'USA - South Dakota', '', '', ''), (236, 'es_ES', 'USA - South Dakota', '', '', ''), (236, 'fr_FR', 'USA - South Dakota', '', '', ''), -(237, 'en_UK', 'USA - Tennessee', '', '', ''), +(237, 'en_US', 'USA - Tennessee', '', '', ''), (237, 'es_ES', 'USA - Tennessee', '', '', ''), (237, 'fr_FR', 'USA - Tennessee', '', '', ''), -(238, 'en_UK', 'USA - Texas', '', '', ''), +(238, 'en_US', 'USA - Texas', '', '', ''), (238, 'es_ES', 'USA - Texas', '', '', ''), (238, 'fr_FR', 'USA - Texas', '', '', ''), -(239, 'en_UK', 'USA - Utah', '', '', ''), +(239, 'en_US', 'USA - Utah', '', '', ''), (239, 'es_ES', 'USA - Utah', '', '', ''), (239, 'fr_FR', 'USA - Utah', '', '', ''), -(240, 'en_UK', 'USA - Vermont', '', '', ''), +(240, 'en_US', 'USA - Vermont', '', '', ''), (240, 'es_ES', 'USA - Vermont', '', '', ''), (240, 'fr_FR', 'USA - Vermont', '', '', ''), -(241, 'en_UK', 'USA - Virginia', '', '', ''), +(241, 'en_US', 'USA - Virginia', '', '', ''), (241, 'es_ES', 'USA - Virginia', '', '', ''), (241, 'fr_FR', 'USA - Virginia', '', '', ''), -(242, 'en_UK', 'USA - Washington', '', '', ''), +(242, 'en_US', 'USA - Washington', '', '', ''), (242, 'es_ES', 'USA - Washington', '', '', ''), (242, 'fr_FR', 'USA - Washington', '', '', ''), -(243, 'en_UK', 'USA - West Virginia', '', '', ''), +(243, 'en_US', 'USA - West Virginia', '', '', ''), (243, 'es_ES', 'USA - West Virginia', '', '', ''), (243, 'fr_FR', 'USA - West Virginia', '', '', ''), -(244, 'en_UK', 'USA - Wisconsin', '', '', ''), +(244, 'en_US', 'USA - Wisconsin', '', '', ''), (244, 'es_ES', 'USA - Wisconsin', '', '', ''), (244, 'fr_FR', 'USA - Wisconsin', '', '', ''), -(245, 'en_UK', 'USA - Wyoming', '', '', ''), +(245, 'en_US', 'USA - Wyoming', '', '', ''), (245, 'es_ES', 'USA - Wyoming', '', '', ''), (245, 'fr_FR', 'USA - Wyoming', '', '', ''), -(246, 'en_UK', 'Canada - Colombie-Britannique', '', '', ''), +(246, 'en_US', 'Canada - Colombie-Britannique', '', '', ''), (246, 'es_ES', 'Canada - Colombie-Britannique', '', '', ''), (246, 'fr_FR', 'Canada - Colombie-Britannique', '', '', ''), -(247, 'en_UK', 'Canada - Alberta', '', '', ''), +(247, 'en_US', 'Canada - Alberta', '', '', ''), (247, 'es_ES', 'Canada - Alberta', '', '', ''), (247, 'fr_FR', 'Canada - Alberta', '', '', ''), -(248, 'en_UK', 'Canada - Saskatchewan', '', '', ''), +(248, 'en_US', 'Canada - Saskatchewan', '', '', ''), (248, 'es_ES', 'Canada - Saskatchewan', '', '', ''), (248, 'fr_FR', 'Canada - Saskatchewan', '', '', ''), -(249, 'en_UK', 'Canada - Manitoba', '', '', ''), +(249, 'en_US', 'Canada - Manitoba', '', '', ''), (249, 'es_ES', 'Canada - Manitoba', '', '', ''), (249, 'fr_FR', 'Canada - Manitoba', '', '', ''), -(250, 'en_UK', 'Canada - Ontario', '', '', ''), +(250, 'en_US', 'Canada - Ontario', '', '', ''), (250, 'es_ES', 'Canada - Ontario', '', '', ''), (250, 'fr_FR', 'Canada - Ontario', '', '', ''), -(251, 'en_UK', 'Canada - Québec', '', '', ''), +(251, 'en_US', 'Canada - Québec', '', '', ''), (251, 'es_ES', 'Canada - Québec', '', '', ''), (251, 'fr_FR', 'Canada - Québec', '', '', ''), -(252, 'en_UK', 'Canada - Nouveau-Brunswick', '', '', ''), +(252, 'en_US', 'Canada - Nouveau-Brunswick', '', '', ''), (252, 'es_ES', 'Canada - Nouveau-Brunswick', '', '', ''), (252, 'fr_FR', 'Canada - Nouveau-Brunswick', '', '', ''), -(253, 'en_UK', 'Canada - Nouvelle-Écosse', '', '', ''), +(253, 'en_US', 'Canada - Nouvelle-Écosse', '', '', ''), (253, 'es_ES', 'Canada - Nouvelle-Écosse', '', '', ''), (253, 'fr_FR', 'Canada - Nouvelle-Écosse', '', '', ''), -(254, 'en_UK', 'Canada - Île-du-Prince-Édouard ', '', '', ''), +(254, 'en_US', 'Canada - Île-du-Prince-Édouard ', '', '', ''), (254, 'es_ES', 'Canada - Île-du-Prince-Édouard ', '', '', ''), (254, 'fr_FR', 'Canada - Île-du-Prince-Édouard ', '', '', ''), -(255, 'en_UK', 'Canada - Terre-Neuve-et-Labrador ', '', '', ''), +(255, 'en_US', 'Canada - Terre-Neuve-et-Labrador ', '', '', ''), (255, 'es_ES', 'Canada - Terre-Neuve-et-Labrador ', '', '', ''), (255, 'fr_FR', 'Canada - Terre-Neuve-et-Labrador ', '', '', ''), -(256, 'en_UK', 'Canada - Yukon', '', '', ''), +(256, 'en_US', 'Canada - Yukon', '', '', ''), (256, 'es_ES', 'Canada - Yukon', '', '', ''), (256, 'fr_FR', 'Canada - Yukon', '', '', ''), -(257, 'en_UK', 'Canada - Territoires-du-Nord-Ouest', '', '', ''), +(257, 'en_US', 'Canada - Territoires-du-Nord-Ouest', '', '', ''), (257, 'es_ES', 'Canada - Territoires-du-Nord-Ouest', '', '', ''), (257, 'fr_FR', 'Canada - Territoires-du-Nord-Ouest', '', '', ''), -(258, 'en_UK', 'Canada - Nunavut', '', '', ''), +(258, 'en_US', 'Canada - Nunavut', '', '', ''), (258, 'es_ES', 'Canada - Nunavut', '', '', ''), (258, 'fr_FR', 'Canada - Nunavut', '', '', ''), -(259, 'en_UK', 'Guadeloupe', '', '', ''), +(259, 'en_US', 'Guadeloupe', '', '', ''), (259, 'es_ES', 'Guadeloupe', '', '', ''), (259, 'fr_FR', 'Guadeloupe', '', '', ''), -(260, 'en_UK', 'Guyane Française', '', '', ''), +(260, 'en_US', 'Guyane Française', '', '', ''), (260, 'es_ES', 'Guyane Française', '', '', ''), (260, 'fr_FR', 'Guyane Française', '', '', ''), -(261, 'en_UK', 'Martinique', '', '', ''), +(261, 'en_US', 'Martinique', '', '', ''), (261, 'es_ES', 'Martinique', '', '', ''), (261, 'fr_FR', 'Martinique', '', '', ''), -(262, 'en_UK', 'Mayotte', '', '', ''), +(262, 'en_US', 'Mayotte', '', '', ''), (262, 'es_ES', 'Mayotte', '', '', ''), (262, 'fr_FR', 'Mayotte', '', '', ''), -(263, 'en_UK', 'Réunion(La)', '', '', ''), +(263, 'en_US', 'Réunion(La)', '', '', ''), (263, 'es_ES', 'Réunion(La)', '', '', ''), (263, 'fr_FR', 'Réunion(La)', '', '', ''), -(264, 'en_UK', 'St Pierre et Miquelon', '', '', ''), +(264, 'en_US', 'St Pierre et Miquelon', '', '', ''), (264, 'es_ES', 'St Pierre et Miquelon', '', '', ''), (264, 'fr_FR', 'St Pierre et Miquelon', '', '', ''), -(265, 'en_UK', 'Nouvelle-Calédonie', '', '', ''), +(265, 'en_US', 'Nouvelle-Calédonie', '', '', ''), (265, 'es_ES', 'Nouvelle-Calédonie', '', '', ''), (265, 'fr_FR', 'Nouvelle-Calédonie', '', '', ''), -(266, 'en_UK', 'Polynésie française', '', '', ''), +(266, 'en_US', 'Polynésie française', '', '', ''), (266, 'es_ES', 'Polynésie française', '', '', ''), (266, 'fr_FR', 'Polynésie française', '', '', ''), -(267, 'en_UK', 'Wallis-et-Futuna', '', '', ''), +(267, 'en_US', 'Wallis-et-Futuna', '', '', ''), (267, 'es_ES', 'Wallis-et-Futuna', '', '', ''), (267, 'fr_FR', 'Wallis-et-Futuna', '', '', ''), -(268, 'en_UK', 'USA - Alabama', '', '', ''), +(268, 'en_US', 'USA - Alabama', '', '', ''), (268, 'es_ES', 'USA - Alabama', '', '', ''), (268, 'fr_FR', 'USA - Alabama', '', '', ''); diff --git a/reset_install.bat b/reset_install.bat index d117e525b..0a12c43d2 100644 --- a/reset_install.bat +++ b/reset_install.bat @@ -14,10 +14,10 @@ if exist local\config\database.yml ( ..\..\bin\propel build -v --output-dir=../../core/lib/ echo [INFO] Building SQL CREATE file - ..\..\bin\propel sql:build -v --output-dir=../../install/ + ..\..\bin\propel sql:build -v --output-dir=..\..\install - echo [INFO] Reloaded Thelia2 database + echo [INFO] Reloading Thelia2 database cd ..\.. del install\sqldb.map php Thelia thelia:dev:reloadDB diff --git a/templates/admin/default/admin-layout.tpl b/templates/admin/default/admin-layout.tpl index 59004fdc7..226355b7a 100644 --- a/templates/admin/default/admin-layout.tpl +++ b/templates/admin/default/admin-layout.tpl @@ -36,6 +36,8 @@ {* Modules css are included here *} {module_include location='head_css'} + + {debugbar_renderHead} @@ -233,5 +235,7 @@ {debugbar_render} {* Modules scripts are included now *} {module_include location='footer_js'} + + {debugbar_render} \ No newline at end of file diff --git a/templates/admin/default/configuration.html b/templates/admin/default/configuration.html index 75e9d523c..70b7cffb8 100644 --- a/templates/admin/default/configuration.html +++ b/templates/admin/default/configuration.html @@ -25,21 +25,21 @@ {loop type="auth" name="pcc1" roles="ADMIN" permissions="admin.configuration.product_templates"} {intl l='Product templates'} - + {/loop} {loop type="auth" name="pcc2" roles="ADMIN" permissions="admin.configuration.product_attributes"} {intl l='Product attributes'} - + {/loop} {loop type="auth" name="pcc3" roles="ADMIN" permissions="admin.configuration.product_features"} {intl l='Product features'} - + {/loop} diff --git a/templates/admin/default/includes/generic-create-dialog.html b/templates/admin/default/includes/generic-create-dialog.html index c6a00a01b..f30825d5a 100755 --- a/templates/admin/default/includes/generic-create-dialog.html +++ b/templates/admin/default/includes/generic-create-dialog.html @@ -26,8 +26,7 @@ A generic modal creation dialog template. Parameters
- - {if ! empty($form_error_message)}
{$form_error_message nofilter}
{/if} + {if ! empty($form_error_message)}
{$form_error_message nofilter}
{/if} {$dialog_body nofilter}
From eb7bc629642e0473aedffd68e1c9825256d06ebf Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Tue, 10 Sep 2013 16:13:53 +0200 Subject: [PATCH 6/9] integrate new customer creation form --- core/lib/Thelia/Form/CustomerCreation.php | 81 ++++++++++++++++++----- 1 file changed, 65 insertions(+), 16 deletions(-) diff --git a/core/lib/Thelia/Form/CustomerCreation.php b/core/lib/Thelia/Form/CustomerCreation.php index 1bc88407b..958f781b5 100755 --- a/core/lib/Thelia/Form/CustomerCreation.php +++ b/core/lib/Thelia/Form/CustomerCreation.php @@ -26,6 +26,7 @@ use Symfony\Component\Validator\Constraints; use Symfony\Component\Validator\ExecutionContextInterface; use Thelia\Model\ConfigQuery; use Thelia\Model\CustomerQuery; +use Thelia\Core\Translation\Translator; /** * Class CustomerCreation @@ -43,55 +44,94 @@ class CustomerCreation extends BaseForm "constraints" => array( new Constraints\NotBlank() ), - "label" => "firstname" + "label" => Translator::getInstance()->trans("First Name"), + "label_attr" => array( + "for" => "firstname" + ) )) ->add("lastname", "text", array( "constraints" => array( new Constraints\NotBlank() ), - "label" => "lastname" + "label" => Translator::getInstance()->trans("Last Name"), + "label_attr" => array( + "for" => "lastname" + ) )) ->add("address1", "text", array( "constraints" => array( new Constraints\NotBlank() ), - "label" => "address" + "label_attr" => array( + "for" => "address" + ), + "label" => Translator::getInstance()->trans("Street Address") )) ->add("address2", "text", array( - "label" => "Address Line 2" + "label" => Translator::getInstance()->trans("Address Line 2"), + "label_attr" => array( + "for" => "address2" + ) )) ->add("address3", "text", array( - "label" => "Address Line 3" + "label" => Translator::getInstance()->trans("Address Line 3"), + "label_attr" => array( + "for" => "address3" + ) + )) + ->add("company", "text", array( + "label" => Translator::getInstance()->trans("Company name"), + "label_attr" => array( + "for" => "company" + ) )) ->add("phone", "text", array( - "label" => "phone" + "label" => Translator::getInstance()->trans("Phone"), + "label_attr" => array( + "for" => "phone" + ) )) ->add("cellphone", "text", array( - "label" => "cellphone" + "label" => Translator::getInstance()->trans("Cellphone"), + "label_attr" => array( + "for" => "cellphone" + ) )) ->add("zipcode", "text", array( "constraints" => array( new Constraints\NotBlank() ), - "label" => "zipcode" + "label" => Translator::getInstance()->trans("Zip code"), + "label_attr" => array( + "for" => "zipcode" + ) )) ->add("city", "text", array( "constraints" => array( new Constraints\NotBlank() ), - "label" => "city" + "label" => Translator::getInstance()->trans("City"), + "label_attr" => array( + "for" => "city" + ) )) ->add("country", "text", array( "constraints" => array( new Constraints\NotBlank() ), - "label" => "country" + "label" => Translator::getInstance()->trans("Country"), + "label_attr" => array( + "for" => "country" + ) )) ->add("title", "text", array( "constraints" => array( new Constraints\NotBlank() ), - "label" => "title" + "label" => Translator::getInstance()->trans("Title"), + "label_attr" => array( + "for" => "title" + ) )) ->add("email", "email", array( "constraints" => array( @@ -104,9 +144,12 @@ class CustomerCreation extends BaseForm ) )) ), - "label" => "email" + "label" => Translator::getInstance()->trans("Email Address"), + "label_attr" => array( + "for" => "email" + ) )) - ->add("email_confirm", "email", array( +/* ->add("email_confirm", "email", array( "constraints" => array( new Constraints\Callback(array( "methods" => array( @@ -116,13 +159,16 @@ class CustomerCreation extends BaseForm )) ), "label" => "email confirmation" - )) + ))*/ ->add("password", "password", array( "constraints" => array( new Constraints\NotBlank(), new Constraints\Length(array("min" => ConfigQuery::read("password.length", 4))) ), - "label" => "password" + "label" => Translator::getInstance()->trans("Password"), + "label_attr" => array( + "for" => "password" + ) )) ->add("password_confirm", "password", array( "constraints" => array( @@ -132,7 +178,10 @@ class CustomerCreation extends BaseForm array($this, "verifyPasswordField") ))) ), - "label" => "password confirmation" + "label" => "Password confirmation", + "label_attr" => array( + "for" => "password_confirmation" + ) )) ; From 5aa49d62fe3be15ea3943a3a1ae7175ca479870c Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Tue, 10 Sep 2013 16:14:49 +0200 Subject: [PATCH 7/9] replace smarty variable identifier by $ --- templates/admin/default/categories.html | 4 ++-- templates/admin/default/category-edit.html | 4 ++-- templates/admin/default/coupon-read.html | 20 ++++++++++---------- templates/admin/default/customers.html | 20 ++++++++++---------- templates/admin/default/login.html | 2 +- templates/admin/default/message-edit.html | 2 +- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/templates/admin/default/categories.html b/templates/admin/default/categories.html index f08721828..1d1cf53c2 100755 --- a/templates/admin/default/categories.html +++ b/templates/admin/default/categories.html @@ -93,7 +93,7 @@ {loop type="image" name="cat_image" source="category" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"} - #TITLE + {$TITLE} {/loop} @@ -258,7 +258,7 @@ {loop type="image" name="cat_image" source="product" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"} - #TITLE + {$TITLE} {/loop} diff --git a/templates/admin/default/category-edit.html b/templates/admin/default/category-edit.html index 13327ca3d..7f59fd38e 100755 --- a/templates/admin/default/category-edit.html +++ b/templates/admin/default/category-edit.html @@ -146,7 +146,7 @@
- +
@@ -162,7 +162,7 @@ {loop name="cat-parent" type="category-tree" visible="*" category="0" exclude="{$current_category_id}"} - + {/loop} diff --git a/templates/admin/default/coupon-read.html b/templates/admin/default/coupon-read.html index f187df7a0..3055a8cb2 100755 --- a/templates/admin/default/coupon-read.html +++ b/templates/admin/default/coupon-read.html @@ -21,18 +21,18 @@ {loop type="coupon" name="read_coupon" id=1 backend_context="true"}
- {if #IS_ENABLED}{else}This coupon is disabled, you can enable to the bottom of this form.{/if} + {if !$IS_ENABLED}This coupon is disabled, you can enable to the bottom of this form.{/if}
- + - + @@ -41,9 +41,9 @@ - + - + - + diff --git a/templates/admin/default/customers.html b/templates/admin/default/customers.html index ea498f72c..a8b248665 100644 --- a/templates/admin/default/customers.html +++ b/templates/admin/default/customers.html @@ -61,14 +61,14 @@ {loop name="customer_list" type="customer" current="false" visible="*" last_order="1" backend_context="1" page={$customer_page} limit={$display_customer}} - + {module_include location='customer_list_row'} @@ -87,7 +87,7 @@ {/loop} {loop type="auth" name="can_send_mail" roles="ADMIN" permissions="admin.customer.sendMail"} - + {/loop} {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.customer.delete"} @@ -110,21 +110,21 @@
    - {if #customer_page != 1} + {if $customer_page != 1}
  • «
    • {else}
  • «
    • {/if} {pageloop rel="customer_list"} - {if #PAGE != #CURRENT} -
  • #PAGE
    • + {if $PAGE != $CURRENT} +
  • {$PAGE}
    • {else} -
  • #PAGE
    • +
  • {$PAGE}
    • {/if} - {if #PAGE == #LAST && #LAST != #CURRENT} -
  • »
    • + {if $PAGE == $LAST && $LAST != $CURRENT} +
  • »
    • {else}
  • »
    • {/if} diff --git a/templates/admin/default/login.html b/templates/admin/default/login.html index 8815eb982..bddc9fb08 100755 --- a/templates/admin/default/login.html +++ b/templates/admin/default/login.html @@ -18,7 +18,7 @@ {form name="thelia.admin.login"} - {if #form_error}
    #form_error_message
    {/if} + {if $form_error}
    {$form_error_message}
    {/if} {form_hidden_fields form=$form} diff --git a/templates/admin/default/message-edit.html b/templates/admin/default/message-edit.html index a2c524c2e..4014940a5 100644 --- a/templates/admin/default/message-edit.html +++ b/templates/admin/default/message-edit.html @@ -50,7 +50,7 @@ {/form_field} - {if #form_error}
    #form_error_message
    {/if} + {if $form_error}
    {$form_error_message}
    {/if} {form_field form=$form field='name'}
    From 5ab3d4fb88a8d9e509f043597923e1899c54a445 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Tue, 10 Sep 2013 16:54:13 +0200 Subject: [PATCH 8/9] replace smarty variable identifier by $ --- templates/admin/default/variable-edit.html | 2 +- templates/default/index.html | 36 ++++++------ templates/default/layout.tpl | 6 +- templates/default/login.html | 2 +- templates/default_save/address.html | 4 +- templates/default_save/address_edit.html | 4 +- templates/default_save/address_list.html | 2 +- templates/default_save/cart.html | 4 +- templates/default_save/category.html | 66 +++++++++++----------- templates/default_save/connexion.html | 10 ++-- templates/default_save/customer.html | 52 ++++++++--------- templates/default_save/delivery_list.html | 6 +- templates/default_save/folder.html | 12 ++-- templates/default_save/images.html | 66 +++++++++++----------- templates/default_save/included.html | 12 ++-- templates/default_save/login.html | 4 +- templates/default_save/pagination.html | 38 ++++++------- templates/default_save/product.html | 40 ++++++------- templates/default_save/tester.html | 4 +- 19 files changed, 185 insertions(+), 185 deletions(-) diff --git a/templates/admin/default/variable-edit.html b/templates/admin/default/variable-edit.html index 5bccab1cd..ea2701f66 100644 --- a/templates/admin/default/variable-edit.html +++ b/templates/admin/default/variable-edit.html @@ -56,7 +56,7 @@ {/form_field} - {if #form_error}
    #form_error_message
    {/if} + {if $form_error}
    {$form_error_message}
    {/if} {form_field form=$form field='name'}
    diff --git a/templates/default/index.html b/templates/default/index.html index 2c0657dd9..bdf18cec8 100644 --- a/templates/default/index.html +++ b/templates/default/index.html @@ -39,23 +39,23 @@ - - -

    {#TITLE}

    -
    {#CHAPO}
    +     +

    {$TITLE}

    +
    {$CHAPO}
    @@ -68,7 +68,7 @@ preorder : http://schema.org/PreOrder online_only : http://schema.org/OnlineOnly --> - {currency attr="symbol"} {format_number number="{#BEST_TAXED_PRICE}"} + {currency attr="symbol"} {format_number number="{$BEST_TAXED_PRICE}"}
    @@ -97,22 +97,22 @@ -
    -

    {#CHAPO}

    +

    {$CHAPO}

    @@ -126,9 +126,9 @@ preorder : http://schema.org/PreOrder online_only : http://schema.org/OnlineOnly --> - {loop name="productSaleElements_promo" type="product_sale_elements" product="{#ID}" limit="1"} - {intl l="Special Price:"} {format_number number="{#TAXED_PROMO_PRICE}"} {currency attr="symbol"} - {intl l="Regular Price:"} {format_number number="{#TAXED_PRICE}"} {currency attr="symbol"} + {loop name="productSaleElements_promo" type="product_sale_elements" product="{$ID}" limit="1"} + {intl l="Special Price:"} {format_number number="{$TAXED_PROMO_PRICE}"} {currency attr="symbol"} + {intl l="Regular Price:"} {format_number number="{$TAXED_PRICE}"} {currency attr="symbol"} {/loop}
    diff --git a/templates/default/layout.tpl b/templates/default/layout.tpl index e89c7eb81..8cd5d0129 100644 --- a/templates/default/layout.tpl +++ b/templates/default/layout.tpl @@ -80,7 +80,7 @@ URL: http://www.thelia.net
{loop type="category" name="category.navigation" parent="0" limit="3"} -
  • {#TITLE}
    • +
  • {$TITLE}
    • {/loop}
    @@ -134,7 +134,7 @@ URL: http://www.thelia.net {currency attr="code"} diff --git a/templates/default/login.html b/templates/default/login.html index 4fe25f276..c7eb03986 100644 --- a/templates/default/login.html +++ b/templates/default/login.html @@ -18,7 +18,7 @@

    {intl l="Login"}

    {form name="thelia.customer.login"} - {if #form_error}
    #form_error_message
    {/if} + {if $form_error}
    {$form_error_message}
    {/if} {form_field form=$form field='success_url'} {* the url the user is redirected to on login success *} {/form_field} diff --git a/templates/default_save/address.html b/templates/default_save/address.html index afae59197..f02dc7689 100644 --- a/templates/default_save/address.html +++ b/templates/default_save/address.html @@ -26,7 +26,7 @@ @@ -78,7 +78,7 @@ diff --git a/templates/default_save/address_edit.html b/templates/default_save/address_edit.html index 22e70289a..c6cf1b120 100644 --- a/templates/default_save/address_edit.html +++ b/templates/default_save/address_edit.html @@ -27,7 +27,7 @@ @@ -79,7 +79,7 @@ diff --git a/templates/default_save/address_list.html b/templates/default_save/address_list.html index 88a483e23..6dc1d5378 100644 --- a/templates/default_save/address_list.html +++ b/templates/default_save/address_list.html @@ -4,7 +4,7 @@
      {loop type="address" name="customer_list" customer="current"} -
    • {#LABEL} - {#FIRSTNAME} {#LASTNAME} - edit
      • +
    • {$LABEL} - {$FIRSTNAME} {$LASTNAME} - edit
      • {/loop}
    diff --git a/templates/default_save/cart.html b/templates/default_save/cart.html index a503e3bd4..38e3e7716 100755 --- a/templates/default_save/cart.html +++ b/templates/default_save/cart.html @@ -3,7 +3,7 @@

    {intl l='cart'}

      {loop name="cart" type="cart"} -
    • Item {$LOOP_COUNT}/{$LOOP_TOTAL} : #ITEM_ID #TITLE - quantity : #QUANTITY
      • +
    • Item {$LOOP_COUNT}/{$LOOP_TOTAL} : {$ITEM_ID} {$TITLE} - quantity : {$QUANTITY}
      • {/loop}
    @@ -16,7 +16,7 @@ and passed back to the form plugin through the ParserContext. *} - {if #form_error}
    #form_error_message
    {/if} + {if $form_error}
    {$form_error_message}
    {/if} {form_hidden_fields form=$form} diff --git a/templates/default_save/category.html b/templates/default_save/category.html index a888605ff..2e216d0c0 100755 --- a/templates/default_save/category.html +++ b/templates/default_save/category.html @@ -12,13 +12,13 @@ {loop name="category0" type="category" parent="0" order="manual"}
    -

    CATEGORY : #TITLE (#LOOP_COUNT / #LOOP_TOTAL)

    +

    CATEGORY : {$TITLE} ({$LOOP_COUNT} / {$LOOP_TOTAL})

    {ifloop rel="prod_ass_cont"}
    Associated Content
      - {loop name="prod_ass_cont" type="associated_content" category="#ID" order="associated_content"} -
    • #TITLE
      • + {loop name="prod_ass_cont" type="associated_content" category="$ID" order="associated_content"} +
    • {$TITLE}
      • {/loop}
    {/ifloop} @@ -26,23 +26,23 @@
    No associated content
    {/elseloop} - {loop name="product" type="product" category="#ID"} + {loop name="product" type="product" category="$ID"}
    -

    PRODUCT #ID : #REF (#LOOP_COUNT / #LOOP_TOTAL)

    -

    #TITLE

    -

    #DESCRIPTION

    +

    PRODUCT {$ID} : {$REF} ({$LOOP_COUNT} / {$LOOP_TOTA}L)

    +

    {$TITLE}

    +

    {$DESCRIPTION}

    -

    Starting by #BEST_PRICE € HT (TAX : #BEST_PRICE_TAX ; #BEST_TAXED_PRICE € TTC)

    +

    Starting by {$BEST_PRICE} € HT (TAX : {$BEST_PRICE_TAX} ; {$BEST_TAXED_PRICE} € TTC)

    {ifloop rel="ft"}
    Features
      - {assign var=current_product value=#ID} - {loop name="ft" type="feature" order="manual" product="#ID"} + {assign var=current_product value=$ID} + {loop name="ft" type="feature" order="manual" product="$ID"}
    • - #TITLE : - {loop name="ft_v" type="feature_value" product="{$current_product}" feature="#ID"} - #TITLE / #PERSONAL_VALUE + {$TITLE} : + {loop name="ft_v" type="feature_value" product="{$current_product}" feature="{$ID}"} + {$TITLE} / {$PERSONAL_VALUE} {/loop}
      • {/loop} @@ -53,15 +53,15 @@ {/elseloop}
    {/loop} - {loop name="catgory1" type="category" parent="#ID"} + {loop name="catgory1" type="category" parent="$ID"}
    -

    SUBCATEGORY : #TITLE (#LOOP_COUNT / #LOOP_TOTAL)

    +

    SUBCATEGORY : {$TITLE} ({$LOOP_COUNT} / {$LOOP_TOTAL})

    {ifloop rel="prod_ass_cont"}
    Associated Content
      - {loop name="prod_ass_cont" type="associated_content" category="#ID" order="associated_content"} -
    • #TITLE
      • + {loop name="prod_ass_cont" type="associated_content" category="$ID" order="associated_content"} +
    • {$TITLE}
      • {/loop}
    {/ifloop} @@ -69,22 +69,22 @@
    No associated content
    {/elseloop} - {loop name="product" type="product" category="#ID"} + {loop name="product" type="product" category="$ID"}
    -

    PRODUCT #ID : #REF (#LOOP_COUNT / #LOOP_TOTAL)

    -

    #TITLE

    -

    #DESCRIPTION

    +

    PRODUCT {$ID} : {$REF} ({$LOOP_COUNT} / {$LOOP_TOTAL})

    +

    {$TITLE}

    +

    {$DESCRIPTION}

    {ifloop rel="ft"}
    Features
      - {assign var=current_product value=#ID} - {loop name="ft" type="feature" order="manual" product="#ID"} + {assign var=current_product value=$ID} + {loop name="ft" type="feature" order="manual" product="$ID"}
    • - #TITLE : - {loop name="ft_v" type="feature_value" product="{$current_product}" feature="#ID"} - #TITLE / #PERSONAL_VALUE + {$TITLE} : + {loop name="ft_v" type="feature_value" product="{$current_product}" feature="$ID"} + {$TITLE} / {$PERSONAL_VALUE} {/loop}
      • {/loop} @@ -109,10 +109,10 @@
        {loop name="ft" type="feature" order="manual"}
      • - #TITLE + {$TITLE}
          - {loop name="ftav" type="feature_availability" order="manual" feature="#ID"} -
        • #TITLE
          • + {loop name="ftav" type="feature_availability" order="manual" feature="$ID"} +
        • {$TITLE}
          • {/loop}
        • @@ -126,10 +126,10 @@
          {loop name="attr" type="attribute" order="manual"}
        • - #TITLE + {$TITLE}
            - {loop name="attrav" type="attribute_availability" order="manual" attribute="#ID"} -
          • #TITLE
            • + {loop name="attrav" type="attribute_availability" order="manual" attribute="$ID"} +
          • {$TITLE}
            • {/loop}
          • @@ -143,7 +143,7 @@
            {loop name="cur" type="currency"}
          • - #NAME (#SYMBOL) + {$NAME} ({$SYMBOL})
            • {/loop}
          diff --git a/templates/default_save/connexion.html b/templates/default_save/connexion.html index b3867782f..3c52d1a53 100755 --- a/templates/default_save/connexion.html +++ b/templates/default_save/connexion.html @@ -27,7 +27,7 @@ and passed back to the form plugin through the ParserContext. *} - {if #form_error}
          #form_error_message
          {/if} + {if $form_error}
          {$form_error_message}
          {/if} {form_hidden_fields form=$form} @@ -132,28 +132,28 @@ {form_field form=$form field="email"} {form_error form=$form field="email"} - {#message} + {$message} {/form_error}
          {/form_field} {form_field form=$form field="email_confirm"} {form_error form=$form field="email_confirm"} - {#message} + {$message} {/form_error}
          {/form_field} {form_field form=$form field="password"} {form_error form=$form field="password"} - {#message} + {$message} {/form_error}
          {/form_field} {form_field form=$form field="password_confirm"} {form_error form=$form field="password_confirm"} - {#message} + {$message} {/form_error}
          {/form_field} diff --git a/templates/default_save/customer.html b/templates/default_save/customer.html index 02e7104f9..a4d79ca33 100755 --- a/templates/default_save/customer.html +++ b/templates/default_save/customer.html @@ -7,43 +7,43 @@
    Code#CODE{$CODE}
    Title#TITLE{$TITLE}
    Expiration date
    Usage left - {if #USAGE_LEFT} + {if $USAGE_LEFT} - #USAGE_LEFT + {$USAGE_LEFT} {else} @@ -53,14 +53,14 @@
    #SHORT_DESCRIPTION{$SHORT_DESCRIPTION}
    #DESCRIPTION{$DESCRIPTION}
    - {if #IS_CUMULATIVE} + {if $IS_CUMULATIVE} {intl l="May be cumulative"} @@ -73,7 +73,7 @@
    - {if #IS_REMOVING_POSTAGE} + {if $IS_REMOVING_POSTAGE} {intl l="Will remove postage"} @@ -86,7 +86,7 @@
    Amount#AMOUNT{$AMOUNT}
    Conditions of application
    {#REF}{$REF} - {#COMPANY} + {$COMPANY} - {#FIRSTNAME} {#LASTNAME} + {$FIRSTNAME} {$LASTNAME}
    - + - + - + - + - + - + - + - +
    ID#ID{$ID}
    Réference#REF{$REF}
    Title - {loop name="title" type="title" id="#TITLE"} - #LONG (#SHORT) + {loop name="title" type="title" id="$TITLE"} + {$LONG} ({$SHORT}) {/loop}
    Firstname#FIRSTNAME{$FIRSTNAME}
    Lastname#LASTNAME{$LASTNAME}
    Email#EMAIL{$EMAIL}
    Is reseller#RESELLER{$RESELLER}
    Sponsor#SPONSOR{$SPONSOR}
    Discount#DISCOUNT %{$DISCOUNT} %
    @@ -56,20 +56,20 @@ - + - + - + - + - + - + - + - + - + - +
    ID#ID{$ID}
    Name#NAME{$NAME}
    Title
      - {assign var=current_title value=#TITLE} + {assign var=current_title value=$TITLE} {loop name="title" type="title"} -
    • - #LONG (#SHORT) +
    • + {$LONG} ({$SHORT})
      • {/loop}
    @@ -77,36 +77,36 @@
    Company#COMPANY{$COMPANY}
    Firstname#FIRSTNAME{$FIRSTNAME}
    Lastname#LASTNAME{$LASTNAME}
    Address#ADDRESS1
    #ADDRESS2
    #ADDRESS3    		{$ADDRESS1}
    {$ADDRESS2}
    {$ADDRESS3}
    Zipcode#ZIPCODE{$ZIPCODE}
    City#CITY{$CITY}
    Country @@ -114,11 +114,11 @@
    Phone#PHONE{$PHONE}
    Cellphone#CELLPHONE{$CELLPHONE}
    diff --git a/templates/default_save/delivery_list.html b/templates/default_save/delivery_list.html index 2ea3cc166..a652af31b 100644 --- a/templates/default_save/delivery_list.html +++ b/templates/default_save/delivery_list.html @@ -4,9 +4,9 @@ {loop type="delivery" name="delivery.list"}
    • -
    • id : {#ID}
      • -
    • prix : {#PRICE}
      • -
    • Choisir : Choisir
      • +
    • id : {$ID}
      • +
    • prix : {$PRICE}
      • +
    • Choisir : Choisir
    • {/loop} diff --git a/templates/default_save/folder.html b/templates/default_save/folder.html index 7d12036f9..7d6abb147 100755 --- a/templates/default_save/folder.html +++ b/templates/default_save/folder.html @@ -1,13 +1,13 @@ {loop name="folder0" type="folder" parent="0" order="alpha_reverse"}
    -

    FOLDER : #TITLE

    - {loop name="folder1" type="folder" parent="#ID"} +

    FOLDER : {$TITLE}

    + {loop name="folder1" type="folder" parent="$ID"}
    -

    SUBFOLDER : #TITLE (#LOOP_COUNT / #LOOP_TOTAL)

    - {loop name="content" type="content" folder="#ID"} +

    SUBFOLDER : {$TITLE} ({$LOOP_COUNT} / {$LOOP_TOTAL})

    + {loop name="content" type="content" folder="$ID"}
    -

    CONTENT : #TITLE

    -

    #DESCRIPTION

    +

    CONTENT : {$TITLE}

    +

    {$DESCRIPTION}

    {/loop}
    diff --git a/templates/default_save/images.html b/templates/default_save/images.html index c72beaecd..cd6834f9f 100755 --- a/templates/default_save/images.html +++ b/templates/default_save/images.html @@ -5,22 +5,22 @@

    Category Images

      {loop type="category" name="jsvdfk"} -

    • Category id #ID: #TITLE

      +

    • Category id {$ID}: {$TITLE}

      • - {loop type="image" name="image_test" category="#ID" width="200" height="100" resize_mode="borders"} -

        Processed file URL: #IMAGE_URL

        -

        Original file URL: #ORIGINAL_IMAGE_URL

        - + {loop type="image" name="image_test" category="$ID" width="200" height="100" resize_mode="borders"} +

        Processed file URL: {$IMAGE_URL}

        +

        Original file URL: {$ORIGINAL_IMAGE_URL}

        + {/loop} - {loop type="image" name="image_test" category="#ID"} -

        Full size file URL: #IMAGE_URL

        - + {loop type="image" name="image_test" category="$ID"} +

        Full size file URL: {$IMAGE_URL}

        + {/loop} - {loop type="image" name="image_test" source="category" source_id="#ID"} -

        source="category" source_id="x" argument style: Processed file URL: #IMAGE_URL

        + {loop type="image" name="image_test" source="category" source_id="$ID"} +

        source="category" source_id="x" argument style: Processed file URL: {$IMAGE_URL}

        {/loop}
      @@ -34,27 +34,27 @@

      Product Images

        {loop type="product" name="jsvdfk"} -

      • Product id #ID: #TITLE

        +

      • Product id {$ID}: {$TITLE}

        • - {loop type="image" name="image_test" product="#ID" width="200" height="100" resize_mode="borders" effects="gamma:0.7" background_color="#cc8000"} -

          Processed file URL: #IMAGE_URL

          -

          Original file URL: #ORIGINAL_IMAGE_URL

          + {loop type="image" name="image_test" product="$ID" width="200" height="100" resize_mode="borders" effects="gamma:0.7" background_color="#cc8000"} +

          Processed file URL: {$IMAGE_URL}

          +

          Original file URL: {$ORIGINAL_IMAGE_URL}

          Images:

          - + {/loop} - {loop type="image" name="image_test" product="#ID" width="200" height="100" resize_mode="crop"} - + {loop type="image" name="image_test" product="$ID" width="200" height="100" resize_mode="crop"} + {/loop} - {loop type="image" name="image_test" product="#ID" width="100" height="200" resize_mode="borders" background_color="#cc8000"} - + {loop type="image" name="image_test" product="$ID" width="100" height="200" resize_mode="borders" background_color="#cc8000"} + {/loop} - {loop type="image" name="image_test" product="#ID" width="100" rotation="-20" background_color="#facabe"} - + {loop type="image" name="image_test" product="$ID" width="100" rotation="-20" background_color="#facabe"} + {/loop} - {loop type="image" name="image_test" product="#ID" width="200" height="100" resize_mode="borders" background_color="#facabe" effects="negative"} - + {loop type="image" name="image_test" product="$ID" width="200" height="100" resize_mode="borders" background_color="#facabe" effects="negative"} + {/loop}

          • @@ -67,13 +67,13 @@

          Folder Images

            {loop type="folder" name="jsvdfk"} -

          • Folder id #ID: #TITLE

            +

          • Folder id {$ID}: {$TITLE}

            • - {loop type="image" name="image_test" folder="#ID" width="200" height="100" resize_mode="borders"} -

              Processed file URL: #IMAGE_URL

              -

              Original file URL: #ORIGINAL_IMAGE_URL

              - + {loop type="image" name="image_test" folder="$ID" width="200" height="100" resize_mode="borders"} +

              Processed file URL: {$IMAGE_URL}

              +

              Original file URL: {$ORIGINAL_IMAGE_URL}

              + {/loop}
            @@ -86,13 +86,13 @@

            Content Images

              {loop type="content" name="jsvdfk"} -

            • Content id #ID: #TITLE

              +

            • Content id {$ID}: {$TITLE}

              • - {loop type="image" name="image_test" content="#ID" width="200" height="100" resize_mode="borders"} -

                Processed file URL: #IMAGE_URL

                -

                Original file URL: #ORIGINAL_IMAGE_URL

                - + {loop type="image" name="image_test" content="$ID" width="200" height="100" resize_mode="borders"} +

                Processed file URL: {$IMAGE_URL}

                +

                Original file URL: {$ORIGINAL_IMAGE_URL}

                + {/loop}
              diff --git a/templates/default_save/included.html b/templates/default_save/included.html index 93581ff7f..0d0df5c14 100755 --- a/templates/default_save/included.html +++ b/templates/default_save/included.html @@ -1,12 +1,12 @@ {loop name="included0" type="category" parent="0"} -

              Out before - CATEGORY : #TITLE (#LOOP_COUNT / #LOOP_TOTAL)

              - {loop name="category1" type="category" parent="#ID"} -

              Inner - SUBCATEGORY : #TITLE (#LOOP_COUNT / #LOOP_TOTAL)

              +

              Out before - CATEGORY : {$TITLE} ({$LOOP_COUNT} / {$LOOP_TOTAL})

              + {loop name="category1" type="category" parent="$ID"} +

              Inner - SUBCATEGORY : {$TITLE} ({$LOOP_COUNT} / {$LOOP_TOTAL})

              {/loop} - {loop name="category2" type="category" parent="#ID"} -

              Inner 2 - SUBCATEGORY : #TITLE (#LOOP_COUNT / #LOOP_TOTAL)

              + {loop name="category2" type="category" parent="$ID"} +

              Inner 2 - SUBCATEGORY : {$TITLE} ({$LOOP_COUNT} / {$LOOP_TOTAL})

              {/loop} -

              Out after - CATEGORY : #TITLE (#LOOP_COUNT / #LOOP_TOTAL)

              +

              Out after - CATEGORY : {$TITLE} ({$LOOP_COUNT} / {$LOOP_TOTAL})

              {/loop} \ No newline at end of file diff --git a/templates/default_save/login.html b/templates/default_save/login.html index 702f0a710..61232e481 100755 --- a/templates/default_save/login.html +++ b/templates/default_save/login.html @@ -25,12 +25,12 @@ and passed back to the form plugin through the ParserContext. *} - {if #form_error}
              #form_error_message
              {/if} + {if $0form_error}
              {$form_error_message}
              {/if} {form_hidden_fields form=$form} {form_field form=$form field="email"} - {if #error}{#message}{/if} + {if $error}{$message}{/if}
              {/form_field} diff --git a/templates/default_save/pagination.html b/templates/default_save/pagination.html index cb06db66b..8f60b6b37 100755 --- a/templates/default_save/pagination.html +++ b/templates/default_save/pagination.html @@ -7,7 +7,7 @@
              {loop name="cat" type="category" page="{$category_current_page}" limit="2"} -

              #LOOP_COUNT - #TITLE

              +

              {$LOOP_COUNT} - {$TITLE}

              Products :

              @@ -17,23 +17,23 @@ {assign var=product_current_page value={$smarty.get.$this_product_getter|default:1}}
                - {loop name="prod" type="product" category="#ID" page="{$product_current_page}" limit="2"} + {loop name="prod" type="product" category="$ID" page="{$product_current_page}" limit="2"}
              • - #ID:#REF + {$ID}:{$REF}
                • {/loop}
              -

              #TITLE page choice

              +

              {$TITLE} page choice

              {pageloop rel="prod"} - {if ${PAGE} != {$product_current_page}} - #PAGE + {if $PAGE != $product_current_page} + {$PAGE} {else} - { #PAGE } + {$PAGE} {/if} - {if {$PAGE} != {$LAST}} + {if $PAGE != $LAST} - {/if} {/pageloop} @@ -44,12 +44,12 @@

              categories page choice

              {pageloop rel="cat"} -{if ${PAGE} != {$category_current_page}} - #PAGE +{if $PAGE != $category_current_page} + {$PAGE} {else} - { #PAGE } + {$PAGE} {/if} -{if {$PAGE} != {$LAST}} +{if $PAGE != $LAST} - {/if} {/pageloop} @@ -62,18 +62,18 @@ Pagination before loop {capture name="prod2"} {loop name="prod2" type="product" page="{$product_current_page}" limit="2"}
            • - #ID:#REF + {$ID}:{$REF}
              • {/loop} {/capture} {pageloop rel="prod2"} {if ${PAGE} != {$product_current_page}} - #PAGE + {$PAGE} {else} - { #PAGE } + {$PAGE} {/if} - {if {$PAGE} != {$LAST}} + {if $PAGE != $LAST} - {/if} {/pageloop} @@ -82,11 +82,11 @@ Pagination before loop {pageloop rel="prod2"} {if ${PAGE} != {$product_current_page}} - #PAGE + {$PAGE} {else} - { #PAGE } + {$PAGE} {/if} - {if {$PAGE} != {$LAST}} + {if $PAGE != $LAST} - {/if} {/pageloop} diff --git a/templates/default_save/product.html b/templates/default_save/product.html index 4280fc88c..f3d6a4cb6 100755 --- a/templates/default_save/product.html +++ b/templates/default_save/product.html @@ -9,17 +9,17 @@ Index : {navigate to="index"}
              {loop type="product" name="product" current="true"}
              -

              PRODUCT (#ID) : #REF

              -

              #TITLE

              -

              #DESCRIPTION

              +

              PRODUCT ({$ID}) : {$REF}

              +

              {$TITLE}

              +

              {$DESCRIPTION}

              -

              Starting by #BEST_PRICE € HT (TAX : #BEST_PRICE_TAX ; #BEST_TAXED_PRICE € TTC)

              +

              Starting by {$BEST_PRICE} € HT (TAX : {$BEST_PRICE_TAX} ; {$BEST_TAXED_PRICE} € TTC)

              {ifloop rel="acc"}

              Accessories

                - {loop name="acc" type="accessory" product="#ID" order="accessory"} -
              • #REF
                • + {loop name="acc" type="accessory" product="$ID" order="accessory"} +
              • {$REF}
                • {/loop}
              {/ifloop} @@ -30,8 +30,8 @@ Index : {navigate to="index"}
              {ifloop rel="prod_ass_cont"}

              Associated Content

                - {loop name="prod_ass_cont" type="associated_content" product="#ID" order="associated_content"} -
              • #TITLE
                • + {loop name="prod_ass_cont" type="associated_content" product="$ID" order="associated_content"} +
              • {$TITLE}
                • {/loop}
              {/ifloop} @@ -42,12 +42,12 @@ Index : {navigate to="index"}
              {ifloop rel="ft"}

              Features

                - {assign var=current_product value=#ID} - {loop name="ft" type="feature" order="manual" product="#ID"} + {assign var=current_product value=$ID} + {loop name="ft" type="feature" order="manual" product="$ID"}
              • - #TITLE : - {loop name="ft_v" type="feature_value" product="{$current_product}" feature="#ID"} - #TITLE / #PERSONAL_VALUE + {$TITLE} : + {loop name="ft_v" type="feature_value" product="{$current_product}" feature="$ID"} + {$TITLE} / {$PERSONAL_VALUE} {/loop}
                • {/loop} @@ -59,18 +59,18 @@ Index : {navigate to="index"}

                Product sale elements

                - {assign var=current_product value=#ID} - {loop name="pse" type="product_sale_elements" product="#ID"} + {assign var=current_product value=$ID} + {loop name="pse" type="product_sale_elements" product="$ID"}
                - {loop name="combi" type="attribute_combination" product_sale_elements="#ID"} - #ATTRIBUTE_TITLE = #ATTRIBUTE_AVAILABILITY_TITLE
                + {loop name="combi" type="attribute_combination" product_sale_elements="$ID"} + {$ATTRIBUTE_TITLE} = {$ATTRIBUTE_AVAILABILITY_TITLE}
                {/loop} -
                #WEIGHT g -
                {if #IS_PROMO == 1} #PROMO_PRICE € HT // TAX : #PROMO_PRICE_TAX ; #TAXED_PROMO_PRICE € TTC (instead of #PRICE HT // TAX : #PRICE_TAX ; #TAXED_PRICE € TTC){else} #PRICE € HT // TAX : #PRICE_TAX ; #TAXED_PRICE € TTC{/if} +
                {$WEIGHT} g +
                {if $IS_PROMO == 1} {$PROMO_PRICE} € HT // TAX : {$PROMO_PRICE_TAX} ; {$TAXED_PROMO_PRICE} € TTC (instead of {$PRICE HT} // TAX : {$PRICE_TAX} ; {$TAXED_PRICE} € TTC){else} {$PRICE} € HT // TAX : {$PRICE_TAX} ; {$TAXED_PRICE} € TTC{/if}

                Add diff --git a/templates/default_save/tester.html b/templates/default_save/tester.html index b53396d3f..658339d50 100755 --- a/templates/default_save/tester.html +++ b/templates/default_save/tester.html @@ -2,8 +2,8 @@ {loop name="car" type="category"}
                • - {loop name="product" type="product" category="#ID"} -
                • #REF
                  • + {loop name="product" type="product" category="$ID"} +
                • {$REF}
                  • {/loop}
                • From 04d517208fca52cf261be8cdd9188a30d9bbf4df Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Tue, 10 Sep 2013 16:57:12 +0200 Subject: [PATCH 9/9] remove preThelia smarty filter --- core/lib/Thelia/Core/Template/Smarty/SmartyParser.php | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php index 30144a263..ab86f44e8 100755 --- a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php +++ b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php @@ -82,19 +82,10 @@ class SmartyParser extends Smarty implements ParserInterface // The default HTTP status $this->status = 200; - $this->registerFilter('pre', array($this, "preThelia")); $this->registerFilter('output', array($this, "removeBlankLines")); $this->registerFilter('variable', array(__CLASS__, "theliaEscape")); } - - public function preThelia($tpl_source, \Smarty_Internal_Template $template) - { - $new_source = preg_replace('`{#([a-zA-Z][a-zA-Z0-9_]*)(.*)}`', '{\$$1$2}', $tpl_source); - $new_source = preg_replace('`#([a-zA-Z][a-zA-Z0-9_]*)`', '{\$$1|dieseCanceller:\'#$1\'}', $new_source); - - return $new_source; - } - + public function removeBlankLines($tpl_source, \Smarty_Internal_Template $template) { return preg_replace("/(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+/", "\n", $tpl_source);