diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml index a0d8db77b..60105ad32 100755 --- a/core/lib/Thelia/Config/Resources/config.xml +++ b/core/lib/Thelia/Config/Resources/config.xml @@ -15,6 +15,7 @@ + diff --git a/core/lib/Thelia/Core/Template/Element/BaseLoop.php b/core/lib/Thelia/Core/Template/Element/BaseLoop.php index 9f3a03d5d..72f782309 100755 --- a/core/lib/Thelia/Core/Template/Element/BaseLoop.php +++ b/core/lib/Thelia/Core/Template/Element/BaseLoop.php @@ -80,6 +80,7 @@ abstract class BaseLoop Argument::createIntTypeArgument('offset', 0), Argument::createIntTypeArgument('page'), Argument::createIntTypeArgument('limit', PHP_INT_MAX), + Argument::createBooleanTypeArgument('backend_context', false), ); } diff --git a/core/lib/Thelia/Core/Template/Loop/Attribute.php b/core/lib/Thelia/Core/Template/Loop/Attribute.php index 84549aaa5..41721350b 100755 --- a/core/lib/Thelia/Core/Template/Loop/Attribute.php +++ b/core/lib/Thelia/Core/Template/Loop/Attribute.php @@ -33,6 +33,7 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\Argument; use Thelia\Log\Tlog; +use Thelia\Model\Base\LangQuery; use Thelia\Model\Tools\ModelCriteriaTools; use Thelia\Model\Base\CategoryQuery; @@ -66,6 +67,7 @@ class Attribute extends BaseLoop Argument::createIntListTypeArgument('category'), Argument::createBooleanOrBothTypeArgument('visible', 1), Argument::createIntListTypeArgument('exclude'), + Argument::createIntTypeArgument('lang'), new Argument( 'order', new TypeCollection( @@ -85,8 +87,12 @@ class Attribute extends BaseLoop { $search = AttributeQuery::create(); + $backendContext = $this->getBackend_context(); + + $lang = $this->getLang(); + /* manage translations */ - ModelCriteriaTools::getI18n($search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale()); + ModelCriteriaTools::getI18n($backendContext, $lang, $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale()); $id = $this->getId(); @@ -151,6 +157,7 @@ class Attribute extends BaseLoop foreach ($attributes as $attribute) { $loopResultRow = new LoopResultRow(); $loopResultRow->set("ID", $attribute->getId()) + ->set("IS_TRANSLATED",$attribute->getVirtualColumn('IS_TRANSLATED')) ->set("TITLE",$attribute->getVirtualColumn('i18n_TITLE')) ->set("CHAPO", $attribute->getVirtualColumn('i18n_CHAPO')) ->set("DESCRIPTION", $attribute->getVirtualColumn('i18n_DESCRIPTION')) diff --git a/core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php b/core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php index ade493efa..be42f5dab 100755 --- a/core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php +++ b/core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php @@ -59,6 +59,7 @@ class AttributeAvailability extends BaseLoop Argument::createIntListTypeArgument('id'), Argument::createIntListTypeArgument('attribute'), Argument::createIntListTypeArgument('exclude'), + Argument::createIntTypeArgument('lang'), new Argument( 'order', new TypeCollection( @@ -78,8 +79,12 @@ class AttributeAvailability extends BaseLoop { $search = AttributeAvQuery::create(); + $backendContext = $this->getBackend_context(); + + $lang = $this->getLang(); + /* manage translations */ - ModelCriteriaTools::getI18n($search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale()); + ModelCriteriaTools::getI18n($backendContext, $lang, $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale()); $id = $this->getId(); @@ -126,6 +131,7 @@ class AttributeAvailability extends BaseLoop foreach ($attributesAv as $attributeAv) { $loopResultRow = new LoopResultRow(); $loopResultRow->set("ID", $attributeAv->getId()) + ->set("IS_TRANSLATED",$attributeAv->getVirtualColumn('IS_TRANSLATED')) ->set("TITLE",$attributeAv->getVirtualColumn('i18n_TITLE')) ->set("CHAPO", $attributeAv->getVirtualColumn('i18n_CHAPO')) ->set("DESCRIPTION", $attributeAv->getVirtualColumn('i18n_DESCRIPTION')) diff --git a/core/lib/Thelia/Core/Template/Loop/AttributeCombination.php b/core/lib/Thelia/Core/Template/Loop/AttributeCombination.php index 42df69ea3..833f1abb3 100755 --- a/core/lib/Thelia/Core/Template/Loop/AttributeCombination.php +++ b/core/lib/Thelia/Core/Template/Loop/AttributeCombination.php @@ -79,7 +79,7 @@ class AttributeCombination extends BaseLoop $search = AttributeCombinationQuery::create(); /* manage attribute translations */ - ModelCriteriaTools::getI18n( + ModelCriteriaTools::getFrontEndI18n( $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale(), @@ -89,7 +89,7 @@ class AttributeCombination extends BaseLoop ); /* manage attributeAv translations */ - ModelCriteriaTools::getI18n( + ModelCriteriaTools::getFrontEndI18n( $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale(), diff --git a/core/lib/Thelia/Core/Template/Loop/Category.php b/core/lib/Thelia/Core/Template/Loop/Category.php index 1233ccd4e..9b497bb1a 100755 --- a/core/lib/Thelia/Core/Template/Loop/Category.php +++ b/core/lib/Thelia/Core/Template/Loop/Category.php @@ -77,6 +77,7 @@ class Category extends BaseLoop Argument::createBooleanTypeArgument('current'), Argument::createBooleanTypeArgument('not_empty', 0), Argument::createBooleanOrBothTypeArgument('visible', 1), + Argument::createIntTypeArgument('lang'), new Argument( 'order', new TypeCollection( @@ -97,8 +98,12 @@ class Category extends BaseLoop { $search = CategoryQuery::create(); + $backendContext = $this->getBackend_context(); + + $lang = $this->getLang(); + /* manage translations */ - ModelCriteriaTools::getI18n($search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale()); + ModelCriteriaTools::getI18n($backendContext, $lang, $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale()); $id = $this->getId(); @@ -174,6 +179,7 @@ class Category extends BaseLoop $loopResultRow ->set("ID", $category->getId()) + ->set("IS_TRANSLATED",$category->getVirtualColumn('IS_TRANSLATED')) ->set("TITLE",$category->getVirtualColumn('i18n_TITLE')) ->set("CHAPO", $category->getVirtualColumn('i18n_CHAPO')) ->set("DESCRIPTION", $category->getVirtualColumn('i18n_DESCRIPTION')) diff --git a/core/lib/Thelia/Core/Template/Loop/Content.php b/core/lib/Thelia/Core/Template/Loop/Content.php index 3a81ff9f2..6632a184c 100755 --- a/core/lib/Thelia/Core/Template/Loop/Content.php +++ b/core/lib/Thelia/Core/Template/Loop/Content.php @@ -65,6 +65,7 @@ class Content extends BaseLoop Argument::createBooleanTypeArgument('current_folder'), Argument::createIntTypeArgument('depth', 1), Argument::createBooleanOrBothTypeArgument('visible', 1), + Argument::createIntTypeArgument('lang'), new Argument( 'order', new TypeCollection( @@ -87,8 +88,12 @@ class Content extends BaseLoop { $search = ContentQuery::create(); + $backendContext = $this->getBackend_context(); + + $lang = $this->getLang(); + /* manage translations */ - ModelCriteriaTools::getI18n($search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale()); + ModelCriteriaTools::getI18n($backendContext, $lang, $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale()); $id = $this->getId(); @@ -215,11 +220,13 @@ class Content extends BaseLoop $loopResultRow = new LoopResultRow(); $loopResultRow->set("ID", $content->getId()) + ->set("IS_TRANSLATED",$content->getVirtualColumn('IS_TRANSLATED')) ->set("TITLE",$content->getVirtualColumn('i18n_TITLE')) ->set("CHAPO", $content->getVirtualColumn('i18n_CHAPO')) ->set("DESCRIPTION", $content->getVirtualColumn('i18n_DESCRIPTION')) ->set("POSTSCRIPTUM", $content->getVirtualColumn('i18n_POSTSCRIPTUM')) ->set("POSITION", $content->getPosition()) + ->set("URL", $content->getUrl()) ; $loopResult->addRow($loopResultRow); diff --git a/core/lib/Thelia/Core/Template/Loop/Country.php b/core/lib/Thelia/Core/Template/Loop/Country.php index d25951fb8..c6f7d16de 100755 --- a/core/lib/Thelia/Core/Template/Loop/Country.php +++ b/core/lib/Thelia/Core/Template/Loop/Country.php @@ -56,7 +56,8 @@ class Country extends BaseLoop Argument::createIntListTypeArgument('id'), Argument::createIntListTypeArgument('area'), Argument::createBooleanTypeArgument('with_area'), - Argument::createIntListTypeArgument('exclude') + Argument::createIntListTypeArgument('exclude'), + Argument::createIntTypeArgument('lang') ); } @@ -69,8 +70,12 @@ class Country extends BaseLoop { $search = CountryQuery::create(); + $backendContext = $this->getBackend_context(); + + $lang = $this->getLang(); + /* manage translations */ - ModelCriteriaTools::getI18n($search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale()); + ModelCriteriaTools::getI18n($backendContext, $lang, $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale()); $id = $this->getId(); @@ -108,6 +113,7 @@ class Country extends BaseLoop foreach ($countries as $country) { $loopResultRow = new LoopResultRow(); $loopResultRow->set("ID", $country->getId()) + ->set("IS_TRANSLATED",$country->getVirtualColumn('IS_TRANSLATED')) ->set("TITLE",$country->getVirtualColumn('i18n_TITLE')) ->set("CHAPO", $country->getVirtualColumn('i18n_CHAPO')) ->set("DESCRIPTION", $country->getVirtualColumn('i18n_DESCRIPTION')) diff --git a/core/lib/Thelia/Core/Template/Loop/Currency.php b/core/lib/Thelia/Core/Template/Loop/Currency.php index 08eacca08..d833ff8ae 100755 --- a/core/lib/Thelia/Core/Template/Loop/Currency.php +++ b/core/lib/Thelia/Core/Template/Loop/Currency.php @@ -55,7 +55,8 @@ class Currency extends BaseLoop return new ArgumentCollection( Argument::createIntListTypeArgument('id'), Argument::createIntListTypeArgument('exclude'), - Argument::createBooleanTypeArgument('default_only', false) + Argument::createBooleanTypeArgument('default_only', false), + Argument::createIntTypeArgument('lang') ); } @@ -68,8 +69,12 @@ class Currency extends BaseLoop { $search = CurrencyQuery::create(); + $backendContext = $this->getBackend_context(); + + $lang = $this->getLang(); + /* manage translations */ - ModelCriteriaTools::getI18n($search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale(), array('NAME')); + ModelCriteriaTools::getI18n($backendContext, $lang, $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale(), array('NAME')); $id = $this->getId(); @@ -99,8 +104,10 @@ class Currency extends BaseLoop foreach ($currencies as $currency) { $loopResultRow = new LoopResultRow(); $loopResultRow->set("ID", $currency->getId()) + ->set("IS_TRANSLATED",$currency->getVirtualColumn('IS_TRANSLATED')) ->set("NAME",$currency->getVirtualColumn('i18n_NAME')) ->set("ISOCODE", $currency->getCode()) + ->set("SYMBOL", $currency->getSymbol()) ->set("RATE", $currency->getRate()) ->set("IS_DEFAULT", $currency->getByDefault()); diff --git a/core/lib/Thelia/Core/Template/Loop/Feature.php b/core/lib/Thelia/Core/Template/Loop/Feature.php index 0693a303a..85d037080 100755 --- a/core/lib/Thelia/Core/Template/Loop/Feature.php +++ b/core/lib/Thelia/Core/Template/Loop/Feature.php @@ -64,6 +64,7 @@ class Feature extends BaseLoop Argument::createIntListTypeArgument('category'), Argument::createBooleanOrBothTypeArgument('visible', 1), Argument::createIntListTypeArgument('exclude'), + Argument::createIntTypeArgument('lang'), new Argument( 'order', new TypeCollection( @@ -83,8 +84,12 @@ class Feature extends BaseLoop { $search = FeatureQuery::create(); + $backendContext = $this->getBackend_context(); + + $lang = $this->getLang(); + /* manage translations */ - ModelCriteriaTools::getI18n($search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale()); + ModelCriteriaTools::getI18n($backendContext, $lang, $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale()); $id = $this->getId(); @@ -149,6 +154,7 @@ class Feature extends BaseLoop foreach ($features as $feature) { $loopResultRow = new LoopResultRow(); $loopResultRow->set("ID", $feature->getId()) + ->set("IS_TRANSLATED",$feature->getVirtualColumn('IS_TRANSLATED')) ->set("TITLE",$feature->getVirtualColumn('i18n_TITLE')) ->set("CHAPO", $feature->getVirtualColumn('i18n_CHAPO')) ->set("DESCRIPTION", $feature->getVirtualColumn('i18n_DESCRIPTION')) diff --git a/core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php b/core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php index 272bb5211..ce6f8767a 100755 --- a/core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php +++ b/core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php @@ -57,6 +57,7 @@ class FeatureAvailability extends BaseLoop Argument::createIntListTypeArgument('id'), Argument::createIntListTypeArgument('feature'), Argument::createIntListTypeArgument('exclude'), + Argument::createIntTypeArgument('lang'), new Argument( 'order', new TypeCollection( @@ -76,8 +77,12 @@ class FeatureAvailability extends BaseLoop { $search = FeatureAvQuery::create(); + $backendContext = $this->getBackend_context(); + + $lang = $this->getLang(); + /* manage translations */ - ModelCriteriaTools::getI18n($search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale()); + ModelCriteriaTools::getI18n($backendContext, $lang, $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale()); $id = $this->getId(); @@ -124,6 +129,7 @@ class FeatureAvailability extends BaseLoop foreach ($featuresAv as $featureAv) { $loopResultRow = new LoopResultRow(); $loopResultRow->set("ID", $featureAv->getId()) + ->set("IS_TRANSLATED",$featureAv->getVirtualColumn('IS_TRANSLATED')) ->set("TITLE",$featureAv->getVirtualColumn('i18n_TITLE')) ->set("CHAPO", $featureAv->getVirtualColumn('i18n_CHAPO')) ->set("DESCRIPTION", $featureAv->getVirtualColumn('i18n_DESCRIPTION')) diff --git a/core/lib/Thelia/Core/Template/Loop/FeatureValue.php b/core/lib/Thelia/Core/Template/Loop/FeatureValue.php index 71070e25f..8a29d7c74 100755 --- a/core/lib/Thelia/Core/Template/Loop/FeatureValue.php +++ b/core/lib/Thelia/Core/Template/Loop/FeatureValue.php @@ -84,7 +84,7 @@ class FeatureValue extends BaseLoop $search = FeatureProductQuery::create(); /* manage featureAv translations */ - ModelCriteriaTools::getI18n( + ModelCriteriaTools::getFrontEndI18n( $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale(), diff --git a/core/lib/Thelia/Core/Template/Loop/Folder.php b/core/lib/Thelia/Core/Template/Loop/Folder.php index 7062a55b4..c95b0dc42 100755 --- a/core/lib/Thelia/Core/Template/Loop/Folder.php +++ b/core/lib/Thelia/Core/Template/Loop/Folder.php @@ -59,6 +59,7 @@ class Folder extends BaseLoop Argument::createBooleanTypeArgument('current'), Argument::createBooleanTypeArgument('not_empty', 0), Argument::createBooleanOrBothTypeArgument('visible', 1), + Argument::createIntTypeArgument('lang'), new Argument( 'order', new TypeCollection( @@ -79,8 +80,12 @@ class Folder extends BaseLoop { $search = FolderQuery::create(); + $backendContext = $this->getBackend_context(); + + $lang = $this->getLang(); + /* manage translations */ - ModelCriteriaTools::getI18n($search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale()); + ModelCriteriaTools::getI18n($backendContext, $lang, $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale()); $id = $this->getId(); @@ -157,11 +162,13 @@ class Folder extends BaseLoop $loopResultRow ->set("ID", $folder->getId()) + ->set("IS_TRANSLATED",$folder->getVirtualColumn('IS_TRANSLATED')) ->set("TITLE",$folder->getVirtualColumn('i18n_TITLE')) ->set("CHAPO", $folder->getVirtualColumn('i18n_CHAPO')) ->set("DESCRIPTION", $folder->getVirtualColumn('i18n_DESCRIPTION')) ->set("POSTSCRIPTUM", $folder->getVirtualColumn('i18n_POSTSCRIPTUM')) ->set("PARENT", $folder->getParent()) + ->set("URL", $folder->getUrl()) ->set("CONTENT_COUNT", $folder->countChild()) ->set("VISIBLE", $folder->getVisible() ? "1" : "0") ->set("POSITION", $folder->getPosition()) diff --git a/core/lib/Thelia/Core/Template/Loop/Product.php b/core/lib/Thelia/Core/Template/Loop/Product.php index 9c22a4987..10112ef28 100755 --- a/core/lib/Thelia/Core/Template/Loop/Product.php +++ b/core/lib/Thelia/Core/Template/Loop/Product.php @@ -85,6 +85,7 @@ class Product extends BaseLoop Argument::createBooleanTypeArgument('current_category'), Argument::createIntTypeArgument('depth', 1), Argument::createBooleanOrBothTypeArgument('visible', 1), + Argument::createIntTypeArgument('lang'), new Argument( 'order', new TypeCollection( @@ -137,8 +138,12 @@ class Product extends BaseLoop { $search = ProductQuery::create(); + $backendContext = $this->getBackend_context(); + + $lang = $this->getLang(); + /* manage translations */ - ModelCriteriaTools::getI18n($search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale()); + ModelCriteriaTools::getI18n($backendContext, $lang, $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale()); $attributeNonStrictMatch = $this->getAttribute_non_strict_match(); $isPSELeftJoinList = array(); @@ -510,10 +515,12 @@ class Product extends BaseLoop $loopResultRow->set("ID", $product->getId()) ->set("REF",$product->getRef()) + ->set("IS_TRANSLATED",$product->getVirtualColumn('IS_TRANSLATED')) ->set("TITLE",$product->getVirtualColumn('i18n_TITLE')) ->set("CHAPO", $product->getVirtualColumn('i18n_CHAPO')) ->set("DESCRIPTION", $product->getVirtualColumn('i18n_DESCRIPTION')) ->set("POSTSCRIPTUM", $product->getVirtualColumn('i18n_POSTSCRIPTUM')) + ->set("URL", $product->getUrl()) ->set("BEST_PRICE", $product->getVirtualColumn('real_lowest_price')) ->set("IS_PROMO", $product->getVirtualColumn('main_product_is_promo')) ->set("IS_NEW", $product->getVirtualColumn('main_product_is_new')) diff --git a/core/lib/Thelia/Core/Template/Loop/Title.php b/core/lib/Thelia/Core/Template/Loop/Title.php index 843e29334..caa5e7d87 100755 --- a/core/lib/Thelia/Core/Template/Loop/Title.php +++ b/core/lib/Thelia/Core/Template/Loop/Title.php @@ -53,7 +53,8 @@ class Title extends BaseLoop protected function getArgDefinitions() { return new ArgumentCollection( - Argument::createIntListTypeArgument('id') + Argument::createIntListTypeArgument('id'), + Argument::createIntTypeArgument('lang') ); } @@ -66,8 +67,12 @@ class Title extends BaseLoop { $search = CustomerTitleQuery::create(); + $backendContext = $this->getBackend_context(); + + $lang = $this->getLang(); + /* manage translations */ - ModelCriteriaTools::getI18n($search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale(), array('SHORT', 'LONG')); + ModelCriteriaTools::getI18n($backendContext, $lang, $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale(), array('SHORT', 'LONG')); $id = $this->getId(); @@ -85,6 +90,7 @@ class Title extends BaseLoop foreach ($titles as $title) { $loopResultRow = new LoopResultRow(); $loopResultRow->set("ID", $title->getId()) + ->set("IS_TRANSLATED",$title->getVirtualColumn('IS_TRANSLATED')) ->set("DEFAULT", $title->getByDefault()) ->set("SHORT", $title->getVirtualColumn('i18n_SHORT')) ->set("LONG", $title->getVirtualColumn('i18n_LONG')); diff --git a/core/lib/Thelia/Model/Category.php b/core/lib/Thelia/Model/Category.php index a2ad5e52a..88e7cfc10 100755 --- a/core/lib/Thelia/Model/Category.php +++ b/core/lib/Thelia/Model/Category.php @@ -5,7 +5,8 @@ namespace Thelia\Model; use Thelia\Model\Base\Category as BaseCategory; use Propel\Runtime\ActiveQuery\Criteria; -class Category extends BaseCategory { +class Category extends BaseCategory +{ /** * @return int number of child for the current category */ diff --git a/core/lib/Thelia/Model/Content.php b/core/lib/Thelia/Model/Content.php index 19b76bba2..3b5af9ede 100755 --- a/core/lib/Thelia/Model/Content.php +++ b/core/lib/Thelia/Model/Content.php @@ -4,6 +4,10 @@ namespace Thelia\Model; use Thelia\Model\Base\Content as BaseContent; -class Content extends BaseContent { +class Content extends BaseContent +{ + public function getUrl() + { + } } diff --git a/core/lib/Thelia/Model/Folder.php b/core/lib/Thelia/Model/Folder.php index a19ab6796..1179f6e72 100755 --- a/core/lib/Thelia/Model/Folder.php +++ b/core/lib/Thelia/Model/Folder.php @@ -14,6 +14,11 @@ class Folder extends BaseFolder return FolderQuery::countChild($this->getId()); } + public function getUrl() + { + + } + /** * * count all products for current category and sub categories diff --git a/core/lib/Thelia/Model/Product.php b/core/lib/Thelia/Model/Product.php index ca26317e0..ae693e0aa 100755 --- a/core/lib/Thelia/Model/Product.php +++ b/core/lib/Thelia/Model/Product.php @@ -5,5 +5,10 @@ namespace Thelia\Model; use Thelia\Model\Base\Product as BaseProduct; use Thelia\Model\ProductSaleElements; -class Product extends BaseProduct { +class Product extends BaseProduct +{ + public function getUrl() + { + + } } diff --git a/core/lib/Thelia/Model/Tools/ModelCriteriaTools.php b/core/lib/Thelia/Model/Tools/ModelCriteriaTools.php index fd04ef3d9..e9323ebfa 100755 --- a/core/lib/Thelia/Model/Tools/ModelCriteriaTools.php +++ b/core/lib/Thelia/Model/Tools/ModelCriteriaTools.php @@ -23,7 +23,7 @@ class ModelCriteriaTools * @param null $foreignTable * @param string $foreignKey */ - public static function getI18n(ModelCriteria &$search, $defaultLangWithoutTranslation, $askedLocale, $columns = array('TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM'), $foreignTable = null, $foreignKey = 'ID') + public static function getFrontEndI18n(ModelCriteria &$search, $defaultLangWithoutTranslation, $askedLocale, $columns = array('TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM'), $foreignTable = null, $foreignKey = 'ID') { if($foreignTable === null) { $foreignTable = $search->getTableMap()->getName(); @@ -43,6 +43,8 @@ class ModelCriteriaTools $search->addJoinObject($askedLocaleJoin, $askedLocaleI18nAlias) ->addJoinCondition($askedLocaleI18nAlias ,'`' . $askedLocaleI18nAlias . '`.LOCALE = ?', $askedLocale, null, \PDO::PARAM_STR); + $search->withColumn('NOT ISNULL(`' . $askedLocaleI18nAlias . '`.`ID`)', $aliasPrefix . 'IS_TRANSLATED'); + foreach($columns as $column) { $search->withColumn('`' . $askedLocaleI18nAlias . '`.`' . $column . '`', $aliasPrefix . 'i18n_' . $column); } @@ -63,6 +65,8 @@ class ModelCriteriaTools $search->addJoinObject($askedLocaleJoin, $askedLocaleI18nAlias) ->addJoinCondition($askedLocaleI18nAlias ,'`' . $askedLocaleI18nAlias . '`.LOCALE = ?', $askedLocale, null, \PDO::PARAM_STR); + $search->withColumn('NOT ISNULL(`' . $askedLocaleI18nAlias . '`.`ID`)', $aliasPrefix . 'IS_TRANSLATED'); + $search->where('NOT ISNULL(`' . $askedLocaleI18nAlias . '`.ID)')->_or()->where('NOT ISNULL(`' . $defaultLocaleI18nAlias . '`.ID)'); foreach($columns as $column) { @@ -70,4 +74,45 @@ class ModelCriteriaTools } } } + + public static function getBackEndI18n(ModelCriteria &$search, $askedLocale, $columns = array('TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM'), $foreignTable = null, $foreignKey = 'ID') + { + if($foreignTable === null) { + $foreignTable = $search->getTableMap()->getName(); + $aliasPrefix = ''; + } else { + $aliasPrefix = $foreignTable . '_'; + } + + $askedLocaleI18nAlias = 'asked_locale_i18n'; + + $askedLocaleJoin = new Join(); + $askedLocaleJoin->addExplicitCondition($search->getTableMap()->getName(), $foreignKey, null, $foreignTable . '_i18n', 'ID', $askedLocaleI18nAlias); + $askedLocaleJoin->setJoinType(Criteria::LEFT_JOIN); + + $search->addJoinObject($askedLocaleJoin, $askedLocaleI18nAlias) + ->addJoinCondition($askedLocaleI18nAlias ,'`' . $askedLocaleI18nAlias . '`.LOCALE = ?', $askedLocale, null, \PDO::PARAM_STR); + + $search->withColumn('NOT ISNULL(`' . $askedLocaleI18nAlias . '`.`ID`)', $aliasPrefix . 'IS_TRANSLATED'); + + foreach($columns as $column) { + $search->withColumn('`' . $askedLocaleI18nAlias . '`.`' . $column . '`', $aliasPrefix . 'i18n_' . $column); + } + } + + public static function getI18n($backendContext, $lang, ModelCriteria &$search, $defaultLangWithoutTranslation, $currentLocale, $columns = array('TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM'), $foreignTable = null, $foreignKey = 'ID') + { + if($lang !== null) { + $localeSearch = LangQuery::create()->findOneById($lang); + if($localeSearch === null) { + throw new \InvalidArgumentException('Incorrect lang argument given in attribute loop'); + } + } + + if($backendContext) { + self::getBackEndI18n($search, $lang === null ? $currentLocale : $localeSearch->getLocale(), $columns, $foreignTable, $foreignKey); + } else { + self::getFrontEndI18n($search, $defaultLangWithoutTranslation, $lang === null ? $currentLocale : $localeSearch->getLocale(), $columns, $foreignTable, $foreignKey); + } + } } diff --git a/install/faker_100categories_1000products_4locales.php b/install/faker_100categories_1000products_4locales.php new file mode 100755 index 000000000..ce18aa5c7 --- /dev/null +++ b/install/faker_100categories_1000products_4locales.php @@ -0,0 +1,173 @@ +beginTransaction(); + +$currency = \Thelia\Model\CurrencyQuery::create()->filterByCode('EUR')->findOne(); + +try { + $stmt = $con->prepare("SET foreign_key_checks = 0"); + $stmt->execute(); + + $productAssociatedContent = Thelia\Model\ProductAssociatedContentQuery::create() + ->find(); + $productAssociatedContent->delete(); + + $categoryAssociatedContent = Thelia\Model\CategoryAssociatedContentQuery::create() + ->find(); + $categoryAssociatedContent->delete(); + + $attributeCategory = Thelia\Model\AttributeCategoryQuery::create() + ->find(); + $attributeCategory->delete(); + + $featureCategory = Thelia\Model\FeatureCategoryQuery::create() + ->find(); + $featureCategory->delete(); + + $featureProduct = Thelia\Model\FeatureProductQuery::create() + ->find(); + $featureProduct->delete(); + + $attributeCombination = Thelia\Model\AttributeCombinationQuery::create() + ->find(); + $attributeCombination->delete(); + + $feature = Thelia\Model\FeatureQuery::create() + ->find(); + $feature->delete(); + + $feature = Thelia\Model\FeatureI18nQuery::create() + ->find(); + $feature->delete(); + + $featureAv = Thelia\Model\FeatureAvQuery::create() + ->find(); + $featureAv->delete(); + + $featureAv = Thelia\Model\FeatureAvI18nQuery::create() + ->find(); + $featureAv->delete(); + + $attribute = Thelia\Model\AttributeQuery::create() + ->find(); + $attribute->delete(); + + $attribute = Thelia\Model\AttributeI18nQuery::create() + ->find(); + $attribute->delete(); + + $attributeAv = Thelia\Model\AttributeAvQuery::create() + ->find(); + $attributeAv->delete(); + + $attributeAv = Thelia\Model\AttributeAvI18nQuery::create() + ->find(); + $attributeAv->delete(); + + $category = Thelia\Model\CategoryQuery::create() + ->find(); + $category->delete(); + + $category = Thelia\Model\CategoryI18nQuery::create() + ->find(); + $category->delete(); + + $product = Thelia\Model\ProductQuery::create() + ->find(); + $product->delete(); + + $product = Thelia\Model\ProductI18nQuery::create() + ->find(); + $product->delete(); + + $customer = Thelia\Model\CustomerQuery::create() + ->find(); + $customer->delete(); + + $folder = Thelia\Model\FolderQuery::create() + ->find(); + $folder->delete(); + + $folder = Thelia\Model\FolderI18nQuery::create() + ->find(); + $folder->delete(); + + $content = Thelia\Model\ContentQuery::create() + ->find(); + $content->delete(); + + $content = Thelia\Model\ContentI18nQuery::create() + ->find(); + $content->delete(); + + $accessory = Thelia\Model\AccessoryQuery::create() + ->find(); + $accessory->delete(); + + $stock = \Thelia\Model\ProductSaleElementsQuery::create() + ->find(); + $stock->delete(); + + $productPrice = \Thelia\Model\ProductPriceQuery::create() + ->find(); + $productPrice->delete(); + + $stmt = $con->prepare("SET foreign_key_checks = 1"); + $stmt->execute(); + + //categories and products + for($i=0; $i<100; $i++) { + $category = new Thelia\Model\Category(); + $category->setParent(0); + $category->setVisible(1); + $category->setPosition($i); + setI18n($faker, $category); + + $category->save(); + + for($j=0; $j<10; $j++) { + $product = new Thelia\Model\Product(); + $product->setRef($category->getId() . '_' . $j . '_' . $faker->randomNumber(8)); + $product->addCategory($category); + $product->setVisible(1); + $product->setPosition($j); + setI18n($faker, $product); + + $product->save(); + } + } + + $con->commit(); +} catch (Exception $e) { + echo "error : ".$e->getMessage()."\n"; + $con->rollBack(); +} + +function setI18n($faker, &$object) +{ + $localeList = array('fr_FR', 'en_EN', 'es_ES', 'it_IT'); + + $title = $faker->text(20); + $description = $faker->text(50); + + foreach($localeList as $locale) { + $object->setLocale($locale); + + $object->setTitle($locale . ' : ' . $title); + $object->setDescription($locale . ' : ' . $description); + } +} + diff --git a/install/insert.sql b/install/insert.sql index 58fc9a70f..f5e5d6fdb 100755 --- a/install/insert.sql +++ b/install/insert.sql @@ -13,8 +13,6 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat ('images_library_path', 'local/media/images', 1, 0, NOW(), NOW()), ('image_cache_dir_from_web_root', 'cache/images', 1, 0, NOW(), NOW()); - - INSERT INTO `module` (`code`, `type`, `activate`, `position`, `created_at`, `updated_at`) VALUES ('test', '1', '1', '1', NOW(), NOW()); INSERT INTO `customer_title`(`id`, `by_default`, `position`, `created_at`, `updated_at`) VALUES @@ -23,12 +21,12 @@ INSERT INTO `customer_title`(`id`, `by_default`, `position`, `created_at`, `upda (3, 0, 3, NOW(), NOW()); INSERT INTO `customer_title_i18n` (`id`, `locale`, `short`, `long`) VALUES -(1, 'en_US', 'Mr', 'Mister'), -(1, 'fr_FR', 'M', 'Monsieur'), -(2, 'en_US', 'Mrs', 'Misses'), -(2, 'fr_FR', 'Mme', 'Madame'), -(3, 'en_US', 'Miss', 'Miss'), -(3, 'fr_FR', 'Mlle', 'Madamemoiselle'); +(1, 'fr_FR', 'Mr', 'Monsieur'), +(1, 'en_EN', 'M', 'Mister'), +(2, 'fr_FR', 'Mrs', 'Madame'), +(2, 'en_EN', 'Mme', 'Misses'), +(3, 'fr_FR', 'Miss', 'Madamemoiselle'), +(3, 'en_EN', 'Mlle', 'Miss'); INSERT INTO `currency` (`id` ,`code` ,`symbol` ,`rate`, `position` ,`by_default` ,`created_at` ,`updated_at`) VALUES @@ -38,9 +36,12 @@ VALUES INSERT INTO `currency_i18n` (`id` ,`locale` ,`name`) VALUES -(1, 'en_US', 'euro'), -(2, 'en_US', 'dollar'), -(3, 'en_US', 'pound'); +(1, 'fr_FR', 'euro'), +(1, 'en_EN', 'euro'), +(2, 'fr_FR', 'dollar'), +(2, 'en_EN', 'dollar'), +(3, 'fr_FR', 'livre'); +(3, 'en_EN', 'pound'); INSERT INTO `country` (`id`, `area_id`, `isocode`, `isoalpha2`, `isoalpha3`, `created_at`, `updated_at`) VALUES @@ -310,795 +311,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_US', 'Afghanistan', '', '', ''), +(1, 'en_EN', 'Afghanistan', '', '', ''), (1, 'es_ES', 'Afganistán', '', '', ''), (1, 'fr_FR', 'Afghanistan', '', '', ''), -(2, 'en_US', 'South Africa', '', '', ''), +(2, 'en_EN', 'South Africa', '', '', ''), (2, 'es_ES', 'Sudáfrica', '', '', ''), (2, 'fr_FR', 'Afrique du Sud', '', '', ''), -(3, 'en_US', 'Albania', '', '', ''), +(3, 'en_EN', 'Albania', '', '', ''), (3, 'es_ES', 'Albania', '', '', ''), (3, 'fr_FR', 'Albanie', '', '', ''), -(4, 'en_US', 'Algeria', '', '', ''), +(4, 'en_EN', 'Algeria', '', '', ''), (4, 'es_ES', 'Argelia', '', '', ''), (4, 'fr_FR', 'Algérie', '', '', ''), -(5, 'en_US', 'Germany', '', '', ''), +(5, 'en_EN', 'Germany', '', '', ''), (5, 'es_ES', 'Alemania', '', '', ''), (5, 'fr_FR', 'Allemagne', '', '', ''), -(6, 'en_US', 'Andorra', '', '', ''), +(6, 'en_EN', 'Andorra', '', '', ''), (6, 'es_ES', 'Andorra', '', '', ''), (6, 'fr_FR', 'Andorre', '', '', ''), -(7, 'en_US', 'Angola', '', '', ''), +(7, 'en_EN', 'Angola', '', '', ''), (7, 'es_ES', 'Angola', '', '', ''), (7, 'fr_FR', 'Angola', '', '', ''), -(8, 'en_US', 'Antigua and Barbuda', '', '', ''), +(8, 'en_EN', 'Antigua and Barbuda', '', '', ''), (8, 'es_ES', 'Antigua y Barbuda', '', '', ''), (8, 'fr_FR', 'Antigua-et-Barbuda', '', '', ''), -(9, 'en_US', 'Saudi Arabia', '', '', ''), +(9, 'en_EN', 'Saudi Arabia', '', '', ''), (9, 'es_ES', 'Arabia Saudita', '', '', ''), (9, 'fr_FR', 'Arabie saoudite', '', '', ''), -(10, 'en_US', 'Argentina', '', '', ''), +(10, 'en_EN', 'Argentina', '', '', ''), (10, 'es_ES', 'Argentina', '', '', ''), (10, 'fr_FR', 'Argentine', '', '', ''), -(11, 'en_US', 'Armenia', '', '', ''), +(11, 'en_EN', 'Armenia', '', '', ''), (11, 'es_ES', 'Armenia', '', '', ''), (11, 'fr_FR', 'Arménie', '', '', ''), -(12, 'en_US', 'Australia', '', '', ''), +(12, 'en_EN', 'Australia', '', '', ''), (12, 'es_ES', 'Australia', '', '', ''), (12, 'fr_FR', 'Australie', '', '', ''), -(13, 'en_US', 'Austria', '', '', ''), +(13, 'en_EN', 'Austria', '', '', ''), (13, 'es_ES', 'Austria', '', '', ''), (13, 'fr_FR', 'Autriche', '', '', ''), -(14, 'en_US', 'Azerbaijan', '', '', ''), +(14, 'en_EN', 'Azerbaijan', '', '', ''), (14, 'es_ES', 'Azerbaiyán', '', '', ''), (14, 'fr_FR', 'Azerbaïdjan', '', '', ''), -(15, 'en_US', 'Bahamas', '', '', ''), +(15, 'en_EN', 'Bahamas', '', '', ''), (15, 'es_ES', 'Bahamas', '', '', ''), (15, 'fr_FR', 'Bahamas', '', '', ''), -(16, 'en_US', 'Bahrain', '', '', ''), +(16, 'en_EN', 'Bahrain', '', '', ''), (16, 'es_ES', 'Bahrein', '', '', ''), (16, 'fr_FR', 'Bahreïn', '', '', ''), -(17, 'en_US', 'Bangladesh', '', '', ''), +(17, 'en_EN', 'Bangladesh', '', '', ''), (17, 'es_ES', 'Bangladesh', '', '', ''), (17, 'fr_FR', 'Bangladesh', '', '', ''), -(18, 'en_US', 'Barbados', '', '', ''), +(18, 'en_EN', 'Barbados', '', '', ''), (18, 'es_ES', 'Barbados', '', '', ''), (18, 'fr_FR', 'Barbade', '', '', ''), -(19, 'en_US', 'Belarus', '', '', ''), +(19, 'en_EN', 'Belarus', '', '', ''), (19, 'es_ES', 'Belarús', '', '', ''), (19, 'fr_FR', 'Belau', '', '', ''), -(20, 'en_US', 'Belgium', '', '', ''), +(20, 'en_EN', 'Belgium', '', '', ''), (20, 'es_ES', 'Bélgica', '', '', ''), (20, 'fr_FR', 'Belgique', '', '', ''), -(21, 'en_US', 'Belize', '', '', ''), +(21, 'en_EN', 'Belize', '', '', ''), (21, 'es_ES', 'Belice', '', '', ''), (21, 'fr_FR', 'Belize', '', '', ''), -(22, 'en_US', 'Benin', '', '', ''), +(22, 'en_EN', 'Benin', '', '', ''), (22, 'es_ES', 'Benin', '', '', ''), (22, 'fr_FR', 'Bénin', '', '', ''), -(23, 'en_US', 'Bhutan', '', '', ''), +(23, 'en_EN', 'Bhutan', '', '', ''), (23, 'es_ES', 'Bhután', '', '', ''), (23, 'fr_FR', 'Bhoutan', '', '', ''), -(24, 'en_US', 'Bielorussia', '', '', ''), +(24, 'en_EN', 'Bielorussia', '', '', ''), (24, 'es_ES', 'Bielorusia', '', '', ''), (24, 'fr_FR', 'Biélorussie', '', '', ''), -(25, 'en_US', 'Burma', '', '', ''), +(25, 'en_EN', 'Burma', '', '', ''), (25, 'es_ES', 'Birmania', '', '', ''), (25, 'fr_FR', 'Birmanie', '', '', ''), -(26, 'en_US', 'Bolivia', '', '', ''), +(26, 'en_EN', 'Bolivia', '', '', ''), (26, 'es_ES', 'Bolivia', '', '', ''), (26, 'fr_FR', 'Bolivie', '', '', ''), -(27, 'en_US', 'Bosnia and Herzegovina', '', '', ''), +(27, 'en_EN', 'Bosnia and Herzegovina', '', '', ''), (27, 'es_ES', 'Bosnia y Herzegovina', '', '', ''), (27, 'fr_FR', 'Bosnie-Herzégovine', '', '', ''), -(28, 'en_US', 'Botswana', '', '', ''), +(28, 'en_EN', 'Botswana', '', '', ''), (28, 'es_ES', 'Botswana', '', '', ''), (28, 'fr_FR', 'Botswana', '', '', ''), -(29, 'en_US', 'Brazil', '', '', ''), +(29, 'en_EN', 'Brazil', '', '', ''), (29, 'es_ES', 'Brasil', '', '', ''), (29, 'fr_FR', 'Brésil', '', '', ''), -(30, 'en_US', 'Brunei', '', '', ''), +(30, 'en_EN', 'Brunei', '', '', ''), (30, 'es_ES', 'Brunei', '', '', ''), (30, 'fr_FR', 'Brunei', '', '', ''), -(31, 'en_US', 'Bulgaria', '', '', ''), +(31, 'en_EN', 'Bulgaria', '', '', ''), (31, 'es_ES', 'Bulgaria', '', '', ''), (31, 'fr_FR', 'Bulgarie', '', '', ''), -(32, 'en_US', 'Burkina', '', '', ''), +(32, 'en_EN', 'Burkina', '', '', ''), (32, 'es_ES', 'Burkina', '', '', ''), (32, 'fr_FR', 'Burkina', '', '', ''), -(33, 'en_US', 'Burundi', '', '', ''), +(33, 'en_EN', 'Burundi', '', '', ''), (33, 'es_ES', 'Burundi', '', '', ''), (33, 'fr_FR', 'Burundi', '', '', ''), -(34, 'en_US', 'Cambodia', '', '', ''), +(34, 'en_EN', 'Cambodia', '', '', ''), (34, 'es_ES', 'Camboya', '', '', ''), (34, 'fr_FR', 'Cambodge', '', '', ''), -(35, 'en_US', 'Cameroon', '', '', ''), +(35, 'en_EN', 'Cameroon', '', '', ''), (35, 'es_ES', 'Camerún', '', '', ''), (35, 'fr_FR', 'Cameroun', '', '', ''), -(37, 'en_US', 'Cape Verde', '', '', ''), +(37, 'en_EN', 'Cape Verde', '', '', ''), (37, 'es_ES', 'Cabo Verde', '', '', ''), (37, 'fr_FR', 'Cap-Vert', '', '', ''), -(38, 'en_US', 'Chile', '', '', ''), +(38, 'en_EN', 'Chile', '', '', ''), (38, 'es_ES', 'Chile', '', '', ''), (38, 'fr_FR', 'Chili', '', '', ''), -(39, 'en_US', 'China', '', '', ''), +(39, 'en_EN', 'China', '', '', ''), (39, 'es_ES', 'China', '', '', ''), (39, 'fr_FR', 'Chine', '', '', ''), -(40, 'en_US', 'Cyprus', '', '', ''), +(40, 'en_EN', 'Cyprus', '', '', ''), (40, 'es_ES', 'Chipre', '', '', ''), (40, 'fr_FR', 'Chypre', '', '', ''), -(41, 'en_US', 'Colombia', '', '', ''), +(41, 'en_EN', 'Colombia', '', '', ''), (41, 'es_ES', 'Colombia', '', '', ''), (41, 'fr_FR', 'Colombie', '', '', ''), -(42, 'en_US', 'Comoros', '', '', ''), +(42, 'en_EN', 'Comoros', '', '', ''), (42, 'es_ES', 'Comoras', '', '', ''), (42, 'fr_FR', 'Comores', '', '', ''), -(43, 'en_US', 'Congo', '', '', ''), +(43, 'en_EN', 'Congo', '', '', ''), (43, 'es_ES', 'Congo', '', '', ''), (43, 'fr_FR', 'Congo', '', '', ''), -(44, 'en_US', 'Cook Islands', '', '', ''), +(44, 'en_EN', 'Cook Islands', '', '', ''), (44, 'es_ES', 'Cook', '', '', ''), (44, 'fr_FR', 'Cook', '', '', ''), -(45, 'en_US', 'North Korea', '', '', ''), +(45, 'en_EN', 'North Korea', '', '', ''), (45, 'es_ES', 'Corea del Norte', '', '', ''), (45, 'fr_FR', 'Corée du Nord', '', '', ''), -(46, 'en_US', 'South Korea', '', '', ''), +(46, 'en_EN', 'South Korea', '', '', ''), (46, 'es_ES', 'Corea del Sur', '', '', ''), (46, 'fr_FR', 'Corée du Sud', '', '', ''), -(47, 'en_US', 'Costa Rica', '', '', ''), +(47, 'en_EN', 'Costa Rica', '', '', ''), (47, 'es_ES', 'Costa Rica', '', '', ''), (47, 'fr_FR', 'Costa Rica', '', '', ''), -(48, 'en_US', 'Ivory Coast', '', '', ''), +(48, 'en_EN', 'Ivory Coast', '', '', ''), (48, 'es_ES', 'Costa de Marfil', '', '', ''), (48, 'fr_FR', 'Côte dIvoire', '', '', ''), -(49, 'en_US', 'Croatia', '', '', ''), +(49, 'en_EN', 'Croatia', '', '', ''), (49, 'es_ES', 'Croacia', '', '', ''), (49, 'fr_FR', 'Croatie', '', '', ''), -(50, 'en_US', 'Cuba', '', '', ''), +(50, 'en_EN', 'Cuba', '', '', ''), (50, 'es_ES', 'Cuba', '', '', ''), (50, 'fr_FR', 'Cuba', '', '', ''), -(51, 'en_US', 'Denmark', '', '', ''), +(51, 'en_EN', 'Denmark', '', '', ''), (51, 'es_ES', 'Dinamarca', '', '', ''), (51, 'fr_FR', 'Danemark', '', '', ''), -(52, 'en_US', 'Djibouti', '', '', ''), +(52, 'en_EN', 'Djibouti', '', '', ''), (52, 'es_ES', 'Djibouti', '', '', ''), (52, 'fr_FR', 'Djibouti', '', '', ''), -(53, 'en_US', 'Dominica', '', '', ''), +(53, 'en_EN', 'Dominica', '', '', ''), (53, 'es_ES', 'Dominica', '', '', ''), (53, 'fr_FR', 'Dominique', '', '', ''), -(54, 'en_US', 'Egypt', '', '', ''), +(54, 'en_EN', 'Egypt', '', '', ''), (54, 'es_ES', 'Egipto', '', '', ''), (54, 'fr_FR', 'Égypte', '', '', ''), -(55, 'en_US', 'United Arab Emirates', '', '', ''), +(55, 'en_EN', 'United Arab Emirates', '', '', ''), (55, 'es_ES', 'Emiratos Árabes Unidos', '', '', ''), (55, 'fr_FR', 'Émirats arabes unis', '', '', ''), -(56, 'en_US', 'Ecuador', '', '', ''), +(56, 'en_EN', 'Ecuador', '', '', ''), (56, 'es_ES', 'Ecuador', '', '', ''), (56, 'fr_FR', 'Équateur', '', '', ''), -(57, 'en_US', 'Eritrea', '', '', ''), +(57, 'en_EN', 'Eritrea', '', '', ''), (57, 'es_ES', 'Eritrea', '', '', ''), (57, 'fr_FR', 'Érythrée', '', '', ''), -(58, 'en_US', 'Spain', '', '', ''), +(58, 'en_EN', 'Spain', '', '', ''), (58, 'es_ES', 'España', '', '', ''), (58, 'fr_FR', 'Espagne', '', '', ''), -(59, 'en_US', 'Estonia', '', '', ''), +(59, 'en_EN', 'Estonia', '', '', ''), (59, 'es_ES', 'Estonia', '', '', ''), (59, 'fr_FR', 'Estonie', '', '', ''), -(61, 'en_US', 'Ethiopia', '', '', ''), +(61, 'en_EN', 'Ethiopia', '', '', ''), (61, 'es_ES', 'Etiopía', '', '', ''), (61, 'fr_FR', 'Éthiopie', '', '', ''), -(62, 'en_US', 'Fiji', '', '', ''), +(62, 'en_EN', 'Fiji', '', '', ''), (62, 'es_ES', 'Fiji', '', '', ''), (62, 'fr_FR', 'Fidji', '', '', ''), -(63, 'en_US', 'Finland', '', '', ''), +(63, 'en_EN', 'Finland', '', '', ''), (63, 'es_ES', 'Finlandia', '', '', ''), (63, 'fr_FR', 'Finlande', '', '', ''), -(64, 'en_US', 'France metropolitan', '', '', ''), +(64, 'en_EN', 'France metropolitan', '', '', ''), (64, 'es_ES', 'Francia', '', '', ''), (64, 'fr_FR', 'France métropolitaine', '', '', ''), -(65, 'en_US', 'Gabon', '', '', ''), +(65, 'en_EN', 'Gabon', '', '', ''), (65, 'es_ES', 'Gabón', '', '', ''), (65, 'fr_FR', 'Gabon', '', '', ''), -(66, 'en_US', 'Gambia', '', '', ''), +(66, 'en_EN', 'Gambia', '', '', ''), (66, 'es_ES', 'Gambia', '', '', ''), (66, 'fr_FR', 'Gambie', '', '', ''), -(67, 'en_US', 'Georgia', '', '', ''), +(67, 'en_EN', 'Georgia', '', '', ''), (67, 'es_ES', 'Georgia', '', '', ''), (67, 'fr_FR', 'Géorgie', '', '', ''), -(68, 'en_US', 'Ghana', '', '', ''), +(68, 'en_EN', 'Ghana', '', '', ''), (68, 'es_ES', 'Ghana', '', '', ''), (68, 'fr_FR', 'Ghana', '', '', ''), -(69, 'en_US', 'Greece', '', '', ''), +(69, 'en_EN', 'Greece', '', '', ''), (69, 'es_ES', 'Grecia', '', '', ''), (69, 'fr_FR', 'Grèce', '', '', ''), -(70, 'en_US', 'Grenada', '', '', ''), +(70, 'en_EN', 'Grenada', '', '', ''), (70, 'es_ES', 'Granada', '', '', ''), (70, 'fr_FR', 'Grenade', '', '', ''), -(71, 'en_US', 'Guatemala', '', '', ''), +(71, 'en_EN', 'Guatemala', '', '', ''), (71, 'es_ES', 'Guatemala', '', '', ''), (71, 'fr_FR', 'Guatemala', '', '', ''), -(72, 'en_US', 'Guinea', '', '', ''), +(72, 'en_EN', 'Guinea', '', '', ''), (72, 'es_ES', 'Guinea', '', '', ''), (72, 'fr_FR', 'Guinée', '', '', ''), -(73, 'en_US', 'Guinea-Bissau', '', '', ''), +(73, 'en_EN', 'Guinea-Bissau', '', '', ''), (73, 'es_ES', 'Guinea-Bissau', '', '', ''), (73, 'fr_FR', 'Guinée-Bissao', '', '', ''), -(74, 'en_US', 'Equatorial Guinea', '', '', ''), +(74, 'en_EN', 'Equatorial Guinea', '', '', ''), (74, 'es_ES', 'Guinea Ecuatorial', '', '', ''), (74, 'fr_FR', 'Guinée équatoriale', '', '', ''), -(75, 'en_US', 'Guyana', '', '', ''), +(75, 'en_EN', 'Guyana', '', '', ''), (75, 'es_ES', 'Guyana', '', '', ''), (75, 'fr_FR', 'Guyana', '', '', ''), -(76, 'en_US', 'Haiti', '', '', ''), +(76, 'en_EN', 'Haiti', '', '', ''), (76, 'es_ES', 'Haití', '', '', ''), (76, 'fr_FR', 'Haïti', '', '', ''), -(77, 'en_US', 'Honduras', '', '', ''), +(77, 'en_EN', 'Honduras', '', '', ''), (77, 'es_ES', 'Honduras', '', '', ''), (77, 'fr_FR', 'Honduras', '', '', ''), -(78, 'en_US', 'Hungary', '', '', ''), +(78, 'en_EN', 'Hungary', '', '', ''), (78, 'es_ES', 'Hungría', '', '', ''), (78, 'fr_FR', 'Hongrie', '', '', ''), -(79, 'en_US', 'India', '', '', ''), +(79, 'en_EN', 'India', '', '', ''), (79, 'es_ES', 'India', '', '', ''), (79, 'fr_FR', 'Inde', '', '', ''), -(80, 'en_US', 'Indonesia', '', '', ''), +(80, 'en_EN', 'Indonesia', '', '', ''), (80, 'es_ES', 'Indonesia', '', '', ''), (80, 'fr_FR', 'Indonésie', '', '', ''), -(81, 'en_US', 'Iran', '', '', ''), +(81, 'en_EN', 'Iran', '', '', ''), (81, 'es_ES', 'Irán', '', '', ''), (81, 'fr_FR', 'Iran', '', '', ''), -(82, 'en_US', 'Iraq', '', '', ''), +(82, 'en_EN', 'Iraq', '', '', ''), (82, 'es_ES', 'Iraq', '', '', ''), (82, 'fr_FR', 'Iraq', '', '', ''), -(83, 'en_US', 'Ireland', '', '', ''), +(83, 'en_EN', 'Ireland', '', '', ''), (83, 'es_ES', 'Irlanda', '', '', ''), (83, 'fr_FR', 'Irlande', '', '', ''), -(84, 'en_US', 'Iceland', '', '', ''), +(84, 'en_EN', 'Iceland', '', '', ''), (84, 'es_ES', 'Islandia', '', '', ''), (84, 'fr_FR', 'Islande', '', '', ''), -(85, 'en_US', 'Israel', '', '', ''), +(85, 'en_EN', 'Israel', '', '', ''), (85, 'es_ES', 'Israel', '', '', ''), (85, 'fr_FR', 'Israël', '', '', ''), -(86, 'en_US', 'Italy', '', '', ''), +(86, 'en_EN', 'Italy', '', '', ''), (86, 'es_ES', 'Italia', '', '', ''), (86, 'fr_FR', 'Italie', '', '', ''), -(87, 'en_US', 'Jamaica', '', '', ''), +(87, 'en_EN', 'Jamaica', '', '', ''), (87, 'es_ES', 'Jamaica', '', '', ''), (87, 'fr_FR', 'Jamaïque', '', '', ''), -(88, 'en_US', 'Japan', '', '', ''), +(88, 'en_EN', 'Japan', '', '', ''), (88, 'es_ES', 'Japón', '', '', ''), (88, 'fr_FR', 'Japon', '', '', ''), -(89, 'en_US', 'Jordan', '', '', ''), +(89, 'en_EN', 'Jordan', '', '', ''), (89, 'es_ES', 'Jordania', '', '', ''), (89, 'fr_FR', 'Jordanie', '', '', ''), -(90, 'en_US', 'Kazakhstan', '', '', ''), +(90, 'en_EN', 'Kazakhstan', '', '', ''), (90, 'es_ES', 'Kazajstán', '', '', ''), (90, 'fr_FR', 'Kazakhstan', '', '', ''), -(91, 'en_US', 'Kenya', '', '', ''), +(91, 'en_EN', 'Kenya', '', '', ''), (91, 'es_ES', 'Kenia', '', '', ''), (91, 'fr_FR', 'Kenya', '', '', ''), -(92, 'en_US', 'Kyrgyzstan', '', '', ''), +(92, 'en_EN', 'Kyrgyzstan', '', '', ''), (92, 'es_ES', 'Kirguistán', '', '', ''), (92, 'fr_FR', 'Kirghizistan', '', '', ''), -(93, 'en_US', 'Kiribati', '', '', ''), +(93, 'en_EN', 'Kiribati', '', '', ''), (93, 'es_ES', 'Kiribati', '', '', ''), (93, 'fr_FR', 'Kiribati', '', '', ''), -(94, 'en_US', 'Kuwait', '', '', ''), +(94, 'en_EN', 'Kuwait', '', '', ''), (94, 'es_ES', 'Kuwait', '', '', ''), (94, 'fr_FR', 'Koweït', '', '', ''), -(95, 'en_US', 'Laos', '', '', ''), +(95, 'en_EN', 'Laos', '', '', ''), (95, 'es_ES', 'Laos', '', '', ''), (95, 'fr_FR', 'Laos', '', '', ''), -(96, 'en_US', 'Lesotho', '', '', ''), +(96, 'en_EN', 'Lesotho', '', '', ''), (96, 'es_ES', 'Lesotho', '', '', ''), (96, 'fr_FR', 'Lesotho', '', '', ''), -(97, 'en_US', 'Latvia', '', '', ''), +(97, 'en_EN', 'Latvia', '', '', ''), (97, 'es_ES', 'Letonia', '', '', ''), (97, 'fr_FR', 'Lettonie', '', '', ''), -(98, 'en_US', 'Lebanon', '', '', ''), +(98, 'en_EN', 'Lebanon', '', '', ''), (98, 'es_ES', 'Líbano', '', '', ''), (98, 'fr_FR', 'Liban', '', '', ''), -(99, 'en_US', 'Liberia', '', '', ''), +(99, 'en_EN', 'Liberia', '', '', ''), (99, 'es_ES', 'Liberia', '', '', ''), (99, 'fr_FR', 'Liberia', '', '', ''), -(100, 'en_US', 'Libya', '', '', ''), +(100, 'en_EN', 'Libya', '', '', ''), (100, 'es_ES', 'Libia', '', '', ''), (100, 'fr_FR', 'Libye', '', '', ''), -(101, 'en_US', 'Liechtenstein', '', '', ''), +(101, 'en_EN', 'Liechtenstein', '', '', ''), (101, 'es_ES', 'Liechtenstein', '', '', ''), (101, 'fr_FR', 'Liechtenstein', '', '', ''), -(102, 'en_US', 'Lithuania', '', '', ''), +(102, 'en_EN', 'Lithuania', '', '', ''), (102, 'es_ES', 'Lituania', '', '', ''), (102, 'fr_FR', 'Lituanie', '', '', ''), -(103, 'en_US', 'Luxembourg', '', '', ''), +(103, 'en_EN', 'Luxembourg', '', '', ''), (103, 'es_ES', 'Luxemburgo', '', '', ''), (103, 'fr_FR', 'Luxembourg', '', '', ''), -(104, 'en_US', 'Macedonia', '', '', ''), +(104, 'en_EN', 'Macedonia', '', '', ''), (104, 'es_ES', 'Macedonia', '', '', ''), (104, 'fr_FR', 'Macédoine', '', '', ''), -(105, 'en_US', 'Madagascar', '', '', ''), +(105, 'en_EN', 'Madagascar', '', '', ''), (105, 'es_ES', 'Madagascar', '', '', ''), (105, 'fr_FR', 'Madagascar', '', '', ''), -(106, 'en_US', 'Malaysia', '', '', ''), +(106, 'en_EN', 'Malaysia', '', '', ''), (106, 'es_ES', 'Malasia', '', '', ''), (106, 'fr_FR', 'Malaisie', '', '', ''), -(107, 'en_US', 'Malawi', '', '', ''), +(107, 'en_EN', 'Malawi', '', '', ''), (107, 'es_ES', 'Malawi', '', '', ''), (107, 'fr_FR', 'Malawi', '', '', ''), -(108, 'en_US', 'Maldives', '', '', ''), +(108, 'en_EN', 'Maldives', '', '', ''), (108, 'es_ES', 'Maldivas', '', '', ''), (108, 'fr_FR', 'Maldives', '', '', ''), -(109, 'en_US', 'Mali', '', '', ''), +(109, 'en_EN', 'Mali', '', '', ''), (109, 'es_ES', 'Malí', '', '', ''), (109, 'fr_FR', 'Mali', '', '', ''), -(110, 'en_US', 'Malta', '', '', ''), +(110, 'en_EN', 'Malta', '', '', ''), (110, 'es_ES', 'Malta', '', '', ''), (110, 'fr_FR', 'Malte', '', '', ''), -(111, 'en_US', 'Morocco', '', '', ''), +(111, 'en_EN', 'Morocco', '', '', ''), (111, 'es_ES', 'Marruecos', '', '', ''), (111, 'fr_FR', 'Maroc', '', '', ''), -(112, 'en_US', 'Marshall Islands', '', '', ''), +(112, 'en_EN', 'Marshall Islands', '', '', ''), (112, 'es_ES', 'Marshall', '', '', ''), (112, 'fr_FR', 'Marshall', '', '', ''), -(113, 'en_US', 'Mauritius', '', '', ''), +(113, 'en_EN', 'Mauritius', '', '', ''), (113, 'es_ES', 'Mauricio', '', '', ''), (113, 'fr_FR', 'Maurice', '', '', ''), -(114, 'en_US', 'Mauritania', '', '', ''), +(114, 'en_EN', 'Mauritania', '', '', ''), (114, 'es_ES', 'Mauritania', '', '', ''), (114, 'fr_FR', 'Mauritanie', '', '', ''), -(115, 'en_US', 'Mexico', '', '', ''), +(115, 'en_EN', 'Mexico', '', '', ''), (115, 'es_ES', 'Méjico', '', '', ''), (115, 'fr_FR', 'Mexique', '', '', ''), -(116, 'en_US', 'Micronesia', '', '', ''), +(116, 'en_EN', 'Micronesia', '', '', ''), (116, 'es_ES', 'Micronesia', '', '', ''), (116, 'fr_FR', 'Micronésie', '', '', ''), -(117, 'en_US', 'Moldova', '', '', ''), +(117, 'en_EN', 'Moldova', '', '', ''), (117, 'es_ES', 'Moldova', '', '', ''), (117, 'fr_FR', 'Moldavie', '', '', ''), -(118, 'en_US', 'Monaco', '', '', ''), +(118, 'en_EN', 'Monaco', '', '', ''), (118, 'es_ES', 'Mónaco', '', '', ''), (118, 'fr_FR', 'Monaco', '', '', ''), -(119, 'en_US', 'Mongolia', '', '', ''), +(119, 'en_EN', 'Mongolia', '', '', ''), (119, 'es_ES', 'Mongolia', '', '', ''), (119, 'fr_FR', 'Mongolie', '', '', ''), -(120, 'en_US', 'Mozambique', '', '', ''), +(120, 'en_EN', 'Mozambique', '', '', ''), (120, 'es_ES', 'Mozambique', '', '', ''), (120, 'fr_FR', 'Mozambique', '', '', ''), -(121, 'en_US', 'Namibia', '', '', ''), +(121, 'en_EN', 'Namibia', '', '', ''), (121, 'es_ES', 'Namibia', '', '', ''), (121, 'fr_FR', 'Namibie', '', '', ''), -(122, 'en_US', 'Nauru', '', '', ''), +(122, 'en_EN', 'Nauru', '', '', ''), (122, 'es_ES', 'Nauru', '', '', ''), (122, 'fr_FR', 'Nauru', '', '', ''), -(123, 'en_US', 'Nepal', '', '', ''), +(123, 'en_EN', 'Nepal', '', '', ''), (123, 'es_ES', 'Nepal', '', '', ''), (123, 'fr_FR', 'Népal', '', '', ''), -(124, 'en_US', 'Nicaragua', '', '', ''), +(124, 'en_EN', 'Nicaragua', '', '', ''), (124, 'es_ES', 'Nicaragua', '', '', ''), (124, 'fr_FR', 'Nicaragua', '', '', ''), -(125, 'en_US', 'Niger', '', '', ''), +(125, 'en_EN', 'Niger', '', '', ''), (125, 'es_ES', 'Níger', '', '', ''), (125, 'fr_FR', 'Niger', '', '', ''), -(126, 'en_US', 'Nigeria', '', '', ''), +(126, 'en_EN', 'Nigeria', '', '', ''), (126, 'es_ES', 'Nigeria', '', '', ''), (126, 'fr_FR', 'Nigeria', '', '', ''), -(127, 'en_US', 'Niue', '', '', ''), +(127, 'en_EN', 'Niue', '', '', ''), (127, 'es_ES', 'Niue', '', '', ''), (127, 'fr_FR', 'Niue', '', '', ''), -(128, 'en_US', 'Norway', '', '', ''), +(128, 'en_EN', 'Norway', '', '', ''), (128, 'es_ES', 'Noruega', '', '', ''), (128, 'fr_FR', 'Norvège', '', '', ''), -(129, 'en_US', 'New Zealand', '', '', ''), +(129, 'en_EN', 'New Zealand', '', '', ''), (129, 'es_ES', 'Nueva Zelandia', '', '', ''), (129, 'fr_FR', 'Nouvelle-Zélande', '', '', ''), -(130, 'en_US', 'Oman', '', '', ''), +(130, 'en_EN', 'Oman', '', '', ''), (130, 'es_ES', 'Omán', '', '', ''), (130, 'fr_FR', 'Oman', '', '', ''), -(131, 'en_US', 'Uganda', '', '', ''), +(131, 'en_EN', 'Uganda', '', '', ''), (131, 'es_ES', 'Uganda', '', '', ''), (131, 'fr_FR', 'Ouganda', '', '', ''), -(132, 'en_US', 'Uzbekistan', '', '', ''), +(132, 'en_EN', 'Uzbekistan', '', '', ''), (132, 'es_ES', 'Uzbekistán', '', '', ''), (132, 'fr_FR', 'Ouzbékistan', '', '', ''), -(133, 'en_US', 'Pakistan', '', '', ''), +(133, 'en_EN', 'Pakistan', '', '', ''), (133, 'es_ES', 'Pakistán', '', '', ''), (133, 'fr_FR', 'Pakistan', '', '', ''), -(134, 'en_US', 'Panama', '', '', ''), +(134, 'en_EN', 'Panama', '', '', ''), (134, 'es_ES', 'Panamá', '', '', ''), (134, 'fr_FR', 'Panama', '', '', ''), -(135, 'en_US', 'Papua Nueva Guinea', '', '', ''), +(135, 'en_EN', 'Papua Nueva Guinea', '', '', ''), (135, 'es_ES', 'Papua Nueva Guinea', '', '', ''), (135, 'fr_FR', 'Papouasie', '', '', ''), -(136, 'en_US', 'Paraguay', '', '', ''), +(136, 'en_EN', 'Paraguay', '', '', ''), (136, 'es_ES', 'Paraguay', '', '', ''), (136, 'fr_FR', 'Paraguay', '', '', ''), -(137, 'en_US', 'Netherlands', '', '', ''), +(137, 'en_EN', 'Netherlands', '', '', ''), (137, 'es_ES', 'Países Bajos', '', '', ''), (137, 'fr_FR', 'Pays-Bas', '', '', ''), -(138, 'en_US', 'Peru', '', '', ''), +(138, 'en_EN', 'Peru', '', '', ''), (138, 'es_ES', 'Perú', '', '', ''), (138, 'fr_FR', 'Pérou', '', '', ''), -(139, 'en_US', 'Philippines', '', '', ''), +(139, 'en_EN', 'Philippines', '', '', ''), (139, 'es_ES', 'Filipinas', '', '', ''), (139, 'fr_FR', 'Philippines', '', '', ''), -(140, 'en_US', 'Poland', '', '', ''), +(140, 'en_EN', 'Poland', '', '', ''), (140, 'es_ES', 'Polonia', '', '', ''), (140, 'fr_FR', 'Pologne', '', '', ''), -(141, 'en_US', 'Portugal', '', '', ''), +(141, 'en_EN', 'Portugal', '', '', ''), (141, 'es_ES', 'Portugal', '', '', ''), (141, 'fr_FR', 'Portugal', '', '', ''), -(142, 'en_US', 'Qatar', '', '', ''), +(142, 'en_EN', 'Qatar', '', '', ''), (142, 'es_ES', 'Qatar', '', '', ''), (142, 'fr_FR', 'Qatar', '', '', ''), -(143, 'en_US', 'Central African Republic', '', '', ''), +(143, 'en_EN', 'Central African Republic', '', '', ''), (143, 'es_ES', 'República Centroafricana', '', '', ''), (143, 'fr_FR', 'République centrafricaine', '', '', ''), -(144, 'en_US', 'Dominican Republic', '', '', ''), +(144, 'en_EN', 'Dominican Republic', '', '', ''), (144, 'es_ES', 'República Dominicana', '', '', ''), (144, 'fr_FR', 'République dominicaine', '', '', ''), -(145, 'en_US', 'Czech Republic', '', '', ''), +(145, 'en_EN', 'Czech Republic', '', '', ''), (145, 'es_ES', 'República Checa', '', '', ''), (145, 'fr_FR', 'République tchèque', '', '', ''), -(146, 'en_US', 'Romania', '', '', ''), +(146, 'en_EN', 'Romania', '', '', ''), (146, 'es_ES', 'Rumania', '', '', ''), (146, 'fr_FR', 'Roumanie', '', '', ''), -(147, 'en_US', 'United Kingdom', '', '', ''), +(147, 'en_EN', 'United Kingdom', '', '', ''), (147, 'es_ES', 'Reino Unido', '', '', ''), (147, 'fr_FR', 'Royaume-Uni', '', '', ''), -(148, 'en_US', 'Russia', '', '', ''), +(148, 'en_EN', 'Russia', '', '', ''), (148, 'es_ES', 'Rusia', '', '', ''), (148, 'fr_FR', 'Russie', '', '', ''), -(149, 'en_US', 'Rwanda', '', '', ''), +(149, 'en_EN', 'Rwanda', '', '', ''), (149, 'es_ES', 'Ruanda', '', '', ''), (149, 'fr_FR', 'Rwanda', '', '', ''), -(150, 'en_US', 'Saint Kitts and Nevis', '', '', ''), +(150, 'en_EN', 'Saint Kitts and Nevis', '', '', ''), (150, 'es_ES', 'San Cristóbal', '', '', ''), (150, 'fr_FR', 'Saint-Christophe-et-Niévès', '', '', ''), -(151, 'en_US', 'Saint Lucia', '', '', ''), +(151, 'en_EN', 'Saint Lucia', '', '', ''), (151, 'es_ES', 'Santa Lucía', '', '', ''), (151, 'fr_FR', 'Sainte-Lucie', '', '', ''), -(152, 'en_US', 'San Marino', '', '', ''), +(152, 'en_EN', 'San Marino', '', '', ''), (152, 'es_ES', 'San Marino', '', '', ''), (152, 'fr_FR', 'Saint-Marin', '', '', ''), -(153, 'en_US', 'Saint Vincent and the Grenadines', '', '', ''), +(153, 'en_EN', 'Saint Vincent and the Grenadines', '', '', ''), (153, 'es_ES', 'San Vicente y las Granadinas', '', '', ''), (153, 'fr_FR', 'Saint-Vincent-et-les Grenadines', '', '', ''), -(154, 'en_US', 'Solomon Islands', '', '', ''), +(154, 'en_EN', 'Solomon Islands', '', '', ''), (154, 'es_ES', 'Salomón', '', '', ''), (154, 'fr_FR', 'Salomon', '', '', ''), -(155, 'en_US', 'El Salvador', '', '', ''), +(155, 'en_EN', 'El Salvador', '', '', ''), (155, 'es_ES', 'El Salvador', '', '', ''), (155, 'fr_FR', 'Salvador', '', '', ''), -(156, 'en_US', 'Western Samoa', '', '', ''), +(156, 'en_EN', 'Western Samoa', '', '', ''), (156, 'es_ES', 'Samoa', '', '', ''), (156, 'fr_FR', 'Samoa occidentales', '', '', ''), -(157, 'en_US', 'Sao Tome and Principe', '', '', ''), +(157, 'en_EN', 'Sao Tome and Principe', '', '', ''), (157, 'es_ES', 'Santo Tomé y Príncipe', '', '', ''), (157, 'fr_FR', 'Sao Tomé-et-Principe', '', '', ''), -(158, 'en_US', 'Senegal', '', '', ''), +(158, 'en_EN', 'Senegal', '', '', ''), (158, 'es_ES', 'Senegal', '', '', ''), (158, 'fr_FR', 'Sénégal', '', '', ''), -(159, 'en_US', 'Seychelles', '', '', ''), +(159, 'en_EN', 'Seychelles', '', '', ''), (159, 'es_ES', 'Seychelles', '', '', ''), (159, 'fr_FR', 'Seychelles', '', '', ''), -(160, 'en_US', 'Sierra Leone', '', '', ''), +(160, 'en_EN', 'Sierra Leone', '', '', ''), (160, 'es_ES', 'Sierra Leona', '', '', ''), (160, 'fr_FR', 'Sierra Leone', '', '', ''), -(161, 'en_US', 'Singapore', '', '', ''), +(161, 'en_EN', 'Singapore', '', '', ''), (161, 'es_ES', 'Singapur', '', '', ''), (161, 'fr_FR', 'Singapour', '', '', ''), -(162, 'en_US', 'Slovakia', '', '', ''), +(162, 'en_EN', 'Slovakia', '', '', ''), (162, 'es_ES', 'Eslovaquia', '', '', ''), (162, 'fr_FR', 'Slovaquie', '', '', ''), -(163, 'en_US', 'Slovenia', '', '', ''), +(163, 'en_EN', 'Slovenia', '', '', ''), (163, 'es_ES', 'Eslovenia', '', '', ''), (163, 'fr_FR', 'Slovénie', '', '', ''), -(164, 'en_US', 'Somalia', '', '', ''), +(164, 'en_EN', 'Somalia', '', '', ''), (164, 'es_ES', 'Somalia', '', '', ''), (164, 'fr_FR', 'Somalie', '', '', ''), -(165, 'en_US', 'Sudan', '', '', ''), +(165, 'en_EN', 'Sudan', '', '', ''), (165, 'es_ES', 'Sudán', '', '', ''), (165, 'fr_FR', 'Soudan', '', '', ''), -(166, 'en_US', 'Sri Lanka', '', '', ''), +(166, 'en_EN', 'Sri Lanka', '', '', ''), (166, 'es_ES', 'Sri Lanka', '', '', ''), (166, 'fr_FR', 'Sri Lanka', '', '', ''), -(167, 'en_US', 'Sweden', '', '', ''), +(167, 'en_EN', 'Sweden', '', '', ''), (167, 'es_ES', 'Suecia', '', '', ''), (167, 'fr_FR', 'Suède', '', '', ''), -(168, 'en_US', 'Switzerland', '', '', ''), +(168, 'en_EN', 'Switzerland', '', '', ''), (168, 'es_ES', 'Suiza', '', '', ''), (168, 'fr_FR', 'Suisse', '', '', ''), -(169, 'en_US', 'Suriname', '', '', ''), +(169, 'en_EN', 'Suriname', '', '', ''), (169, 'es_ES', 'Suriname', '', '', ''), (169, 'fr_FR', 'Suriname', '', '', ''), -(170, 'en_US', 'Swaziland', '', '', ''), +(170, 'en_EN', 'Swaziland', '', '', ''), (170, 'es_ES', 'Swazilandia', '', '', ''), (170, 'fr_FR', 'Swaziland', '', '', ''), -(171, 'en_US', 'Syria', '', '', ''), +(171, 'en_EN', 'Syria', '', '', ''), (171, 'es_ES', 'Siria', '', '', ''), (171, 'fr_FR', 'Syrie', '', '', ''), -(172, 'en_US', 'Tajikistan', '', '', ''), +(172, 'en_EN', 'Tajikistan', '', '', ''), (172, 'es_ES', 'Tayikistán', '', '', ''), (172, 'fr_FR', 'Tadjikistan', '', '', ''), -(173, 'en_US', 'Tanzania', '', '', ''), +(173, 'en_EN', 'Tanzania', '', '', ''), (173, 'es_ES', 'Tanzanía', '', '', ''), (173, 'fr_FR', 'Tanzanie', '', '', ''), -(174, 'en_US', 'Chad', '', '', ''), +(174, 'en_EN', 'Chad', '', '', ''), (174, 'es_ES', 'Chad', '', '', ''), (174, 'fr_FR', 'Tchad', '', '', ''), -(175, 'en_US', 'Thailand', '', '', ''), +(175, 'en_EN', 'Thailand', '', '', ''), (175, 'es_ES', 'Tailandia', '', '', ''), (175, 'fr_FR', 'Thaïlande', '', '', ''), -(176, 'en_US', 'Togo', '', '', ''), +(176, 'en_EN', 'Togo', '', '', ''), (176, 'es_ES', 'Togo', '', '', ''), (176, 'fr_FR', 'Togo', '', '', ''), -(177, 'en_US', 'Tonga', '', '', ''), +(177, 'en_EN', 'Tonga', '', '', ''), (177, 'es_ES', 'Tonga', '', '', ''), (177, 'fr_FR', 'Tonga', '', '', ''), -(178, 'en_US', 'Trinidad and Tobago', '', '', ''), +(178, 'en_EN', 'Trinidad and Tobago', '', '', ''), (178, 'es_ES', 'Trinidad y Tabago', '', '', ''), (178, 'fr_FR', 'Trinité-et-Tobago', '', '', ''), -(179, 'en_US', 'Tunisia', '', '', ''), +(179, 'en_EN', 'Tunisia', '', '', ''), (179, 'es_ES', 'Túnez', '', '', ''), (179, 'fr_FR', 'Tunisie', '', '', ''), -(180, 'en_US', 'Turkmenistan', '', '', ''), +(180, 'en_EN', 'Turkmenistan', '', '', ''), (180, 'es_ES', 'Turkmenistán', '', '', ''), (180, 'fr_FR', 'Turkménistan', '', '', ''), -(181, 'en_US', 'Turkey', '', '', ''), +(181, 'en_EN', 'Turkey', '', '', ''), (181, 'es_ES', 'Turquía', '', '', ''), (181, 'fr_FR', 'Turquie', '', '', ''), -(182, 'en_US', 'Tuvalu', '', '', ''), +(182, 'en_EN', 'Tuvalu', '', '', ''), (182, 'es_ES', 'Tuvalu', '', '', ''), (182, 'fr_FR', 'Tuvalu', '', '', ''), -(183, 'en_US', 'Ukraine', '', '', ''), +(183, 'en_EN', 'Ukraine', '', '', ''), (183, 'es_ES', 'Ucrania', '', '', ''), (183, 'fr_FR', 'Ukraine', '', '', ''), -(184, 'en_US', 'Uruguay', '', '', ''), +(184, 'en_EN', 'Uruguay', '', '', ''), (184, 'es_ES', 'Uruguay', '', '', ''), (184, 'fr_FR', 'Uruguay', '', '', ''), -(185, 'en_US', 'The Vatican', '', '', ''), +(185, 'en_EN', 'The Vatican', '', '', ''), (185, 'es_ES', 'El Vatican', '', '', ''), (185, 'fr_FR', 'Vatican', '', '', ''), -(186, 'en_US', 'Vanuatu', '', '', ''), +(186, 'en_EN', 'Vanuatu', '', '', ''), (186, 'es_ES', 'Vanuatu', '', '', ''), (186, 'fr_FR', 'Vanuatu', '', '', ''), -(187, 'en_US', 'Venezuela', '', '', ''), +(187, 'en_EN', 'Venezuela', '', '', ''), (187, 'es_ES', 'Venezuela', '', '', ''), (187, 'fr_FR', 'Venezuela', '', '', ''), -(188, 'en_US', 'Vietnam', '', '', ''), +(188, 'en_EN', 'Vietnam', '', '', ''), (188, 'es_ES', 'Viet Nam', '', '', ''), (188, 'fr_FR', 'Viêt Nam', '', '', ''), -(189, 'en_US', 'Yemen', '', '', ''), +(189, 'en_EN', 'Yemen', '', '', ''), (189, 'es_ES', 'Yemen', '', '', ''), (189, 'fr_FR', 'Yémen', '', '', ''), -(190, 'en_US', 'Yougoslavia', '', '', ''), +(190, 'en_EN', 'Yougoslavia', '', '', ''), (190, 'es_ES', 'Yugoslavia', '', '', ''), (190, 'fr_FR', 'Yougoslavie', '', '', ''), -(191, 'en_US', 'Zaire', '', '', ''), +(191, 'en_EN', 'Zaire', '', '', ''), (191, 'es_ES', 'Zaire', '', '', ''), (191, 'fr_FR', 'Zaïre', '', '', ''), -(192, 'en_US', 'Zambia', '', '', ''), +(192, 'en_EN', 'Zambia', '', '', ''), (192, 'es_ES', 'Zambia', '', '', ''), (192, 'fr_FR', 'Zambie', '', '', ''), -(193, 'en_US', 'Zimbabwe', '', '', ''), +(193, 'en_EN', 'Zimbabwe', '', '', ''), (193, 'es_ES', 'Zimbabwe', '', '', ''), (193, 'fr_FR', 'Zimbabwe', '', '', ''), -(196, 'en_US', 'USA - Alaska', '', '', ''), +(196, 'en_EN', 'USA - Alaska', '', '', ''), (196, 'es_ES', 'USA - Alaska', '', '', ''), (196, 'fr_FR', 'USA - Alaska', '', '', ''), -(197, 'en_US', 'USA - Arizona', '', '', ''), +(197, 'en_EN', 'USA - Arizona', '', '', ''), (197, 'es_ES', 'USA - Arizona', '', '', ''), (197, 'fr_FR', 'USA - Arizona', '', '', ''), -(198, 'en_US', 'USA - Arkansas', '', '', ''), +(198, 'en_EN', 'USA - Arkansas', '', '', ''), (198, 'es_ES', 'USA - Arkansas', '', '', ''), (198, 'fr_FR', 'USA - Arkansas', '', '', ''), -(199, 'en_US', 'USA - California', '', '', ''), +(199, 'en_EN', 'USA - California', '', '', ''), (199, 'es_ES', 'USA - California', '', '', ''), (199, 'fr_FR', 'USA - California', '', '', ''), -(200, 'en_US', 'USA - Colorado', '', '', ''), +(200, 'en_EN', 'USA - Colorado', '', '', ''), (200, 'es_ES', 'USA - Colorado', '', '', ''), (200, 'fr_FR', 'USA - Colorado', '', '', ''), -(201, 'en_US', 'USA - Connecticut', '', '', ''), +(201, 'en_EN', 'USA - Connecticut', '', '', ''), (201, 'es_ES', 'USA - Connecticut', '', '', ''), (201, 'fr_FR', 'USA - Connecticut', '', '', ''), -(202, 'en_US', 'USA - Delaware', '', '', ''), +(202, 'en_EN', 'USA - Delaware', '', '', ''), (202, 'es_ES', 'USA - Delaware', '', '', ''), (202, 'fr_FR', 'USA - Delaware', '', '', ''), -(203, 'en_US', 'USA - District Of Columbia', '', '', ''), +(203, 'en_EN', 'USA - District Of Columbia', '', '', ''), (203, 'es_ES', 'USA - District Of Columbia', '', '', ''), (203, 'fr_FR', 'USA - District Of Columbia', '', '', ''), -(204, 'en_US', 'USA - Florida', '', '', ''), +(204, 'en_EN', 'USA - Florida', '', '', ''), (204, 'es_ES', 'USA - Florida', '', '', ''), (204, 'fr_FR', 'USA - Florida', '', '', ''), -(205, 'en_US', 'USA - Georgia', '', '', ''), +(205, 'en_EN', 'USA - Georgia', '', '', ''), (205, 'es_ES', 'USA - Georgia', '', '', ''), (205, 'fr_FR', 'USA - Georgia', '', '', ''), -(206, 'en_US', 'USA - Hawaii', '', '', ''), +(206, 'en_EN', 'USA - Hawaii', '', '', ''), (206, 'es_ES', 'USA - Hawaii', '', '', ''), (206, 'fr_FR', 'USA - Hawaii', '', '', ''), -(207, 'en_US', 'USA - Idaho', '', '', ''), +(207, 'en_EN', 'USA - Idaho', '', '', ''), (207, 'es_ES', 'USA - Idaho', '', '', ''), (207, 'fr_FR', 'USA - Idaho', '', '', ''), -(208, 'en_US', 'USA - Illinois', '', '', ''), +(208, 'en_EN', 'USA - Illinois', '', '', ''), (208, 'es_ES', 'USA - Illinois', '', '', ''), (208, 'fr_FR', 'USA - Illinois', '', '', ''), -(209, 'en_US', 'USA - Indiana', '', '', ''), +(209, 'en_EN', 'USA - Indiana', '', '', ''), (209, 'es_ES', 'USA - Indiana', '', '', ''), (209, 'fr_FR', 'USA - Indiana', '', '', ''), -(210, 'en_US', 'USA - Iowa', '', '', ''), +(210, 'en_EN', 'USA - Iowa', '', '', ''), (210, 'es_ES', 'USA - Iowa', '', '', ''), (210, 'fr_FR', 'USA - Iowa', '', '', ''), -(211, 'en_US', 'USA - Kansas', '', '', ''), +(211, 'en_EN', 'USA - Kansas', '', '', ''), (211, 'es_ES', 'USA - Kansas', '', '', ''), (211, 'fr_FR', 'USA - Kansas', '', '', ''), -(212, 'en_US', 'USA - Kentucky', '', '', ''), +(212, 'en_EN', 'USA - Kentucky', '', '', ''), (212, 'es_ES', 'USA - Kentucky', '', '', ''), (212, 'fr_FR', 'USA - Kentucky', '', '', ''), -(213, 'en_US', 'USA - Louisiana', '', '', ''), +(213, 'en_EN', 'USA - Louisiana', '', '', ''), (213, 'es_ES', 'USA - Louisiana', '', '', ''), (213, 'fr_FR', 'USA - Louisiana', '', '', ''), -(214, 'en_US', 'USA - Maine', '', '', ''), +(214, 'en_EN', 'USA - Maine', '', '', ''), (214, 'es_ES', 'USA - Maine', '', '', ''), (214, 'fr_FR', 'USA - Maine', '', '', ''), -(215, 'en_US', 'USA - Maryland', '', '', ''), +(215, 'en_EN', 'USA - Maryland', '', '', ''), (215, 'es_ES', 'USA - Maryland', '', '', ''), (215, 'fr_FR', 'USA - Maryland', '', '', ''), -(216, 'en_US', 'USA - Massachusetts', '', '', ''), +(216, 'en_EN', 'USA - Massachusetts', '', '', ''), (216, 'es_ES', 'USA - Massachusetts', '', '', ''), (216, 'fr_FR', 'USA - Massachusetts', '', '', ''), -(217, 'en_US', 'USA - Michigan', '', '', ''), +(217, 'en_EN', 'USA - Michigan', '', '', ''), (217, 'es_ES', 'USA - Michigan', '', '', ''), (217, 'fr_FR', 'USA - Michigan', '', '', ''), -(218, 'en_US', 'USA - Minnesota', '', '', ''), +(218, 'en_EN', 'USA - Minnesota', '', '', ''), (218, 'es_ES', 'USA - Minnesota', '', '', ''), (218, 'fr_FR', 'USA - Minnesota', '', '', ''), -(219, 'en_US', 'USA - Mississippi', '', '', ''), +(219, 'en_EN', 'USA - Mississippi', '', '', ''), (219, 'es_ES', 'USA - Mississippi', '', '', ''), (219, 'fr_FR', 'USA - Mississippi', '', '', ''), -(220, 'en_US', 'USA - Missouri', '', '', ''), +(220, 'en_EN', 'USA - Missouri', '', '', ''), (220, 'es_ES', 'USA - Missouri', '', '', ''), (220, 'fr_FR', 'USA - Missouri', '', '', ''), -(221, 'en_US', 'USA - Montana', '', '', ''), +(221, 'en_EN', 'USA - Montana', '', '', ''), (221, 'es_ES', 'USA - Montana', '', '', ''), (221, 'fr_FR', 'USA - Montana', '', '', ''), -(222, 'en_US', 'USA - Nebraska', '', '', ''), +(222, 'en_EN', 'USA - Nebraska', '', '', ''), (222, 'es_ES', 'USA - Nebraska', '', '', ''), (222, 'fr_FR', 'USA - Nebraska', '', '', ''), -(223, 'en_US', 'USA - Nevada', '', '', ''), +(223, 'en_EN', 'USA - Nevada', '', '', ''), (223, 'es_ES', 'USA - Nevada', '', '', ''), (223, 'fr_FR', 'USA - Nevada', '', '', ''), -(224, 'en_US', 'USA - New Hampshire', '', '', ''), +(224, 'en_EN', 'USA - New Hampshire', '', '', ''), (224, 'es_ES', 'USA - New Hampshire', '', '', ''), (224, 'fr_FR', 'USA - New Hampshire', '', '', ''), -(225, 'en_US', 'USA - New Jersey', '', '', ''), +(225, 'en_EN', 'USA - New Jersey', '', '', ''), (225, 'es_ES', 'USA - New Jersey', '', '', ''), (225, 'fr_FR', 'USA - New Jersey', '', '', ''), -(226, 'en_US', 'USA - New Mexico', '', '', ''), +(226, 'en_EN', 'USA - New Mexico', '', '', ''), (226, 'es_ES', 'USA - New Mexico', '', '', ''), (226, 'fr_FR', 'USA - New Mexico', '', '', ''), -(227, 'en_US', 'USA - New York', '', '', ''), +(227, 'en_EN', 'USA - New York', '', '', ''), (227, 'es_ES', 'USA - New York', '', '', ''), (227, 'fr_FR', 'USA - New York', '', '', ''), -(228, 'en_US', 'USA - North Carolina', '', '', ''), +(228, 'en_EN', 'USA - North Carolina', '', '', ''), (228, 'es_ES', 'USA - North Carolina', '', '', ''), (228, 'fr_FR', 'USA - North Carolina', '', '', ''), -(229, 'en_US', 'USA - North Dakota', '', '', ''), +(229, 'en_EN', 'USA - North Dakota', '', '', ''), (229, 'es_ES', 'USA - North Dakota', '', '', ''), (229, 'fr_FR', 'USA - North Dakota', '', '', ''), -(230, 'en_US', 'USA - Ohio', '', '', ''), +(230, 'en_EN', 'USA - Ohio', '', '', ''), (230, 'es_ES', 'USA - Ohio', '', '', ''), (230, 'fr_FR', 'USA - Ohio', '', '', ''), -(231, 'en_US', 'USA - Oklahoma', '', '', ''), +(231, 'en_EN', 'USA - Oklahoma', '', '', ''), (231, 'es_ES', 'USA - Oklahoma', '', '', ''), (231, 'fr_FR', 'USA - Oklahoma', '', '', ''), -(232, 'en_US', 'USA - Oregon', '', '', ''), +(232, 'en_EN', 'USA - Oregon', '', '', ''), (232, 'es_ES', 'USA - Oregon', '', '', ''), (232, 'fr_FR', 'USA - Oregon', '', '', ''), -(233, 'en_US', 'USA - Pennsylvania', '', '', ''), +(233, 'en_EN', 'USA - Pennsylvania', '', '', ''), (233, 'es_ES', 'USA - Pennsylvania', '', '', ''), (233, 'fr_FR', 'USA - Pennsylvania', '', '', ''), -(234, 'en_US', 'USA - Rhode Island', '', '', ''), +(234, 'en_EN', 'USA - Rhode Island', '', '', ''), (234, 'es_ES', 'USA - Rhode Island', '', '', ''), (234, 'fr_FR', 'USA - Rhode Island', '', '', ''), -(235, 'en_US', 'USA - South Carolina', '', '', ''), +(235, 'en_EN', 'USA - South Carolina', '', '', ''), (235, 'es_ES', 'USA - South Carolina', '', '', ''), (235, 'fr_FR', 'USA - South Carolina', '', '', ''), -(236, 'en_US', 'USA - South Dakota', '', '', ''), +(236, 'en_EN', 'USA - South Dakota', '', '', ''), (236, 'es_ES', 'USA - South Dakota', '', '', ''), (236, 'fr_FR', 'USA - South Dakota', '', '', ''), -(237, 'en_US', 'USA - Tennessee', '', '', ''), +(237, 'en_EN', 'USA - Tennessee', '', '', ''), (237, 'es_ES', 'USA - Tennessee', '', '', ''), (237, 'fr_FR', 'USA - Tennessee', '', '', ''), -(238, 'en_US', 'USA - Texas', '', '', ''), +(238, 'en_EN', 'USA - Texas', '', '', ''), (238, 'es_ES', 'USA - Texas', '', '', ''), (238, 'fr_FR', 'USA - Texas', '', '', ''), -(239, 'en_US', 'USA - Utah', '', '', ''), +(239, 'en_EN', 'USA - Utah', '', '', ''), (239, 'es_ES', 'USA - Utah', '', '', ''), (239, 'fr_FR', 'USA - Utah', '', '', ''), -(240, 'en_US', 'USA - Vermont', '', '', ''), +(240, 'en_EN', 'USA - Vermont', '', '', ''), (240, 'es_ES', 'USA - Vermont', '', '', ''), (240, 'fr_FR', 'USA - Vermont', '', '', ''), -(241, 'en_US', 'USA - Virginia', '', '', ''), +(241, 'en_EN', 'USA - Virginia', '', '', ''), (241, 'es_ES', 'USA - Virginia', '', '', ''), (241, 'fr_FR', 'USA - Virginia', '', '', ''), -(242, 'en_US', 'USA - Washington', '', '', ''), +(242, 'en_EN', 'USA - Washington', '', '', ''), (242, 'es_ES', 'USA - Washington', '', '', ''), (242, 'fr_FR', 'USA - Washington', '', '', ''), -(243, 'en_US', 'USA - West Virginia', '', '', ''), +(243, 'en_EN', 'USA - West Virginia', '', '', ''), (243, 'es_ES', 'USA - West Virginia', '', '', ''), (243, 'fr_FR', 'USA - West Virginia', '', '', ''), -(244, 'en_US', 'USA - Wisconsin', '', '', ''), +(244, 'en_EN', 'USA - Wisconsin', '', '', ''), (244, 'es_ES', 'USA - Wisconsin', '', '', ''), (244, 'fr_FR', 'USA - Wisconsin', '', '', ''), -(245, 'en_US', 'USA - Wyoming', '', '', ''), +(245, 'en_EN', 'USA - Wyoming', '', '', ''), (245, 'es_ES', 'USA - Wyoming', '', '', ''), (245, 'fr_FR', 'USA - Wyoming', '', '', ''), -(246, 'en_US', 'Canada - Colombie-Britannique', '', '', ''), +(246, 'en_EN', 'Canada - Colombie-Britannique', '', '', ''), (246, 'es_ES', 'Canada - Colombie-Britannique', '', '', ''), (246, 'fr_FR', 'Canada - Colombie-Britannique', '', '', ''), -(247, 'en_US', 'Canada - Alberta', '', '', ''), +(247, 'en_EN', 'Canada - Alberta', '', '', ''), (247, 'es_ES', 'Canada - Alberta', '', '', ''), (247, 'fr_FR', 'Canada - Alberta', '', '', ''), -(248, 'en_US', 'Canada - Saskatchewan', '', '', ''), +(248, 'en_EN', 'Canada - Saskatchewan', '', '', ''), (248, 'es_ES', 'Canada - Saskatchewan', '', '', ''), (248, 'fr_FR', 'Canada - Saskatchewan', '', '', ''), -(249, 'en_US', 'Canada - Manitoba', '', '', ''), +(249, 'en_EN', 'Canada - Manitoba', '', '', ''), (249, 'es_ES', 'Canada - Manitoba', '', '', ''), (249, 'fr_FR', 'Canada - Manitoba', '', '', ''), -(250, 'en_US', 'Canada - Ontario', '', '', ''), +(250, 'en_EN', 'Canada - Ontario', '', '', ''), (250, 'es_ES', 'Canada - Ontario', '', '', ''), (250, 'fr_FR', 'Canada - Ontario', '', '', ''), -(251, 'en_US', 'Canada - Québec', '', '', ''), +(251, 'en_EN', 'Canada - Québec', '', '', ''), (251, 'es_ES', 'Canada - Québec', '', '', ''), (251, 'fr_FR', 'Canada - Québec', '', '', ''), -(252, 'en_US', 'Canada - Nouveau-Brunswick', '', '', ''), +(252, 'en_EN', 'Canada - Nouveau-Brunswick', '', '', ''), (252, 'es_ES', 'Canada - Nouveau-Brunswick', '', '', ''), (252, 'fr_FR', 'Canada - Nouveau-Brunswick', '', '', ''), -(253, 'en_US', 'Canada - Nouvelle-Écosse', '', '', ''), +(253, 'en_EN', 'Canada - Nouvelle-Écosse', '', '', ''), (253, 'es_ES', 'Canada - Nouvelle-Écosse', '', '', ''), (253, 'fr_FR', 'Canada - Nouvelle-Écosse', '', '', ''), -(254, 'en_US', 'Canada - Île-du-Prince-Édouard ', '', '', ''), +(254, 'en_EN', 'Canada - Île-du-Prince-Édouard ', '', '', ''), (254, 'es_ES', 'Canada - Île-du-Prince-Édouard ', '', '', ''), (254, 'fr_FR', 'Canada - Île-du-Prince-Édouard ', '', '', ''), -(255, 'en_US', 'Canada - Terre-Neuve-et-Labrador ', '', '', ''), +(255, 'en_EN', 'Canada - Terre-Neuve-et-Labrador ', '', '', ''), (255, 'es_ES', 'Canada - Terre-Neuve-et-Labrador ', '', '', ''), (255, 'fr_FR', 'Canada - Terre-Neuve-et-Labrador ', '', '', ''), -(256, 'en_US', 'Canada - Yukon', '', '', ''), +(256, 'en_EN', 'Canada - Yukon', '', '', ''), (256, 'es_ES', 'Canada - Yukon', '', '', ''), (256, 'fr_FR', 'Canada - Yukon', '', '', ''), -(257, 'en_US', 'Canada - Territoires-du-Nord-Ouest', '', '', ''), +(257, 'en_EN', 'Canada - Territoires-du-Nord-Ouest', '', '', ''), (257, 'es_ES', 'Canada - Territoires-du-Nord-Ouest', '', '', ''), (257, 'fr_FR', 'Canada - Territoires-du-Nord-Ouest', '', '', ''), -(258, 'en_US', 'Canada - Nunavut', '', '', ''), +(258, 'en_EN', 'Canada - Nunavut', '', '', ''), (258, 'es_ES', 'Canada - Nunavut', '', '', ''), (258, 'fr_FR', 'Canada - Nunavut', '', '', ''), -(259, 'en_US', 'Guadeloupe', '', '', ''), +(259, 'en_EN', 'Guadeloupe', '', '', ''), (259, 'es_ES', 'Guadeloupe', '', '', ''), (259, 'fr_FR', 'Guadeloupe', '', '', ''), -(260, 'en_US', 'Guyane Française', '', '', ''), +(260, 'en_EN', 'Guyane Française', '', '', ''), (260, 'es_ES', 'Guyane Française', '', '', ''), (260, 'fr_FR', 'Guyane Française', '', '', ''), -(261, 'en_US', 'Martinique', '', '', ''), +(261, 'en_EN', 'Martinique', '', '', ''), (261, 'es_ES', 'Martinique', '', '', ''), (261, 'fr_FR', 'Martinique', '', '', ''), -(262, 'en_US', 'Mayotte', '', '', ''), +(262, 'en_EN', 'Mayotte', '', '', ''), (262, 'es_ES', 'Mayotte', '', '', ''), (262, 'fr_FR', 'Mayotte', '', '', ''), -(263, 'en_US', 'Réunion(La)', '', '', ''), +(263, 'en_EN', 'Réunion(La)', '', '', ''), (263, 'es_ES', 'Réunion(La)', '', '', ''), (263, 'fr_FR', 'Réunion(La)', '', '', ''), -(264, 'en_US', 'St Pierre et Miquelon', '', '', ''), +(264, 'en_EN', 'St Pierre et Miquelon', '', '', ''), (264, 'es_ES', 'St Pierre et Miquelon', '', '', ''), (264, 'fr_FR', 'St Pierre et Miquelon', '', '', ''), -(265, 'en_US', 'Nouvelle-Calédonie', '', '', ''), +(265, 'en_EN', 'Nouvelle-Calédonie', '', '', ''), (265, 'es_ES', 'Nouvelle-Calédonie', '', '', ''), (265, 'fr_FR', 'Nouvelle-Calédonie', '', '', ''), -(266, 'en_US', 'Polynésie française', '', '', ''), +(266, 'en_EN', 'Polynésie française', '', '', ''), (266, 'es_ES', 'Polynésie française', '', '', ''), (266, 'fr_FR', 'Polynésie française', '', '', ''), -(267, 'en_US', 'Wallis-et-Futuna', '', '', ''), +(267, 'en_EN', 'Wallis-et-Futuna', '', '', ''), (267, 'es_ES', 'Wallis-et-Futuna', '', '', ''), (267, 'fr_FR', 'Wallis-et-Futuna', '', '', ''), -(268, 'en_US', 'USA - Alabama', '', '', ''), +(268, 'en_EN', 'USA - Alabama', '', '', ''), (268, 'es_ES', 'USA - Alabama', '', '', ''), (268, 'fr_FR', 'USA - Alabama', '', '', ''); diff --git a/templates/default/category.html b/templates/default/category.html index 8b52f0afc..af4cdcf14 100755 --- a/templates/default/category.html +++ b/templates/default/category.html @@ -221,4 +221,16 @@ {/loop} +
+ +

CURRENCIES

+ +
    + {loop name="cur" type="currency"} +
  • + #NAME (#SYMBOL) +
  • + {/loop} +
+ \ No newline at end of file diff --git a/templates/default/debug.html b/templates/default/debug.html index 251a9b891..21f69ad33 100755 --- a/templates/default/debug.html +++ b/templates/default/debug.html @@ -1,23 +1,14 @@ -{*loop name="product" type="product" new="on" promo="on" min_stock="20" attribute_non_strict_match="min_stock,promo"} -

PRODUCT : #REF / #TITLE (#ID)

-{/loop*} +

ALL ATTRIBUTES AND THEIR AVAILABILITY

-{*loop name="product" type="product" min_weight="1000" max_weight="6000" attribute_non_strict_match="*"} -

PRODUCT : #REF / #TITLE (#ID)

-{/loop*} - -{*loop name="product" type="product" min_price="100" max_price="300" min_stock="4" min_weight="6000" max_weight="7000" attribute_non_strict_match="*" promo="on"} -

PRODUCT : #REF / #TITLE (#ID)

-{/loop*} - -{*loop name="product" type="product" promo="0" min_stock="4" order="promo,min_price"} -

PRODUCT : #REF / #TITLE (#ID)

-{/loop*} - -{*loop name="product" type="product" order="promo,min_price"} -

PRODUCT : #REF / #TITLE (#ID) / NEW : #NEW / PROMO : #PROMO / best price : #BEST_PRICE

-{/loop*} - -{loop name="product" type="product"} -

PRODUCT : #REF / #TITLE

-{/loop} \ No newline at end of file +
    + {loop name="attr" type="attribute" order="manual" lang="2" backend_context="true"} +
  • + {if #IS_TRANSLATED == 1}#TITLE{else}to be translated{/if} +
      + {loop name="attrav" type="attribute_availability" order="manual" attribute="#ID" lang="3"} +
    • {if #IS_TRANSLATED == 1}#TITLE{else}to be translated{/if}
    • + {/loop} +
    +
  • + {/loop} +
\ No newline at end of file diff --git a/templates/default/tester.html b/templates/default/tester.html new file mode 100755 index 000000000..b53396d3f --- /dev/null +++ b/templates/default/tester.html @@ -0,0 +1,11 @@ +
    +{loop name="car" type="category"} +
  • +
      + {loop name="product" type="product" category="#ID"} +
    • #REF
    • + {/loop} +
    +
  • +{/loop} +
\ No newline at end of file diff --git a/web/index_dev.php b/web/index_dev.php index f02a625da..dae84059f 100755 --- a/web/index_dev.php +++ b/web/index_dev.php @@ -50,4 +50,5 @@ $response = $thelia->handle($request)->prepare($request)->send(); $thelia->terminate($request, $response); -echo "\n"; \ No newline at end of file +echo "\n"; +echo "\n";