- * $query->filterByDescription('fooValue'); // WHERE description = 'fooValue'
- * $query->filterByDescription('%fooValue%'); // WHERE description LIKE '%fooValue%'
+ * $query->filterBySubject('fooValue'); // WHERE subject = 'fooValue'
+ * $query->filterBySubject('%fooValue%'); // WHERE subject LIKE '%fooValue%'
*
*
- * @param string $description The value to use as filter.
+ * @param string $subject The value to use as filter.
* Accepts wildcards (* and % trigger a LIKE)
* @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
*
* @return ChildMessageI18nQuery The current query, for fluid interface
*/
- public function filterByDescription($description = null, $comparison = null)
+ public function filterBySubject($subject = null, $comparison = null)
{
if (null === $comparison) {
- if (is_array($description)) {
+ if (is_array($subject)) {
$comparison = Criteria::IN;
- } elseif (preg_match('/[\%\*]/', $description)) {
- $description = str_replace('*', '%', $description);
+ } elseif (preg_match('/[\%\*]/', $subject)) {
+ $subject = str_replace('*', '%', $subject);
$comparison = Criteria::LIKE;
}
}
- return $this->addUsingAlias(MessageI18nTableMap::DESCRIPTION, $description, $comparison);
+ return $this->addUsingAlias(MessageI18nTableMap::SUBJECT, $subject, $comparison);
}
/**
- * Filter the query on the description_html column
+ * Filter the query on the text_message column
*
* Example usage:
*
- * $query->filterByDescriptionHtml('fooValue'); // WHERE description_html = 'fooValue'
- * $query->filterByDescriptionHtml('%fooValue%'); // WHERE description_html LIKE '%fooValue%'
+ * $query->filterByTextMessage('fooValue'); // WHERE text_message = 'fooValue'
+ * $query->filterByTextMessage('%fooValue%'); // WHERE text_message LIKE '%fooValue%'
*
*
- * @param string $descriptionHtml The value to use as filter.
+ * @param string $textMessage The value to use as filter.
* Accepts wildcards (* and % trigger a LIKE)
* @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
*
* @return ChildMessageI18nQuery The current query, for fluid interface
*/
- public function filterByDescriptionHtml($descriptionHtml = null, $comparison = null)
+ public function filterByTextMessage($textMessage = null, $comparison = null)
{
if (null === $comparison) {
- if (is_array($descriptionHtml)) {
+ if (is_array($textMessage)) {
$comparison = Criteria::IN;
- } elseif (preg_match('/[\%\*]/', $descriptionHtml)) {
- $descriptionHtml = str_replace('*', '%', $descriptionHtml);
+ } elseif (preg_match('/[\%\*]/', $textMessage)) {
+ $textMessage = str_replace('*', '%', $textMessage);
$comparison = Criteria::LIKE;
}
}
- return $this->addUsingAlias(MessageI18nTableMap::DESCRIPTION_HTML, $descriptionHtml, $comparison);
+ return $this->addUsingAlias(MessageI18nTableMap::TEXT_MESSAGE, $textMessage, $comparison);
+ }
+
+ /**
+ * Filter the query on the html_message column
+ *
+ * Example usage:
+ *
+ * $query->filterByHtmlMessage('fooValue'); // WHERE html_message = 'fooValue'
+ * $query->filterByHtmlMessage('%fooValue%'); // WHERE html_message LIKE '%fooValue%'
+ *
+ *
+ * @param string $htmlMessage The value to use as filter.
+ * Accepts wildcards (* and % trigger a LIKE)
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildMessageI18nQuery The current query, for fluid interface
+ */
+ public function filterByHtmlMessage($htmlMessage = null, $comparison = null)
+ {
+ if (null === $comparison) {
+ if (is_array($htmlMessage)) {
+ $comparison = Criteria::IN;
+ } elseif (preg_match('/[\%\*]/', $htmlMessage)) {
+ $htmlMessage = str_replace('*', '%', $htmlMessage);
+ $comparison = Criteria::LIKE;
+ }
+ }
+
+ return $this->addUsingAlias(MessageI18nTableMap::HTML_MESSAGE, $htmlMessage, $comparison);
}
/**
diff --git a/core/lib/Thelia/Model/Base/MessageQuery.php b/core/lib/Thelia/Model/Base/MessageQuery.php
index 938a16aab..d72dc7bed 100755
--- a/core/lib/Thelia/Model/Base/MessageQuery.php
+++ b/core/lib/Thelia/Model/Base/MessageQuery.php
@@ -23,9 +23,8 @@ use Thelia\Model\Map\MessageTableMap;
*
*
* @method ChildMessageQuery orderById($order = Criteria::ASC) Order by the id column
- * @method ChildMessageQuery orderByCode($order = Criteria::ASC) Order by the code column
+ * @method ChildMessageQuery orderByName($order = Criteria::ASC) Order by the name column
* @method ChildMessageQuery orderBySecured($order = Criteria::ASC) Order by the secured column
- * @method ChildMessageQuery orderByRef($order = Criteria::ASC) Order by the ref column
* @method ChildMessageQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
* @method ChildMessageQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
* @method ChildMessageQuery orderByVersion($order = Criteria::ASC) Order by the version column
@@ -33,9 +32,8 @@ use Thelia\Model\Map\MessageTableMap;
* @method ChildMessageQuery orderByVersionCreatedBy($order = Criteria::ASC) Order by the version_created_by column
*
* @method ChildMessageQuery groupById() Group by the id column
- * @method ChildMessageQuery groupByCode() Group by the code column
+ * @method ChildMessageQuery groupByName() Group by the name column
* @method ChildMessageQuery groupBySecured() Group by the secured column
- * @method ChildMessageQuery groupByRef() Group by the ref column
* @method ChildMessageQuery groupByCreatedAt() Group by the created_at column
* @method ChildMessageQuery groupByUpdatedAt() Group by the updated_at column
* @method ChildMessageQuery groupByVersion() Group by the version column
@@ -58,9 +56,8 @@ use Thelia\Model\Map\MessageTableMap;
* @method ChildMessage findOneOrCreate(ConnectionInterface $con = null) Return the first ChildMessage matching the query, or a new ChildMessage object populated from the query conditions when no match is found
*
* @method ChildMessage findOneById(int $id) Return the first ChildMessage filtered by the id column
- * @method ChildMessage findOneByCode(string $code) Return the first ChildMessage filtered by the code column
+ * @method ChildMessage findOneByName(string $name) Return the first ChildMessage filtered by the name column
* @method ChildMessage findOneBySecured(int $secured) Return the first ChildMessage filtered by the secured column
- * @method ChildMessage findOneByRef(string $ref) Return the first ChildMessage filtered by the ref column
* @method ChildMessage findOneByCreatedAt(string $created_at) Return the first ChildMessage filtered by the created_at column
* @method ChildMessage findOneByUpdatedAt(string $updated_at) Return the first ChildMessage filtered by the updated_at column
* @method ChildMessage findOneByVersion(int $version) Return the first ChildMessage filtered by the version column
@@ -68,9 +65,8 @@ use Thelia\Model\Map\MessageTableMap;
* @method ChildMessage findOneByVersionCreatedBy(string $version_created_by) Return the first ChildMessage filtered by the version_created_by column
*
* @method array findById(int $id) Return ChildMessage objects filtered by the id column
- * @method array findByCode(string $code) Return ChildMessage objects filtered by the code column
+ * @method array findByName(string $name) Return ChildMessage objects filtered by the name column
* @method array findBySecured(int $secured) Return ChildMessage objects filtered by the secured column
- * @method array findByRef(string $ref) Return ChildMessage objects filtered by the ref column
* @method array findByCreatedAt(string $created_at) Return ChildMessage objects filtered by the created_at column
* @method array findByUpdatedAt(string $updated_at) Return ChildMessage objects filtered by the updated_at column
* @method array findByVersion(int $version) Return ChildMessage objects filtered by the version column
@@ -171,7 +167,7 @@ abstract class MessageQuery extends ModelCriteria
*/
protected function findPkSimple($key, $con)
{
- $sql = 'SELECT ID, CODE, SECURED, REF, CREATED_AT, UPDATED_AT, VERSION, VERSION_CREATED_AT, VERSION_CREATED_BY FROM message WHERE ID = :p0';
+ $sql = 'SELECT ID, NAME, SECURED, CREATED_AT, UPDATED_AT, VERSION, VERSION_CREATED_AT, VERSION_CREATED_BY FROM message WHERE ID = :p0';
try {
$stmt = $con->prepare($sql);
$stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -302,32 +298,32 @@ abstract class MessageQuery extends ModelCriteria
}
/**
- * Filter the query on the code column
+ * Filter the query on the name column
*
* Example usage:
*
- * $query->filterByCode('fooValue'); // WHERE code = 'fooValue'
- * $query->filterByCode('%fooValue%'); // WHERE code LIKE '%fooValue%'
+ * $query->filterByName('fooValue'); // WHERE name = 'fooValue'
+ * $query->filterByName('%fooValue%'); // WHERE name LIKE '%fooValue%'
*
*
- * @param string $code The value to use as filter.
+ * @param string $name The value to use as filter.
* Accepts wildcards (* and % trigger a LIKE)
* @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
*
* @return ChildMessageQuery The current query, for fluid interface
*/
- public function filterByCode($code = null, $comparison = null)
+ public function filterByName($name = null, $comparison = null)
{
if (null === $comparison) {
- if (is_array($code)) {
+ if (is_array($name)) {
$comparison = Criteria::IN;
- } elseif (preg_match('/[\%\*]/', $code)) {
- $code = str_replace('*', '%', $code);
+ } elseif (preg_match('/[\%\*]/', $name)) {
+ $name = str_replace('*', '%', $name);
$comparison = Criteria::LIKE;
}
}
- return $this->addUsingAlias(MessageTableMap::CODE, $code, $comparison);
+ return $this->addUsingAlias(MessageTableMap::NAME, $name, $comparison);
}
/**
@@ -371,35 +367,6 @@ abstract class MessageQuery extends ModelCriteria
return $this->addUsingAlias(MessageTableMap::SECURED, $secured, $comparison);
}
- /**
- * Filter the query on the ref column
- *
- * Example usage:
- *
- * $query->filterByRef('fooValue'); // WHERE ref = 'fooValue'
- * $query->filterByRef('%fooValue%'); // WHERE ref LIKE '%fooValue%'
- *
- *
- * @param string $ref The value to use as filter.
- * Accepts wildcards (* and % trigger a LIKE)
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildMessageQuery The current query, for fluid interface
- */
- public function filterByRef($ref = null, $comparison = null)
- {
- if (null === $comparison) {
- if (is_array($ref)) {
- $comparison = Criteria::IN;
- } elseif (preg_match('/[\%\*]/', $ref)) {
- $ref = str_replace('*', '%', $ref);
- $comparison = Criteria::LIKE;
- }
- }
-
- return $this->addUsingAlias(MessageTableMap::REF, $ref, $comparison);
- }
-
/**
* Filter the query on the created_at column
*
@@ -913,7 +880,7 @@ abstract class MessageQuery extends ModelCriteria
*
* @return ChildMessageQuery The current query, for fluid interface
*/
- public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
{
$relationName = $relationAlias ? $relationAlias : 'MessageI18n';
@@ -931,7 +898,7 @@ abstract class MessageQuery extends ModelCriteria
*
* @return ChildMessageQuery The current query, for fluid interface
*/
- public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN)
+ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN)
{
$this
->joinI18n($locale, null, $joinType)
@@ -952,7 +919,7 @@ abstract class MessageQuery extends ModelCriteria
*
* @return ChildMessageI18nQuery A secondary query class using the current class as primary query
*/
- public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
{
return $this
->joinI18n($locale, $relationAlias, $joinType)
diff --git a/core/lib/Thelia/Model/Base/MessageVersion.php b/core/lib/Thelia/Model/Base/MessageVersion.php
index e425b5c50..60e12da8d 100755
--- a/core/lib/Thelia/Model/Base/MessageVersion.php
+++ b/core/lib/Thelia/Model/Base/MessageVersion.php
@@ -62,10 +62,10 @@ abstract class MessageVersion implements ActiveRecordInterface
protected $id;
/**
- * The value for the code field.
+ * The value for the name field.
* @var string
*/
- protected $code;
+ protected $name;
/**
* The value for the secured field.
@@ -73,12 +73,6 @@ abstract class MessageVersion implements ActiveRecordInterface
*/
protected $secured;
- /**
- * The value for the ref field.
- * @var string
- */
- protected $ref;
-
/**
* The value for the created_at field.
* @var string
@@ -402,14 +396,14 @@ abstract class MessageVersion implements ActiveRecordInterface
}
/**
- * Get the [code] column value.
+ * Get the [name] column value.
*
* @return string
*/
- public function getCode()
+ public function getName()
{
- return $this->code;
+ return $this->name;
}
/**
@@ -423,17 +417,6 @@ abstract class MessageVersion implements ActiveRecordInterface
return $this->secured;
}
- /**
- * Get the [ref] column value.
- *
- * @return string
- */
- public function getRef()
- {
-
- return $this->ref;
- }
-
/**
* Get the [optionally formatted] temporal [created_at] column value.
*
@@ -542,25 +525,25 @@ abstract class MessageVersion implements ActiveRecordInterface
} // setId()
/**
- * Set the value of [code] column.
+ * Set the value of [name] column.
*
* @param string $v new value
* @return \Thelia\Model\MessageVersion The current object (for fluent API support)
*/
- public function setCode($v)
+ public function setName($v)
{
if ($v !== null) {
$v = (string) $v;
}
- if ($this->code !== $v) {
- $this->code = $v;
- $this->modifiedColumns[] = MessageVersionTableMap::CODE;
+ if ($this->name !== $v) {
+ $this->name = $v;
+ $this->modifiedColumns[] = MessageVersionTableMap::NAME;
}
return $this;
- } // setCode()
+ } // setName()
/**
* Set the value of [secured] column.
@@ -583,27 +566,6 @@ abstract class MessageVersion implements ActiveRecordInterface
return $this;
} // setSecured()
- /**
- * Set the value of [ref] column.
- *
- * @param string $v new value
- * @return \Thelia\Model\MessageVersion The current object (for fluent API support)
- */
- public function setRef($v)
- {
- if ($v !== null) {
- $v = (string) $v;
- }
-
- if ($this->ref !== $v) {
- $this->ref = $v;
- $this->modifiedColumns[] = MessageVersionTableMap::REF;
- }
-
-
- return $this;
- } // setRef()
-
/**
* Sets the value of [created_at] column to a normalized version of the date/time value specified.
*
@@ -753,37 +715,34 @@ abstract class MessageVersion implements ActiveRecordInterface
$col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : MessageVersionTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
$this->id = (null !== $col) ? (int) $col : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : MessageVersionTableMap::translateFieldName('Code', TableMap::TYPE_PHPNAME, $indexType)];
- $this->code = (null !== $col) ? (string) $col : null;
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : MessageVersionTableMap::translateFieldName('Name', TableMap::TYPE_PHPNAME, $indexType)];
+ $this->name = (null !== $col) ? (string) $col : null;
$col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : MessageVersionTableMap::translateFieldName('Secured', TableMap::TYPE_PHPNAME, $indexType)];
$this->secured = (null !== $col) ? (int) $col : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : MessageVersionTableMap::translateFieldName('Ref', TableMap::TYPE_PHPNAME, $indexType)];
- $this->ref = (null !== $col) ? (string) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : MessageVersionTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : MessageVersionTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
$this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : MessageVersionTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : MessageVersionTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
$this->updated_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : MessageVersionTableMap::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : MessageVersionTableMap::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)];
$this->version = (null !== $col) ? (int) $col : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : MessageVersionTableMap::translateFieldName('VersionCreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : MessageVersionTableMap::translateFieldName('VersionCreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
$this->version_created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 8 + $startcol : MessageVersionTableMap::translateFieldName('VersionCreatedBy', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : MessageVersionTableMap::translateFieldName('VersionCreatedBy', TableMap::TYPE_PHPNAME, $indexType)];
$this->version_created_by = (null !== $col) ? (string) $col : null;
$this->resetModified();
@@ -793,7 +752,7 @@ abstract class MessageVersion implements ActiveRecordInterface
$this->ensureConsistency();
}
- return $startcol + 9; // 9 = MessageVersionTableMap::NUM_HYDRATE_COLUMNS.
+ return $startcol + 8; // 8 = MessageVersionTableMap::NUM_HYDRATE_COLUMNS.
} catch (Exception $e) {
throw new PropelException("Error populating \Thelia\Model\MessageVersion object", 0, $e);
@@ -1017,15 +976,12 @@ abstract class MessageVersion implements ActiveRecordInterface
if ($this->isColumnModified(MessageVersionTableMap::ID)) {
$modifiedColumns[':p' . $index++] = 'ID';
}
- if ($this->isColumnModified(MessageVersionTableMap::CODE)) {
- $modifiedColumns[':p' . $index++] = 'CODE';
+ if ($this->isColumnModified(MessageVersionTableMap::NAME)) {
+ $modifiedColumns[':p' . $index++] = 'NAME';
}
if ($this->isColumnModified(MessageVersionTableMap::SECURED)) {
$modifiedColumns[':p' . $index++] = 'SECURED';
}
- if ($this->isColumnModified(MessageVersionTableMap::REF)) {
- $modifiedColumns[':p' . $index++] = 'REF';
- }
if ($this->isColumnModified(MessageVersionTableMap::CREATED_AT)) {
$modifiedColumns[':p' . $index++] = 'CREATED_AT';
}
@@ -1055,15 +1011,12 @@ abstract class MessageVersion implements ActiveRecordInterface
case 'ID':
$stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
break;
- case 'CODE':
- $stmt->bindValue($identifier, $this->code, PDO::PARAM_STR);
+ case 'NAME':
+ $stmt->bindValue($identifier, $this->name, PDO::PARAM_STR);
break;
case 'SECURED':
$stmt->bindValue($identifier, $this->secured, PDO::PARAM_INT);
break;
- case 'REF':
- $stmt->bindValue($identifier, $this->ref, PDO::PARAM_STR);
- break;
case 'CREATED_AT':
$stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
break;
@@ -1138,27 +1091,24 @@ abstract class MessageVersion implements ActiveRecordInterface
return $this->getId();
break;
case 1:
- return $this->getCode();
+ return $this->getName();
break;
case 2:
return $this->getSecured();
break;
case 3:
- return $this->getRef();
- break;
- case 4:
return $this->getCreatedAt();
break;
- case 5:
+ case 4:
return $this->getUpdatedAt();
break;
- case 6:
+ case 5:
return $this->getVersion();
break;
- case 7:
+ case 6:
return $this->getVersionCreatedAt();
break;
- case 8:
+ case 7:
return $this->getVersionCreatedBy();
break;
default:
@@ -1191,14 +1141,13 @@ abstract class MessageVersion implements ActiveRecordInterface
$keys = MessageVersionTableMap::getFieldNames($keyType);
$result = array(
$keys[0] => $this->getId(),
- $keys[1] => $this->getCode(),
+ $keys[1] => $this->getName(),
$keys[2] => $this->getSecured(),
- $keys[3] => $this->getRef(),
- $keys[4] => $this->getCreatedAt(),
- $keys[5] => $this->getUpdatedAt(),
- $keys[6] => $this->getVersion(),
- $keys[7] => $this->getVersionCreatedAt(),
- $keys[8] => $this->getVersionCreatedBy(),
+ $keys[3] => $this->getCreatedAt(),
+ $keys[4] => $this->getUpdatedAt(),
+ $keys[5] => $this->getVersion(),
+ $keys[6] => $this->getVersionCreatedAt(),
+ $keys[7] => $this->getVersionCreatedBy(),
);
$virtualColumns = $this->virtualColumns;
foreach($virtualColumns as $key => $virtualColumn)
@@ -1248,27 +1197,24 @@ abstract class MessageVersion implements ActiveRecordInterface
$this->setId($value);
break;
case 1:
- $this->setCode($value);
+ $this->setName($value);
break;
case 2:
$this->setSecured($value);
break;
case 3:
- $this->setRef($value);
- break;
- case 4:
$this->setCreatedAt($value);
break;
- case 5:
+ case 4:
$this->setUpdatedAt($value);
break;
- case 6:
+ case 5:
$this->setVersion($value);
break;
- case 7:
+ case 6:
$this->setVersionCreatedAt($value);
break;
- case 8:
+ case 7:
$this->setVersionCreatedBy($value);
break;
} // switch()
@@ -1296,14 +1242,13 @@ abstract class MessageVersion implements ActiveRecordInterface
$keys = MessageVersionTableMap::getFieldNames($keyType);
if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
- if (array_key_exists($keys[1], $arr)) $this->setCode($arr[$keys[1]]);
+ if (array_key_exists($keys[1], $arr)) $this->setName($arr[$keys[1]]);
if (array_key_exists($keys[2], $arr)) $this->setSecured($arr[$keys[2]]);
- if (array_key_exists($keys[3], $arr)) $this->setRef($arr[$keys[3]]);
- if (array_key_exists($keys[4], $arr)) $this->setCreatedAt($arr[$keys[4]]);
- if (array_key_exists($keys[5], $arr)) $this->setUpdatedAt($arr[$keys[5]]);
- if (array_key_exists($keys[6], $arr)) $this->setVersion($arr[$keys[6]]);
- if (array_key_exists($keys[7], $arr)) $this->setVersionCreatedAt($arr[$keys[7]]);
- if (array_key_exists($keys[8], $arr)) $this->setVersionCreatedBy($arr[$keys[8]]);
+ if (array_key_exists($keys[3], $arr)) $this->setCreatedAt($arr[$keys[3]]);
+ if (array_key_exists($keys[4], $arr)) $this->setUpdatedAt($arr[$keys[4]]);
+ if (array_key_exists($keys[5], $arr)) $this->setVersion($arr[$keys[5]]);
+ if (array_key_exists($keys[6], $arr)) $this->setVersionCreatedAt($arr[$keys[6]]);
+ if (array_key_exists($keys[7], $arr)) $this->setVersionCreatedBy($arr[$keys[7]]);
}
/**
@@ -1316,9 +1261,8 @@ abstract class MessageVersion implements ActiveRecordInterface
$criteria = new Criteria(MessageVersionTableMap::DATABASE_NAME);
if ($this->isColumnModified(MessageVersionTableMap::ID)) $criteria->add(MessageVersionTableMap::ID, $this->id);
- if ($this->isColumnModified(MessageVersionTableMap::CODE)) $criteria->add(MessageVersionTableMap::CODE, $this->code);
+ if ($this->isColumnModified(MessageVersionTableMap::NAME)) $criteria->add(MessageVersionTableMap::NAME, $this->name);
if ($this->isColumnModified(MessageVersionTableMap::SECURED)) $criteria->add(MessageVersionTableMap::SECURED, $this->secured);
- if ($this->isColumnModified(MessageVersionTableMap::REF)) $criteria->add(MessageVersionTableMap::REF, $this->ref);
if ($this->isColumnModified(MessageVersionTableMap::CREATED_AT)) $criteria->add(MessageVersionTableMap::CREATED_AT, $this->created_at);
if ($this->isColumnModified(MessageVersionTableMap::UPDATED_AT)) $criteria->add(MessageVersionTableMap::UPDATED_AT, $this->updated_at);
if ($this->isColumnModified(MessageVersionTableMap::VERSION)) $criteria->add(MessageVersionTableMap::VERSION, $this->version);
@@ -1395,9 +1339,8 @@ abstract class MessageVersion implements ActiveRecordInterface
public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
{
$copyObj->setId($this->getId());
- $copyObj->setCode($this->getCode());
+ $copyObj->setName($this->getName());
$copyObj->setSecured($this->getSecured());
- $copyObj->setRef($this->getRef());
$copyObj->setCreatedAt($this->getCreatedAt());
$copyObj->setUpdatedAt($this->getUpdatedAt());
$copyObj->setVersion($this->getVersion());
@@ -1487,9 +1430,8 @@ abstract class MessageVersion implements ActiveRecordInterface
public function clear()
{
$this->id = null;
- $this->code = null;
+ $this->name = null;
$this->secured = null;
- $this->ref = null;
$this->created_at = null;
$this->updated_at = null;
$this->version = null;
diff --git a/core/lib/Thelia/Model/Base/MessageVersionQuery.php b/core/lib/Thelia/Model/Base/MessageVersionQuery.php
index ac9b0ece0..088234eb5 100755
--- a/core/lib/Thelia/Model/Base/MessageVersionQuery.php
+++ b/core/lib/Thelia/Model/Base/MessageVersionQuery.php
@@ -22,9 +22,8 @@ use Thelia\Model\Map\MessageVersionTableMap;
*
*
* @method ChildMessageVersionQuery orderById($order = Criteria::ASC) Order by the id column
- * @method ChildMessageVersionQuery orderByCode($order = Criteria::ASC) Order by the code column
+ * @method ChildMessageVersionQuery orderByName($order = Criteria::ASC) Order by the name column
* @method ChildMessageVersionQuery orderBySecured($order = Criteria::ASC) Order by the secured column
- * @method ChildMessageVersionQuery orderByRef($order = Criteria::ASC) Order by the ref column
* @method ChildMessageVersionQuery orderByCreatedAt($order = Criteria::ASC) Order by the created_at column
* @method ChildMessageVersionQuery orderByUpdatedAt($order = Criteria::ASC) Order by the updated_at column
* @method ChildMessageVersionQuery orderByVersion($order = Criteria::ASC) Order by the version column
@@ -32,9 +31,8 @@ use Thelia\Model\Map\MessageVersionTableMap;
* @method ChildMessageVersionQuery orderByVersionCreatedBy($order = Criteria::ASC) Order by the version_created_by column
*
* @method ChildMessageVersionQuery groupById() Group by the id column
- * @method ChildMessageVersionQuery groupByCode() Group by the code column
+ * @method ChildMessageVersionQuery groupByName() Group by the name column
* @method ChildMessageVersionQuery groupBySecured() Group by the secured column
- * @method ChildMessageVersionQuery groupByRef() Group by the ref column
* @method ChildMessageVersionQuery groupByCreatedAt() Group by the created_at column
* @method ChildMessageVersionQuery groupByUpdatedAt() Group by the updated_at column
* @method ChildMessageVersionQuery groupByVersion() Group by the version column
@@ -53,9 +51,8 @@ use Thelia\Model\Map\MessageVersionTableMap;
* @method ChildMessageVersion findOneOrCreate(ConnectionInterface $con = null) Return the first ChildMessageVersion matching the query, or a new ChildMessageVersion object populated from the query conditions when no match is found
*
* @method ChildMessageVersion findOneById(int $id) Return the first ChildMessageVersion filtered by the id column
- * @method ChildMessageVersion findOneByCode(string $code) Return the first ChildMessageVersion filtered by the code column
+ * @method ChildMessageVersion findOneByName(string $name) Return the first ChildMessageVersion filtered by the name column
* @method ChildMessageVersion findOneBySecured(int $secured) Return the first ChildMessageVersion filtered by the secured column
- * @method ChildMessageVersion findOneByRef(string $ref) Return the first ChildMessageVersion filtered by the ref column
* @method ChildMessageVersion findOneByCreatedAt(string $created_at) Return the first ChildMessageVersion filtered by the created_at column
* @method ChildMessageVersion findOneByUpdatedAt(string $updated_at) Return the first ChildMessageVersion filtered by the updated_at column
* @method ChildMessageVersion findOneByVersion(int $version) Return the first ChildMessageVersion filtered by the version column
@@ -63,9 +60,8 @@ use Thelia\Model\Map\MessageVersionTableMap;
* @method ChildMessageVersion findOneByVersionCreatedBy(string $version_created_by) Return the first ChildMessageVersion filtered by the version_created_by column
*
* @method array findById(int $id) Return ChildMessageVersion objects filtered by the id column
- * @method array findByCode(string $code) Return ChildMessageVersion objects filtered by the code column
+ * @method array findByName(string $name) Return ChildMessageVersion objects filtered by the name column
* @method array findBySecured(int $secured) Return ChildMessageVersion objects filtered by the secured column
- * @method array findByRef(string $ref) Return ChildMessageVersion objects filtered by the ref column
* @method array findByCreatedAt(string $created_at) Return ChildMessageVersion objects filtered by the created_at column
* @method array findByUpdatedAt(string $updated_at) Return ChildMessageVersion objects filtered by the updated_at column
* @method array findByVersion(int $version) Return ChildMessageVersion objects filtered by the version column
@@ -159,7 +155,7 @@ abstract class MessageVersionQuery extends ModelCriteria
*/
protected function findPkSimple($key, $con)
{
- $sql = 'SELECT ID, CODE, SECURED, REF, CREATED_AT, UPDATED_AT, VERSION, VERSION_CREATED_AT, VERSION_CREATED_BY FROM message_version WHERE ID = :p0 AND VERSION = :p1';
+ $sql = 'SELECT ID, NAME, SECURED, CREATED_AT, UPDATED_AT, VERSION, VERSION_CREATED_AT, VERSION_CREATED_BY FROM message_version WHERE ID = :p0 AND VERSION = :p1';
try {
$stmt = $con->prepare($sql);
$stmt->bindValue(':p0', $key[0], PDO::PARAM_INT);
@@ -304,32 +300,32 @@ abstract class MessageVersionQuery extends ModelCriteria
}
/**
- * Filter the query on the code column
+ * Filter the query on the name column
*
* Example usage:
*
- * $query->filterByCode('fooValue'); // WHERE code = 'fooValue'
- * $query->filterByCode('%fooValue%'); // WHERE code LIKE '%fooValue%'
+ * $query->filterByName('fooValue'); // WHERE name = 'fooValue'
+ * $query->filterByName('%fooValue%'); // WHERE name LIKE '%fooValue%'
*
*
- * @param string $code The value to use as filter.
+ * @param string $name The value to use as filter.
* Accepts wildcards (* and % trigger a LIKE)
* @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
*
* @return ChildMessageVersionQuery The current query, for fluid interface
*/
- public function filterByCode($code = null, $comparison = null)
+ public function filterByName($name = null, $comparison = null)
{
if (null === $comparison) {
- if (is_array($code)) {
+ if (is_array($name)) {
$comparison = Criteria::IN;
- } elseif (preg_match('/[\%\*]/', $code)) {
- $code = str_replace('*', '%', $code);
+ } elseif (preg_match('/[\%\*]/', $name)) {
+ $name = str_replace('*', '%', $name);
$comparison = Criteria::LIKE;
}
}
- return $this->addUsingAlias(MessageVersionTableMap::CODE, $code, $comparison);
+ return $this->addUsingAlias(MessageVersionTableMap::NAME, $name, $comparison);
}
/**
@@ -373,35 +369,6 @@ abstract class MessageVersionQuery extends ModelCriteria
return $this->addUsingAlias(MessageVersionTableMap::SECURED, $secured, $comparison);
}
- /**
- * Filter the query on the ref column
- *
- * Example usage:
- *
- * $query->filterByRef('fooValue'); // WHERE ref = 'fooValue'
- * $query->filterByRef('%fooValue%'); // WHERE ref LIKE '%fooValue%'
- *
- *
- * @param string $ref The value to use as filter.
- * Accepts wildcards (* and % trigger a LIKE)
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildMessageVersionQuery The current query, for fluid interface
- */
- public function filterByRef($ref = null, $comparison = null)
- {
- if (null === $comparison) {
- if (is_array($ref)) {
- $comparison = Criteria::IN;
- } elseif (preg_match('/[\%\*]/', $ref)) {
- $ref = str_replace('*', '%', $ref);
- $comparison = Criteria::LIKE;
- }
- }
-
- return $this->addUsingAlias(MessageVersionTableMap::REF, $ref, $comparison);
- }
-
/**
* Filter the query on the created_at column
*
diff --git a/core/lib/Thelia/Model/Base/Module.php b/core/lib/Thelia/Model/Base/Module.php
index 76c391207..556ef9ff6 100755
--- a/core/lib/Thelia/Model/Base/Module.php
+++ b/core/lib/Thelia/Model/Base/Module.php
@@ -127,7 +127,7 @@ abstract class Module implements ActiveRecordInterface
* Current locale
* @var string
*/
- protected $currentLocale = 'en_EN';
+ protected $currentLocale = 'en_US';
/**
* Current translation objects
@@ -1910,7 +1910,7 @@ abstract class Module implements ActiveRecordInterface
} // if ($deep)
// i18n behavior
- $this->currentLocale = 'en_EN';
+ $this->currentLocale = 'en_US';
$this->currentTranslations = null;
if ($this->collGroupModules instanceof Collection) {
@@ -1956,7 +1956,7 @@ abstract class Module implements ActiveRecordInterface
*
* @return ChildModule The current object (for fluent API support)
*/
- public function setLocale($locale = 'en_EN')
+ public function setLocale($locale = 'en_US')
{
$this->currentLocale = $locale;
@@ -1980,7 +1980,7 @@ abstract class Module implements ActiveRecordInterface
* @param ConnectionInterface $con an optional connection object
*
* @return ChildModuleI18n */
- public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null)
+ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null)
{
if (!isset($this->currentTranslations[$locale])) {
if (null !== $this->collModuleI18ns) {
@@ -2015,7 +2015,7 @@ abstract class Module implements ActiveRecordInterface
*
* @return ChildModule The current object (for fluent API support)
*/
- public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null)
+ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null)
{
if (!$this->isNew()) {
ChildModuleI18nQuery::create()
diff --git a/core/lib/Thelia/Model/Base/ModuleI18n.php b/core/lib/Thelia/Model/Base/ModuleI18n.php
index d31dda0ba..9c7d603d1 100755
--- a/core/lib/Thelia/Model/Base/ModuleI18n.php
+++ b/core/lib/Thelia/Model/Base/ModuleI18n.php
@@ -61,7 +61,7 @@ abstract class ModuleI18n implements ActiveRecordInterface
/**
* The value for the locale field.
- * Note: this column has a database default value of: 'en_EN'
+ * Note: this column has a database default value of: 'en_US'
* @var string
*/
protected $locale;
@@ -111,7 +111,7 @@ abstract class ModuleI18n implements ActiveRecordInterface
*/
public function applyDefaultValues()
{
- $this->locale = 'en_EN';
+ $this->locale = 'en_US';
}
/**
@@ -576,7 +576,7 @@ abstract class ModuleI18n implements ActiveRecordInterface
*/
public function hasOnlyDefaultValues()
{
- if ($this->locale !== 'en_EN') {
+ if ($this->locale !== 'en_US') {
return false;
}
diff --git a/core/lib/Thelia/Model/Base/ModuleQuery.php b/core/lib/Thelia/Model/Base/ModuleQuery.php
index 7db21ca22..e1bd9de68 100755
--- a/core/lib/Thelia/Model/Base/ModuleQuery.php
+++ b/core/lib/Thelia/Model/Base/ModuleQuery.php
@@ -838,7 +838,7 @@ abstract class ModuleQuery extends ModelCriteria
*
* @return ChildModuleQuery The current query, for fluid interface
*/
- public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
{
$relationName = $relationAlias ? $relationAlias : 'ModuleI18n';
@@ -856,7 +856,7 @@ abstract class ModuleQuery extends ModelCriteria
*
* @return ChildModuleQuery The current query, for fluid interface
*/
- public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN)
+ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN)
{
$this
->joinI18n($locale, null, $joinType)
@@ -877,7 +877,7 @@ abstract class ModuleQuery extends ModelCriteria
*
* @return ChildModuleI18nQuery A secondary query class using the current class as primary query
*/
- public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
{
return $this
->joinI18n($locale, $relationAlias, $joinType)
diff --git a/core/lib/Thelia/Model/Base/OrderStatus.php b/core/lib/Thelia/Model/Base/OrderStatus.php
index 99bb87879..d249b4865 100755
--- a/core/lib/Thelia/Model/Base/OrderStatus.php
+++ b/core/lib/Thelia/Model/Base/OrderStatus.php
@@ -109,7 +109,7 @@ abstract class OrderStatus implements ActiveRecordInterface
* Current locale
* @var string
*/
- protected $currentLocale = 'en_EN';
+ protected $currentLocale = 'en_US';
/**
* Current translation objects
@@ -1812,7 +1812,7 @@ abstract class OrderStatus implements ActiveRecordInterface
} // if ($deep)
// i18n behavior
- $this->currentLocale = 'en_EN';
+ $this->currentLocale = 'en_US';
$this->currentTranslations = null;
if ($this->collOrders instanceof Collection) {
@@ -1858,7 +1858,7 @@ abstract class OrderStatus implements ActiveRecordInterface
*
* @return ChildOrderStatus The current object (for fluent API support)
*/
- public function setLocale($locale = 'en_EN')
+ public function setLocale($locale = 'en_US')
{
$this->currentLocale = $locale;
@@ -1882,7 +1882,7 @@ abstract class OrderStatus implements ActiveRecordInterface
* @param ConnectionInterface $con an optional connection object
*
* @return ChildOrderStatusI18n */
- public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null)
+ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null)
{
if (!isset($this->currentTranslations[$locale])) {
if (null !== $this->collOrderStatusI18ns) {
@@ -1917,7 +1917,7 @@ abstract class OrderStatus implements ActiveRecordInterface
*
* @return ChildOrderStatus The current object (for fluent API support)
*/
- public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null)
+ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null)
{
if (!$this->isNew()) {
ChildOrderStatusI18nQuery::create()
diff --git a/core/lib/Thelia/Model/Base/OrderStatusI18n.php b/core/lib/Thelia/Model/Base/OrderStatusI18n.php
index 249944854..2946cc55b 100755
--- a/core/lib/Thelia/Model/Base/OrderStatusI18n.php
+++ b/core/lib/Thelia/Model/Base/OrderStatusI18n.php
@@ -61,7 +61,7 @@ abstract class OrderStatusI18n implements ActiveRecordInterface
/**
* The value for the locale field.
- * Note: this column has a database default value of: 'en_EN'
+ * Note: this column has a database default value of: 'en_US'
* @var string
*/
protected $locale;
@@ -111,7 +111,7 @@ abstract class OrderStatusI18n implements ActiveRecordInterface
*/
public function applyDefaultValues()
{
- $this->locale = 'en_EN';
+ $this->locale = 'en_US';
}
/**
@@ -576,7 +576,7 @@ abstract class OrderStatusI18n implements ActiveRecordInterface
*/
public function hasOnlyDefaultValues()
{
- if ($this->locale !== 'en_EN') {
+ if ($this->locale !== 'en_US') {
return false;
}
diff --git a/core/lib/Thelia/Model/Base/OrderStatusQuery.php b/core/lib/Thelia/Model/Base/OrderStatusQuery.php
index 07fcdb8dc..908efd6b6 100755
--- a/core/lib/Thelia/Model/Base/OrderStatusQuery.php
+++ b/core/lib/Thelia/Model/Base/OrderStatusQuery.php
@@ -703,7 +703,7 @@ abstract class OrderStatusQuery extends ModelCriteria
*
* @return ChildOrderStatusQuery The current query, for fluid interface
*/
- public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
{
$relationName = $relationAlias ? $relationAlias : 'OrderStatusI18n';
@@ -721,7 +721,7 @@ abstract class OrderStatusQuery extends ModelCriteria
*
* @return ChildOrderStatusQuery The current query, for fluid interface
*/
- public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN)
+ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN)
{
$this
->joinI18n($locale, null, $joinType)
@@ -742,7 +742,7 @@ abstract class OrderStatusQuery extends ModelCriteria
*
* @return ChildOrderStatusI18nQuery A secondary query class using the current class as primary query
*/
- public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
{
return $this
->joinI18n($locale, $relationAlias, $joinType)
diff --git a/core/lib/Thelia/Model/Base/Product.php b/core/lib/Thelia/Model/Base/Product.php
index af5b7319d..f7457d47b 100755
--- a/core/lib/Thelia/Model/Base/Product.php
+++ b/core/lib/Thelia/Model/Base/Product.php
@@ -242,7 +242,7 @@ abstract class Product implements ActiveRecordInterface
* Current locale
* @var string
*/
- protected $currentLocale = 'en_EN';
+ protected $currentLocale = 'en_US';
/**
* Current translation objects
@@ -5447,7 +5447,7 @@ abstract class Product implements ActiveRecordInterface
} // if ($deep)
// i18n behavior
- $this->currentLocale = 'en_EN';
+ $this->currentLocale = 'en_US';
$this->currentTranslations = null;
if ($this->collProductCategories instanceof Collection) {
@@ -5542,7 +5542,7 @@ abstract class Product implements ActiveRecordInterface
*
* @return ChildProduct The current object (for fluent API support)
*/
- public function setLocale($locale = 'en_EN')
+ public function setLocale($locale = 'en_US')
{
$this->currentLocale = $locale;
@@ -5566,7 +5566,7 @@ abstract class Product implements ActiveRecordInterface
* @param ConnectionInterface $con an optional connection object
*
* @return ChildProductI18n */
- public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null)
+ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null)
{
if (!isset($this->currentTranslations[$locale])) {
if (null !== $this->collProductI18ns) {
@@ -5601,7 +5601,7 @@ abstract class Product implements ActiveRecordInterface
*
* @return ChildProduct The current object (for fluent API support)
*/
- public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null)
+ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null)
{
if (!$this->isNew()) {
ChildProductI18nQuery::create()
diff --git a/core/lib/Thelia/Model/Base/ProductDocument.php b/core/lib/Thelia/Model/Base/ProductDocument.php
index 96a584dab..4223679c1 100755
--- a/core/lib/Thelia/Model/Base/ProductDocument.php
+++ b/core/lib/Thelia/Model/Base/ProductDocument.php
@@ -120,7 +120,7 @@ abstract class ProductDocument implements ActiveRecordInterface
* Current locale
* @var string
*/
- protected $currentLocale = 'en_EN';
+ protected $currentLocale = 'en_US';
/**
* Current translation objects
@@ -1640,7 +1640,7 @@ abstract class ProductDocument implements ActiveRecordInterface
} // if ($deep)
// i18n behavior
- $this->currentLocale = 'en_EN';
+ $this->currentLocale = 'en_US';
$this->currentTranslations = null;
if ($this->collProductDocumentI18ns instanceof Collection) {
@@ -1683,7 +1683,7 @@ abstract class ProductDocument implements ActiveRecordInterface
*
* @return ChildProductDocument The current object (for fluent API support)
*/
- public function setLocale($locale = 'en_EN')
+ public function setLocale($locale = 'en_US')
{
$this->currentLocale = $locale;
@@ -1707,7 +1707,7 @@ abstract class ProductDocument implements ActiveRecordInterface
* @param ConnectionInterface $con an optional connection object
*
* @return ChildProductDocumentI18n */
- public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null)
+ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null)
{
if (!isset($this->currentTranslations[$locale])) {
if (null !== $this->collProductDocumentI18ns) {
@@ -1742,7 +1742,7 @@ abstract class ProductDocument implements ActiveRecordInterface
*
* @return ChildProductDocument The current object (for fluent API support)
*/
- public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null)
+ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null)
{
if (!$this->isNew()) {
ChildProductDocumentI18nQuery::create()
diff --git a/core/lib/Thelia/Model/Base/ProductDocumentI18n.php b/core/lib/Thelia/Model/Base/ProductDocumentI18n.php
index ba04b5ccc..1a6017966 100755
--- a/core/lib/Thelia/Model/Base/ProductDocumentI18n.php
+++ b/core/lib/Thelia/Model/Base/ProductDocumentI18n.php
@@ -61,7 +61,7 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface
/**
* The value for the locale field.
- * Note: this column has a database default value of: 'en_EN'
+ * Note: this column has a database default value of: 'en_US'
* @var string
*/
protected $locale;
@@ -111,7 +111,7 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface
*/
public function applyDefaultValues()
{
- $this->locale = 'en_EN';
+ $this->locale = 'en_US';
}
/**
@@ -576,7 +576,7 @@ abstract class ProductDocumentI18n implements ActiveRecordInterface
*/
public function hasOnlyDefaultValues()
{
- if ($this->locale !== 'en_EN') {
+ if ($this->locale !== 'en_US') {
return false;
}
diff --git a/core/lib/Thelia/Model/Base/ProductDocumentQuery.php b/core/lib/Thelia/Model/Base/ProductDocumentQuery.php
index 32321554d..06af05a9c 100755
--- a/core/lib/Thelia/Model/Base/ProductDocumentQuery.php
+++ b/core/lib/Thelia/Model/Base/ProductDocumentQuery.php
@@ -797,7 +797,7 @@ abstract class ProductDocumentQuery extends ModelCriteria
*
* @return ChildProductDocumentQuery The current query, for fluid interface
*/
- public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
{
$relationName = $relationAlias ? $relationAlias : 'ProductDocumentI18n';
@@ -815,7 +815,7 @@ abstract class ProductDocumentQuery extends ModelCriteria
*
* @return ChildProductDocumentQuery The current query, for fluid interface
*/
- public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN)
+ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN)
{
$this
->joinI18n($locale, null, $joinType)
@@ -836,7 +836,7 @@ abstract class ProductDocumentQuery extends ModelCriteria
*
* @return ChildProductDocumentI18nQuery A secondary query class using the current class as primary query
*/
- public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
{
return $this
->joinI18n($locale, $relationAlias, $joinType)
diff --git a/core/lib/Thelia/Model/Base/ProductI18n.php b/core/lib/Thelia/Model/Base/ProductI18n.php
index ee7514fd4..3ef14e787 100755
--- a/core/lib/Thelia/Model/Base/ProductI18n.php
+++ b/core/lib/Thelia/Model/Base/ProductI18n.php
@@ -61,7 +61,7 @@ abstract class ProductI18n implements ActiveRecordInterface
/**
* The value for the locale field.
- * Note: this column has a database default value of: 'en_EN'
+ * Note: this column has a database default value of: 'en_US'
* @var string
*/
protected $locale;
@@ -111,7 +111,7 @@ abstract class ProductI18n implements ActiveRecordInterface
*/
public function applyDefaultValues()
{
- $this->locale = 'en_EN';
+ $this->locale = 'en_US';
}
/**
@@ -576,7 +576,7 @@ abstract class ProductI18n implements ActiveRecordInterface
*/
public function hasOnlyDefaultValues()
{
- if ($this->locale !== 'en_EN') {
+ if ($this->locale !== 'en_US') {
return false;
}
diff --git a/core/lib/Thelia/Model/Base/ProductImage.php b/core/lib/Thelia/Model/Base/ProductImage.php
index 152a298a5..a54d22cd0 100755
--- a/core/lib/Thelia/Model/Base/ProductImage.php
+++ b/core/lib/Thelia/Model/Base/ProductImage.php
@@ -120,7 +120,7 @@ abstract class ProductImage implements ActiveRecordInterface
* Current locale
* @var string
*/
- protected $currentLocale = 'en_EN';
+ protected $currentLocale = 'en_US';
/**
* Current translation objects
@@ -1640,7 +1640,7 @@ abstract class ProductImage implements ActiveRecordInterface
} // if ($deep)
// i18n behavior
- $this->currentLocale = 'en_EN';
+ $this->currentLocale = 'en_US';
$this->currentTranslations = null;
if ($this->collProductImageI18ns instanceof Collection) {
@@ -1683,7 +1683,7 @@ abstract class ProductImage implements ActiveRecordInterface
*
* @return ChildProductImage The current object (for fluent API support)
*/
- public function setLocale($locale = 'en_EN')
+ public function setLocale($locale = 'en_US')
{
$this->currentLocale = $locale;
@@ -1707,7 +1707,7 @@ abstract class ProductImage implements ActiveRecordInterface
* @param ConnectionInterface $con an optional connection object
*
* @return ChildProductImageI18n */
- public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null)
+ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null)
{
if (!isset($this->currentTranslations[$locale])) {
if (null !== $this->collProductImageI18ns) {
@@ -1742,7 +1742,7 @@ abstract class ProductImage implements ActiveRecordInterface
*
* @return ChildProductImage The current object (for fluent API support)
*/
- public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null)
+ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null)
{
if (!$this->isNew()) {
ChildProductImageI18nQuery::create()
diff --git a/core/lib/Thelia/Model/Base/ProductImageI18n.php b/core/lib/Thelia/Model/Base/ProductImageI18n.php
index c84f99af2..679ded79c 100755
--- a/core/lib/Thelia/Model/Base/ProductImageI18n.php
+++ b/core/lib/Thelia/Model/Base/ProductImageI18n.php
@@ -61,7 +61,7 @@ abstract class ProductImageI18n implements ActiveRecordInterface
/**
* The value for the locale field.
- * Note: this column has a database default value of: 'en_EN'
+ * Note: this column has a database default value of: 'en_US'
* @var string
*/
protected $locale;
@@ -111,7 +111,7 @@ abstract class ProductImageI18n implements ActiveRecordInterface
*/
public function applyDefaultValues()
{
- $this->locale = 'en_EN';
+ $this->locale = 'en_US';
}
/**
@@ -576,7 +576,7 @@ abstract class ProductImageI18n implements ActiveRecordInterface
*/
public function hasOnlyDefaultValues()
{
- if ($this->locale !== 'en_EN') {
+ if ($this->locale !== 'en_US') {
return false;
}
diff --git a/core/lib/Thelia/Model/Base/ProductImageQuery.php b/core/lib/Thelia/Model/Base/ProductImageQuery.php
index e351c6f40..94cb1b361 100755
--- a/core/lib/Thelia/Model/Base/ProductImageQuery.php
+++ b/core/lib/Thelia/Model/Base/ProductImageQuery.php
@@ -797,7 +797,7 @@ abstract class ProductImageQuery extends ModelCriteria
*
* @return ChildProductImageQuery The current query, for fluid interface
*/
- public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
{
$relationName = $relationAlias ? $relationAlias : 'ProductImageI18n';
@@ -815,7 +815,7 @@ abstract class ProductImageQuery extends ModelCriteria
*
* @return ChildProductImageQuery The current query, for fluid interface
*/
- public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN)
+ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN)
{
$this
->joinI18n($locale, null, $joinType)
@@ -836,7 +836,7 @@ abstract class ProductImageQuery extends ModelCriteria
*
* @return ChildProductImageI18nQuery A secondary query class using the current class as primary query
*/
- public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
{
return $this
->joinI18n($locale, $relationAlias, $joinType)
diff --git a/core/lib/Thelia/Model/Base/ProductQuery.php b/core/lib/Thelia/Model/Base/ProductQuery.php
index 3254bb08b..75f05dfcf 100755
--- a/core/lib/Thelia/Model/Base/ProductQuery.php
+++ b/core/lib/Thelia/Model/Base/ProductQuery.php
@@ -1795,7 +1795,7 @@ abstract class ProductQuery extends ModelCriteria
*
* @return ChildProductQuery The current query, for fluid interface
*/
- public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
{
$relationName = $relationAlias ? $relationAlias : 'ProductI18n';
@@ -1813,7 +1813,7 @@ abstract class ProductQuery extends ModelCriteria
*
* @return ChildProductQuery The current query, for fluid interface
*/
- public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN)
+ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN)
{
$this
->joinI18n($locale, null, $joinType)
@@ -1834,7 +1834,7 @@ abstract class ProductQuery extends ModelCriteria
*
* @return ChildProductI18nQuery A secondary query class using the current class as primary query
*/
- public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
{
return $this
->joinI18n($locale, $relationAlias, $joinType)
diff --git a/core/lib/Thelia/Model/Base/Resource.php b/core/lib/Thelia/Model/Base/Resource.php
index b513ea326..5a51bdc29 100755
--- a/core/lib/Thelia/Model/Base/Resource.php
+++ b/core/lib/Thelia/Model/Base/Resource.php
@@ -116,7 +116,7 @@ abstract class Resource implements ActiveRecordInterface
* Current locale
* @var string
*/
- protected $currentLocale = 'en_EN';
+ protected $currentLocale = 'en_US';
/**
* Current translation objects
@@ -1968,7 +1968,7 @@ abstract class Resource implements ActiveRecordInterface
} // if ($deep)
// i18n behavior
- $this->currentLocale = 'en_EN';
+ $this->currentLocale = 'en_US';
$this->currentTranslations = null;
if ($this->collGroupResources instanceof Collection) {
@@ -2018,7 +2018,7 @@ abstract class Resource implements ActiveRecordInterface
*
* @return ChildResource The current object (for fluent API support)
*/
- public function setLocale($locale = 'en_EN')
+ public function setLocale($locale = 'en_US')
{
$this->currentLocale = $locale;
@@ -2042,7 +2042,7 @@ abstract class Resource implements ActiveRecordInterface
* @param ConnectionInterface $con an optional connection object
*
* @return ChildResourceI18n */
- public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null)
+ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null)
{
if (!isset($this->currentTranslations[$locale])) {
if (null !== $this->collResourceI18ns) {
@@ -2077,7 +2077,7 @@ abstract class Resource implements ActiveRecordInterface
*
* @return ChildResource The current object (for fluent API support)
*/
- public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null)
+ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null)
{
if (!$this->isNew()) {
ChildResourceI18nQuery::create()
diff --git a/core/lib/Thelia/Model/Base/ResourceI18n.php b/core/lib/Thelia/Model/Base/ResourceI18n.php
index 4419f7fc8..ac9ca106f 100755
--- a/core/lib/Thelia/Model/Base/ResourceI18n.php
+++ b/core/lib/Thelia/Model/Base/ResourceI18n.php
@@ -61,7 +61,7 @@ abstract class ResourceI18n implements ActiveRecordInterface
/**
* The value for the locale field.
- * Note: this column has a database default value of: 'en_EN'
+ * Note: this column has a database default value of: 'en_US'
* @var string
*/
protected $locale;
@@ -111,7 +111,7 @@ abstract class ResourceI18n implements ActiveRecordInterface
*/
public function applyDefaultValues()
{
- $this->locale = 'en_EN';
+ $this->locale = 'en_US';
}
/**
@@ -576,7 +576,7 @@ abstract class ResourceI18n implements ActiveRecordInterface
*/
public function hasOnlyDefaultValues()
{
- if ($this->locale !== 'en_EN') {
+ if ($this->locale !== 'en_US') {
return false;
}
diff --git a/core/lib/Thelia/Model/Base/ResourceQuery.php b/core/lib/Thelia/Model/Base/ResourceQuery.php
index e12ee8f53..6559d6522 100755
--- a/core/lib/Thelia/Model/Base/ResourceQuery.php
+++ b/core/lib/Thelia/Model/Base/ResourceQuery.php
@@ -720,7 +720,7 @@ abstract class ResourceQuery extends ModelCriteria
*
* @return ChildResourceQuery The current query, for fluid interface
*/
- public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
{
$relationName = $relationAlias ? $relationAlias : 'ResourceI18n';
@@ -738,7 +738,7 @@ abstract class ResourceQuery extends ModelCriteria
*
* @return ChildResourceQuery The current query, for fluid interface
*/
- public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN)
+ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN)
{
$this
->joinI18n($locale, null, $joinType)
@@ -759,7 +759,7 @@ abstract class ResourceQuery extends ModelCriteria
*
* @return ChildResourceI18nQuery A secondary query class using the current class as primary query
*/
- public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
{
return $this
->joinI18n($locale, $relationAlias, $joinType)
diff --git a/core/lib/Thelia/Model/Base/Tax.php b/core/lib/Thelia/Model/Base/Tax.php
index c1ddbf23a..02e6bc3b0 100755
--- a/core/lib/Thelia/Model/Base/Tax.php
+++ b/core/lib/Thelia/Model/Base/Tax.php
@@ -109,7 +109,7 @@ abstract class Tax implements ActiveRecordInterface
* Current locale
* @var string
*/
- protected $currentLocale = 'en_EN';
+ protected $currentLocale = 'en_US';
/**
* Current translation objects
@@ -1762,7 +1762,7 @@ abstract class Tax implements ActiveRecordInterface
} // if ($deep)
// i18n behavior
- $this->currentLocale = 'en_EN';
+ $this->currentLocale = 'en_US';
$this->currentTranslations = null;
if ($this->collTaxRuleCountries instanceof Collection) {
@@ -1808,7 +1808,7 @@ abstract class Tax implements ActiveRecordInterface
*
* @return ChildTax The current object (for fluent API support)
*/
- public function setLocale($locale = 'en_EN')
+ public function setLocale($locale = 'en_US')
{
$this->currentLocale = $locale;
@@ -1832,7 +1832,7 @@ abstract class Tax implements ActiveRecordInterface
* @param ConnectionInterface $con an optional connection object
*
* @return ChildTaxI18n */
- public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null)
+ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null)
{
if (!isset($this->currentTranslations[$locale])) {
if (null !== $this->collTaxI18ns) {
@@ -1867,7 +1867,7 @@ abstract class Tax implements ActiveRecordInterface
*
* @return ChildTax The current object (for fluent API support)
*/
- public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null)
+ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null)
{
if (!$this->isNew()) {
ChildTaxI18nQuery::create()
diff --git a/core/lib/Thelia/Model/Base/TaxI18n.php b/core/lib/Thelia/Model/Base/TaxI18n.php
index a066fe4a8..abb659135 100755
--- a/core/lib/Thelia/Model/Base/TaxI18n.php
+++ b/core/lib/Thelia/Model/Base/TaxI18n.php
@@ -61,7 +61,7 @@ abstract class TaxI18n implements ActiveRecordInterface
/**
* The value for the locale field.
- * Note: this column has a database default value of: 'en_EN'
+ * Note: this column has a database default value of: 'en_US'
* @var string
*/
protected $locale;
@@ -99,7 +99,7 @@ abstract class TaxI18n implements ActiveRecordInterface
*/
public function applyDefaultValues()
{
- $this->locale = 'en_EN';
+ $this->locale = 'en_US';
}
/**
@@ -500,7 +500,7 @@ abstract class TaxI18n implements ActiveRecordInterface
*/
public function hasOnlyDefaultValues()
{
- if ($this->locale !== 'en_EN') {
+ if ($this->locale !== 'en_US') {
return false;
}
diff --git a/core/lib/Thelia/Model/Base/TaxQuery.php b/core/lib/Thelia/Model/Base/TaxQuery.php
index 0a61cbb3c..307ace57c 100755
--- a/core/lib/Thelia/Model/Base/TaxQuery.php
+++ b/core/lib/Thelia/Model/Base/TaxQuery.php
@@ -715,7 +715,7 @@ abstract class TaxQuery extends ModelCriteria
*
* @return ChildTaxQuery The current query, for fluid interface
*/
- public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
{
$relationName = $relationAlias ? $relationAlias : 'TaxI18n';
@@ -733,7 +733,7 @@ abstract class TaxQuery extends ModelCriteria
*
* @return ChildTaxQuery The current query, for fluid interface
*/
- public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN)
+ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN)
{
$this
->joinI18n($locale, null, $joinType)
@@ -754,7 +754,7 @@ abstract class TaxQuery extends ModelCriteria
*
* @return ChildTaxI18nQuery A secondary query class using the current class as primary query
*/
- public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
{
return $this
->joinI18n($locale, $relationAlias, $joinType)
diff --git a/core/lib/Thelia/Model/Base/TaxRule.php b/core/lib/Thelia/Model/Base/TaxRule.php
index e363541d7..d33d47e2b 100755
--- a/core/lib/Thelia/Model/Base/TaxRule.php
+++ b/core/lib/Thelia/Model/Base/TaxRule.php
@@ -129,7 +129,7 @@ abstract class TaxRule implements ActiveRecordInterface
* Current locale
* @var string
*/
- protected $currentLocale = 'en_EN';
+ protected $currentLocale = 'en_US';
/**
* Current translation objects
@@ -2146,7 +2146,7 @@ abstract class TaxRule implements ActiveRecordInterface
} // if ($deep)
// i18n behavior
- $this->currentLocale = 'en_EN';
+ $this->currentLocale = 'en_US';
$this->currentTranslations = null;
if ($this->collProducts instanceof Collection) {
@@ -2196,7 +2196,7 @@ abstract class TaxRule implements ActiveRecordInterface
*
* @return ChildTaxRule The current object (for fluent API support)
*/
- public function setLocale($locale = 'en_EN')
+ public function setLocale($locale = 'en_US')
{
$this->currentLocale = $locale;
@@ -2220,7 +2220,7 @@ abstract class TaxRule implements ActiveRecordInterface
* @param ConnectionInterface $con an optional connection object
*
* @return ChildTaxRuleI18n */
- public function getTranslation($locale = 'en_EN', ConnectionInterface $con = null)
+ public function getTranslation($locale = 'en_US', ConnectionInterface $con = null)
{
if (!isset($this->currentTranslations[$locale])) {
if (null !== $this->collTaxRuleI18ns) {
@@ -2255,7 +2255,7 @@ abstract class TaxRule implements ActiveRecordInterface
*
* @return ChildTaxRule The current object (for fluent API support)
*/
- public function removeTranslation($locale = 'en_EN', ConnectionInterface $con = null)
+ public function removeTranslation($locale = 'en_US', ConnectionInterface $con = null)
{
if (!$this->isNew()) {
ChildTaxRuleI18nQuery::create()
diff --git a/core/lib/Thelia/Model/Base/TaxRuleI18n.php b/core/lib/Thelia/Model/Base/TaxRuleI18n.php
index f685dd3cc..b1efadd6a 100755
--- a/core/lib/Thelia/Model/Base/TaxRuleI18n.php
+++ b/core/lib/Thelia/Model/Base/TaxRuleI18n.php
@@ -61,7 +61,7 @@ abstract class TaxRuleI18n implements ActiveRecordInterface
/**
* The value for the locale field.
- * Note: this column has a database default value of: 'en_EN'
+ * Note: this column has a database default value of: 'en_US'
* @var string
*/
protected $locale;
@@ -87,7 +87,7 @@ abstract class TaxRuleI18n implements ActiveRecordInterface
*/
public function applyDefaultValues()
{
- $this->locale = 'en_EN';
+ $this->locale = 'en_US';
}
/**
@@ -424,7 +424,7 @@ abstract class TaxRuleI18n implements ActiveRecordInterface
*/
public function hasOnlyDefaultValues()
{
- if ($this->locale !== 'en_EN') {
+ if ($this->locale !== 'en_US') {
return false;
}
diff --git a/core/lib/Thelia/Model/Base/TaxRuleQuery.php b/core/lib/Thelia/Model/Base/TaxRuleQuery.php
index 36f2edd99..2fb478b7a 100755
--- a/core/lib/Thelia/Model/Base/TaxRuleQuery.php
+++ b/core/lib/Thelia/Model/Base/TaxRuleQuery.php
@@ -846,7 +846,7 @@ abstract class TaxRuleQuery extends ModelCriteria
*
* @return ChildTaxRuleQuery The current query, for fluid interface
*/
- public function joinI18n($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+ public function joinI18n($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
{
$relationName = $relationAlias ? $relationAlias : 'TaxRuleI18n';
@@ -864,7 +864,7 @@ abstract class TaxRuleQuery extends ModelCriteria
*
* @return ChildTaxRuleQuery The current query, for fluid interface
*/
- public function joinWithI18n($locale = 'en_EN', $joinType = Criteria::LEFT_JOIN)
+ public function joinWithI18n($locale = 'en_US', $joinType = Criteria::LEFT_JOIN)
{
$this
->joinI18n($locale, null, $joinType)
@@ -885,7 +885,7 @@ abstract class TaxRuleQuery extends ModelCriteria
*
* @return ChildTaxRuleI18nQuery A secondary query class using the current class as primary query
*/
- public function useI18nQuery($locale = 'en_EN', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+ public function useI18nQuery($locale = 'en_US', $relationAlias = null, $joinType = Criteria::LEFT_JOIN)
{
return $this
->joinI18n($locale, $relationAlias, $joinType)
diff --git a/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php b/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php
index 14fc79eeb..02a20540e 100755
--- a/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/AttributeAvI18nTableMap.php
@@ -151,7 +151,7 @@ class AttributeAvI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'attribute_av', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/AttributeAvTableMap.php b/core/lib/Thelia/Model/Map/AttributeAvTableMap.php
index 138f0fa9c..0c5c2e1c9 100755
--- a/core/lib/Thelia/Model/Map/AttributeAvTableMap.php
+++ b/core/lib/Thelia/Model/Map/AttributeAvTableMap.php
@@ -106,7 +106,7 @@ class AttributeAvTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php b/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php
index b60cae5b8..8471d3e26 100755
--- a/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/AttributeI18nTableMap.php
@@ -151,7 +151,7 @@ class AttributeI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'attribute', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/AttributeTableMap.php b/core/lib/Thelia/Model/Map/AttributeTableMap.php
index dca811cbc..773e13cab 100755
--- a/core/lib/Thelia/Model/Map/AttributeTableMap.php
+++ b/core/lib/Thelia/Model/Map/AttributeTableMap.php
@@ -101,7 +101,7 @@ class AttributeTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/CategoryDocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/CategoryDocumentI18nTableMap.php
index 1ad7dfe2f..956afae4a 100755
--- a/core/lib/Thelia/Model/Map/CategoryDocumentI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/CategoryDocumentI18nTableMap.php
@@ -151,7 +151,7 @@ class CategoryDocumentI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'category_document', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/CategoryDocumentTableMap.php b/core/lib/Thelia/Model/Map/CategoryDocumentTableMap.php
index 83e748a1e..8b307ea1e 100755
--- a/core/lib/Thelia/Model/Map/CategoryDocumentTableMap.php
+++ b/core/lib/Thelia/Model/Map/CategoryDocumentTableMap.php
@@ -111,7 +111,7 @@ class CategoryDocumentTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php b/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php
index 1611b2ebf..8c52aa7b2 100755
--- a/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/CategoryI18nTableMap.php
@@ -151,7 +151,7 @@ class CategoryI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'category', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/CategoryImageI18nTableMap.php b/core/lib/Thelia/Model/Map/CategoryImageI18nTableMap.php
index 1c59c9db2..1d27e16ad 100755
--- a/core/lib/Thelia/Model/Map/CategoryImageI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/CategoryImageI18nTableMap.php
@@ -151,7 +151,7 @@ class CategoryImageI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'category_image', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/CategoryImageTableMap.php b/core/lib/Thelia/Model/Map/CategoryImageTableMap.php
index 9eafe2ade..1c7694d05 100755
--- a/core/lib/Thelia/Model/Map/CategoryImageTableMap.php
+++ b/core/lib/Thelia/Model/Map/CategoryImageTableMap.php
@@ -111,7 +111,7 @@ class CategoryImageTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/CategoryTableMap.php b/core/lib/Thelia/Model/Map/CategoryTableMap.php
index 5e692c00f..6a2d052a1 100755
--- a/core/lib/Thelia/Model/Map/CategoryTableMap.php
+++ b/core/lib/Thelia/Model/Map/CategoryTableMap.php
@@ -126,7 +126,7 @@ class CategoryTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php b/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php
index a83f87b76..b953b0ac9 100755
--- a/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/ConfigI18nTableMap.php
@@ -151,7 +151,7 @@ class ConfigI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'config', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/ConfigTableMap.php b/core/lib/Thelia/Model/Map/ConfigTableMap.php
index 8bd68a964..ebd5d6edf 100755
--- a/core/lib/Thelia/Model/Map/ConfigTableMap.php
+++ b/core/lib/Thelia/Model/Map/ConfigTableMap.php
@@ -116,7 +116,7 @@ class ConfigTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/ContentDocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/ContentDocumentI18nTableMap.php
index a6ff890d7..7ebde93e6 100755
--- a/core/lib/Thelia/Model/Map/ContentDocumentI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/ContentDocumentI18nTableMap.php
@@ -151,7 +151,7 @@ class ContentDocumentI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'content_document', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/ContentDocumentTableMap.php b/core/lib/Thelia/Model/Map/ContentDocumentTableMap.php
index 4344b70ae..3d876a570 100755
--- a/core/lib/Thelia/Model/Map/ContentDocumentTableMap.php
+++ b/core/lib/Thelia/Model/Map/ContentDocumentTableMap.php
@@ -111,7 +111,7 @@ class ContentDocumentTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/ContentI18nTableMap.php b/core/lib/Thelia/Model/Map/ContentI18nTableMap.php
index ee9122a6c..f718623b0 100755
--- a/core/lib/Thelia/Model/Map/ContentI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/ContentI18nTableMap.php
@@ -151,7 +151,7 @@ class ContentI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'content', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/ContentImageI18nTableMap.php b/core/lib/Thelia/Model/Map/ContentImageI18nTableMap.php
index 6ff343d16..759349d27 100755
--- a/core/lib/Thelia/Model/Map/ContentImageI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/ContentImageI18nTableMap.php
@@ -151,7 +151,7 @@ class ContentImageI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'content_image', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/ContentImageTableMap.php b/core/lib/Thelia/Model/Map/ContentImageTableMap.php
index c95761ab2..f731c51a8 100755
--- a/core/lib/Thelia/Model/Map/ContentImageTableMap.php
+++ b/core/lib/Thelia/Model/Map/ContentImageTableMap.php
@@ -111,7 +111,7 @@ class ContentImageTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/ContentTableMap.php b/core/lib/Thelia/Model/Map/ContentTableMap.php
index f89e7fd20..ae9b908c0 100755
--- a/core/lib/Thelia/Model/Map/ContentTableMap.php
+++ b/core/lib/Thelia/Model/Map/ContentTableMap.php
@@ -121,7 +121,7 @@ class ContentTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/CountryI18nTableMap.php b/core/lib/Thelia/Model/Map/CountryI18nTableMap.php
index cc60b09d2..272231464 100755
--- a/core/lib/Thelia/Model/Map/CountryI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/CountryI18nTableMap.php
@@ -151,7 +151,7 @@ class CountryI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'country', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/CountryTableMap.php b/core/lib/Thelia/Model/Map/CountryTableMap.php
index 2e4931e37..e7c356f08 100755
--- a/core/lib/Thelia/Model/Map/CountryTableMap.php
+++ b/core/lib/Thelia/Model/Map/CountryTableMap.php
@@ -116,7 +116,7 @@ class CountryTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/CouponI18nTableMap.php b/core/lib/Thelia/Model/Map/CouponI18nTableMap.php
index 99d49216c..5718d6a74 100644
--- a/core/lib/Thelia/Model/Map/CouponI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/CouponI18nTableMap.php
@@ -131,7 +131,7 @@ class CouponI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'coupon', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
} // initialize()
/**
diff --git a/core/lib/Thelia/Model/Map/CouponTableMap.php b/core/lib/Thelia/Model/Map/CouponTableMap.php
index d3ba620bf..0daa3b0ed 100755
--- a/core/lib/Thelia/Model/Map/CouponTableMap.php
+++ b/core/lib/Thelia/Model/Map/CouponTableMap.php
@@ -171,7 +171,7 @@ class CouponTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/CurrencyI18nTableMap.php b/core/lib/Thelia/Model/Map/CurrencyI18nTableMap.php
index d280f8601..c7e4725c1 100755
--- a/core/lib/Thelia/Model/Map/CurrencyI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/CurrencyI18nTableMap.php
@@ -136,7 +136,7 @@ class CurrencyI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'currency', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('NAME', 'Name', 'VARCHAR', false, 45, null);
} // initialize()
diff --git a/core/lib/Thelia/Model/Map/CurrencyTableMap.php b/core/lib/Thelia/Model/Map/CurrencyTableMap.php
index 08ecf6966..b37a6b30a 100755
--- a/core/lib/Thelia/Model/Map/CurrencyTableMap.php
+++ b/core/lib/Thelia/Model/Map/CurrencyTableMap.php
@@ -121,7 +121,7 @@ class CurrencyTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php b/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php
index d403756fa..5344099c5 100755
--- a/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/CustomerTitleI18nTableMap.php
@@ -141,7 +141,7 @@ class CustomerTitleI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'customer_title', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('SHORT', 'Short', 'VARCHAR', false, 10, null);
$this->addColumn('LONG', 'Long', 'VARCHAR', false, 45, null);
} // initialize()
diff --git a/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php b/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php
index 2769f365e..c10ce2500 100755
--- a/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php
+++ b/core/lib/Thelia/Model/Map/CustomerTitleTableMap.php
@@ -106,7 +106,7 @@ class CustomerTitleTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php b/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php
index b3114e7ba..ba592b4b0 100755
--- a/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/FeatureAvI18nTableMap.php
@@ -151,7 +151,7 @@ class FeatureAvI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'feature_av', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/FeatureAvTableMap.php b/core/lib/Thelia/Model/Map/FeatureAvTableMap.php
index 0559f7ce6..4dd944bb7 100755
--- a/core/lib/Thelia/Model/Map/FeatureAvTableMap.php
+++ b/core/lib/Thelia/Model/Map/FeatureAvTableMap.php
@@ -106,7 +106,7 @@ class FeatureAvTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php b/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php
index af0dfc263..dba05fb67 100755
--- a/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/FeatureI18nTableMap.php
@@ -151,7 +151,7 @@ class FeatureI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'feature', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/FeatureTableMap.php b/core/lib/Thelia/Model/Map/FeatureTableMap.php
index 7d0af0d45..76c2fe724 100755
--- a/core/lib/Thelia/Model/Map/FeatureTableMap.php
+++ b/core/lib/Thelia/Model/Map/FeatureTableMap.php
@@ -106,7 +106,7 @@ class FeatureTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/FolderDocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/FolderDocumentI18nTableMap.php
index 5875031fb..28dab9d8f 100755
--- a/core/lib/Thelia/Model/Map/FolderDocumentI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/FolderDocumentI18nTableMap.php
@@ -151,7 +151,7 @@ class FolderDocumentI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'folder_document', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/FolderDocumentTableMap.php b/core/lib/Thelia/Model/Map/FolderDocumentTableMap.php
index 467b7a65b..1d0e3b74a 100755
--- a/core/lib/Thelia/Model/Map/FolderDocumentTableMap.php
+++ b/core/lib/Thelia/Model/Map/FolderDocumentTableMap.php
@@ -111,7 +111,7 @@ class FolderDocumentTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/FolderI18nTableMap.php b/core/lib/Thelia/Model/Map/FolderI18nTableMap.php
index fc85b17ec..d10344811 100755
--- a/core/lib/Thelia/Model/Map/FolderI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/FolderI18nTableMap.php
@@ -151,7 +151,7 @@ class FolderI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'folder', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/FolderImageI18nTableMap.php b/core/lib/Thelia/Model/Map/FolderImageI18nTableMap.php
index 1c89165a4..f0f87fd85 100755
--- a/core/lib/Thelia/Model/Map/FolderImageI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/FolderImageI18nTableMap.php
@@ -151,7 +151,7 @@ class FolderImageI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'folder_image', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/FolderImageTableMap.php b/core/lib/Thelia/Model/Map/FolderImageTableMap.php
index c559f9437..6dc186658 100755
--- a/core/lib/Thelia/Model/Map/FolderImageTableMap.php
+++ b/core/lib/Thelia/Model/Map/FolderImageTableMap.php
@@ -111,7 +111,7 @@ class FolderImageTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/FolderTableMap.php b/core/lib/Thelia/Model/Map/FolderTableMap.php
index 7f4dde6d0..b35f63ae3 100755
--- a/core/lib/Thelia/Model/Map/FolderTableMap.php
+++ b/core/lib/Thelia/Model/Map/FolderTableMap.php
@@ -126,7 +126,7 @@ class FolderTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/GroupI18nTableMap.php b/core/lib/Thelia/Model/Map/GroupI18nTableMap.php
index 585127821..57788593a 100755
--- a/core/lib/Thelia/Model/Map/GroupI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/GroupI18nTableMap.php
@@ -151,7 +151,7 @@ class GroupI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'group', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/GroupTableMap.php b/core/lib/Thelia/Model/Map/GroupTableMap.php
index a8c830005..881a2fa84 100755
--- a/core/lib/Thelia/Model/Map/GroupTableMap.php
+++ b/core/lib/Thelia/Model/Map/GroupTableMap.php
@@ -101,7 +101,7 @@ class GroupTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/MessageI18nTableMap.php b/core/lib/Thelia/Model/Map/MessageI18nTableMap.php
index f084515c0..ea5d69766 100755
--- a/core/lib/Thelia/Model/Map/MessageI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/MessageI18nTableMap.php
@@ -57,7 +57,7 @@ class MessageI18nTableMap extends TableMap
/**
* The total number of columns
*/
- const NUM_COLUMNS = 5;
+ const NUM_COLUMNS = 6;
/**
* The number of lazy-loaded columns
@@ -67,7 +67,7 @@ class MessageI18nTableMap extends TableMap
/**
* The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
*/
- const NUM_HYDRATE_COLUMNS = 5;
+ const NUM_HYDRATE_COLUMNS = 6;
/**
* the column name for the ID field
@@ -85,14 +85,19 @@ class MessageI18nTableMap extends TableMap
const TITLE = 'message_i18n.TITLE';
/**
- * the column name for the DESCRIPTION field
+ * the column name for the SUBJECT field
*/
- const DESCRIPTION = 'message_i18n.DESCRIPTION';
+ const SUBJECT = 'message_i18n.SUBJECT';
/**
- * the column name for the DESCRIPTION_HTML field
+ * the column name for the TEXT_MESSAGE field
*/
- const DESCRIPTION_HTML = 'message_i18n.DESCRIPTION_HTML';
+ const TEXT_MESSAGE = 'message_i18n.TEXT_MESSAGE';
+
+ /**
+ * the column name for the HTML_MESSAGE field
+ */
+ const HTML_MESSAGE = 'message_i18n.HTML_MESSAGE';
/**
* The default string format for model objects of the related table
@@ -106,12 +111,12 @@ class MessageI18nTableMap extends TableMap
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
protected static $fieldNames = array (
- self::TYPE_PHPNAME => array('Id', 'Locale', 'Title', 'Description', 'DescriptionHtml', ),
- self::TYPE_STUDLYPHPNAME => array('id', 'locale', 'title', 'description', 'descriptionHtml', ),
- self::TYPE_COLNAME => array(MessageI18nTableMap::ID, MessageI18nTableMap::LOCALE, MessageI18nTableMap::TITLE, MessageI18nTableMap::DESCRIPTION, MessageI18nTableMap::DESCRIPTION_HTML, ),
- self::TYPE_RAW_COLNAME => array('ID', 'LOCALE', 'TITLE', 'DESCRIPTION', 'DESCRIPTION_HTML', ),
- self::TYPE_FIELDNAME => array('id', 'locale', 'title', 'description', 'description_html', ),
- self::TYPE_NUM => array(0, 1, 2, 3, 4, )
+ self::TYPE_PHPNAME => array('Id', 'Locale', 'Title', 'Subject', 'TextMessage', 'HtmlMessage', ),
+ self::TYPE_STUDLYPHPNAME => array('id', 'locale', 'title', 'subject', 'textMessage', 'htmlMessage', ),
+ self::TYPE_COLNAME => array(MessageI18nTableMap::ID, MessageI18nTableMap::LOCALE, MessageI18nTableMap::TITLE, MessageI18nTableMap::SUBJECT, MessageI18nTableMap::TEXT_MESSAGE, MessageI18nTableMap::HTML_MESSAGE, ),
+ self::TYPE_RAW_COLNAME => array('ID', 'LOCALE', 'TITLE', 'SUBJECT', 'TEXT_MESSAGE', 'HTML_MESSAGE', ),
+ self::TYPE_FIELDNAME => array('id', 'locale', 'title', 'subject', 'text_message', 'html_message', ),
+ self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, )
);
/**
@@ -121,12 +126,12 @@ class MessageI18nTableMap extends TableMap
* e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
*/
protected static $fieldKeys = array (
- self::TYPE_PHPNAME => array('Id' => 0, 'Locale' => 1, 'Title' => 2, 'Description' => 3, 'DescriptionHtml' => 4, ),
- self::TYPE_STUDLYPHPNAME => array('id' => 0, 'locale' => 1, 'title' => 2, 'description' => 3, 'descriptionHtml' => 4, ),
- self::TYPE_COLNAME => array(MessageI18nTableMap::ID => 0, MessageI18nTableMap::LOCALE => 1, MessageI18nTableMap::TITLE => 2, MessageI18nTableMap::DESCRIPTION => 3, MessageI18nTableMap::DESCRIPTION_HTML => 4, ),
- self::TYPE_RAW_COLNAME => array('ID' => 0, 'LOCALE' => 1, 'TITLE' => 2, 'DESCRIPTION' => 3, 'DESCRIPTION_HTML' => 4, ),
- self::TYPE_FIELDNAME => array('id' => 0, 'locale' => 1, 'title' => 2, 'description' => 3, 'description_html' => 4, ),
- self::TYPE_NUM => array(0, 1, 2, 3, 4, )
+ self::TYPE_PHPNAME => array('Id' => 0, 'Locale' => 1, 'Title' => 2, 'Subject' => 3, 'TextMessage' => 4, 'HtmlMessage' => 5, ),
+ self::TYPE_STUDLYPHPNAME => array('id' => 0, 'locale' => 1, 'title' => 2, 'subject' => 3, 'textMessage' => 4, 'htmlMessage' => 5, ),
+ self::TYPE_COLNAME => array(MessageI18nTableMap::ID => 0, MessageI18nTableMap::LOCALE => 1, MessageI18nTableMap::TITLE => 2, MessageI18nTableMap::SUBJECT => 3, MessageI18nTableMap::TEXT_MESSAGE => 4, MessageI18nTableMap::HTML_MESSAGE => 5, ),
+ self::TYPE_RAW_COLNAME => array('ID' => 0, 'LOCALE' => 1, 'TITLE' => 2, 'SUBJECT' => 3, 'TEXT_MESSAGE' => 4, 'HTML_MESSAGE' => 5, ),
+ self::TYPE_FIELDNAME => array('id' => 0, 'locale' => 1, 'title' => 2, 'subject' => 3, 'text_message' => 4, 'html_message' => 5, ),
+ self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, )
);
/**
@@ -146,10 +151,11 @@ class MessageI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'message', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'LONGVARCHAR', false, null, null);
- $this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
- $this->addColumn('DESCRIPTION_HTML', 'DescriptionHtml', 'CLOB', false, null, null);
+ $this->addColumn('SUBJECT', 'Subject', 'LONGVARCHAR', false, null, null);
+ $this->addColumn('TEXT_MESSAGE', 'TextMessage', 'CLOB', false, null, null);
+ $this->addColumn('HTML_MESSAGE', 'HtmlMessage', 'CLOB', false, null, null);
} // initialize()
/**
@@ -350,14 +356,16 @@ class MessageI18nTableMap extends TableMap
$criteria->addSelectColumn(MessageI18nTableMap::ID);
$criteria->addSelectColumn(MessageI18nTableMap::LOCALE);
$criteria->addSelectColumn(MessageI18nTableMap::TITLE);
- $criteria->addSelectColumn(MessageI18nTableMap::DESCRIPTION);
- $criteria->addSelectColumn(MessageI18nTableMap::DESCRIPTION_HTML);
+ $criteria->addSelectColumn(MessageI18nTableMap::SUBJECT);
+ $criteria->addSelectColumn(MessageI18nTableMap::TEXT_MESSAGE);
+ $criteria->addSelectColumn(MessageI18nTableMap::HTML_MESSAGE);
} else {
$criteria->addSelectColumn($alias . '.ID');
$criteria->addSelectColumn($alias . '.LOCALE');
$criteria->addSelectColumn($alias . '.TITLE');
- $criteria->addSelectColumn($alias . '.DESCRIPTION');
- $criteria->addSelectColumn($alias . '.DESCRIPTION_HTML');
+ $criteria->addSelectColumn($alias . '.SUBJECT');
+ $criteria->addSelectColumn($alias . '.TEXT_MESSAGE');
+ $criteria->addSelectColumn($alias . '.HTML_MESSAGE');
}
}
diff --git a/core/lib/Thelia/Model/Map/MessageTableMap.php b/core/lib/Thelia/Model/Map/MessageTableMap.php
index de2a205f9..d56b1210c 100755
--- a/core/lib/Thelia/Model/Map/MessageTableMap.php
+++ b/core/lib/Thelia/Model/Map/MessageTableMap.php
@@ -57,7 +57,7 @@ class MessageTableMap extends TableMap
/**
* The total number of columns
*/
- const NUM_COLUMNS = 9;
+ const NUM_COLUMNS = 8;
/**
* The number of lazy-loaded columns
@@ -67,7 +67,7 @@ class MessageTableMap extends TableMap
/**
* The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
*/
- const NUM_HYDRATE_COLUMNS = 9;
+ const NUM_HYDRATE_COLUMNS = 8;
/**
* the column name for the ID field
@@ -75,20 +75,15 @@ class MessageTableMap extends TableMap
const ID = 'message.ID';
/**
- * the column name for the CODE field
+ * the column name for the NAME field
*/
- const CODE = 'message.CODE';
+ const NAME = 'message.NAME';
/**
* the column name for the SECURED field
*/
const SECURED = 'message.SECURED';
- /**
- * the column name for the REF field
- */
- const REF = 'message.REF';
-
/**
* the column name for the CREATED_AT field
*/
@@ -126,7 +121,7 @@ class MessageTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
@@ -135,12 +130,12 @@ class MessageTableMap extends TableMap
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
protected static $fieldNames = array (
- self::TYPE_PHPNAME => array('Id', 'Code', 'Secured', 'Ref', 'CreatedAt', 'UpdatedAt', 'Version', 'VersionCreatedAt', 'VersionCreatedBy', ),
- self::TYPE_STUDLYPHPNAME => array('id', 'code', 'secured', 'ref', 'createdAt', 'updatedAt', 'version', 'versionCreatedAt', 'versionCreatedBy', ),
- self::TYPE_COLNAME => array(MessageTableMap::ID, MessageTableMap::CODE, MessageTableMap::SECURED, MessageTableMap::REF, MessageTableMap::CREATED_AT, MessageTableMap::UPDATED_AT, MessageTableMap::VERSION, MessageTableMap::VERSION_CREATED_AT, MessageTableMap::VERSION_CREATED_BY, ),
- self::TYPE_RAW_COLNAME => array('ID', 'CODE', 'SECURED', 'REF', 'CREATED_AT', 'UPDATED_AT', 'VERSION', 'VERSION_CREATED_AT', 'VERSION_CREATED_BY', ),
- self::TYPE_FIELDNAME => array('id', 'code', 'secured', 'ref', 'created_at', 'updated_at', 'version', 'version_created_at', 'version_created_by', ),
- self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, )
+ self::TYPE_PHPNAME => array('Id', 'Name', 'Secured', 'CreatedAt', 'UpdatedAt', 'Version', 'VersionCreatedAt', 'VersionCreatedBy', ),
+ self::TYPE_STUDLYPHPNAME => array('id', 'name', 'secured', 'createdAt', 'updatedAt', 'version', 'versionCreatedAt', 'versionCreatedBy', ),
+ self::TYPE_COLNAME => array(MessageTableMap::ID, MessageTableMap::NAME, MessageTableMap::SECURED, MessageTableMap::CREATED_AT, MessageTableMap::UPDATED_AT, MessageTableMap::VERSION, MessageTableMap::VERSION_CREATED_AT, MessageTableMap::VERSION_CREATED_BY, ),
+ self::TYPE_RAW_COLNAME => array('ID', 'NAME', 'SECURED', 'CREATED_AT', 'UPDATED_AT', 'VERSION', 'VERSION_CREATED_AT', 'VERSION_CREATED_BY', ),
+ self::TYPE_FIELDNAME => array('id', 'name', 'secured', 'created_at', 'updated_at', 'version', 'version_created_at', 'version_created_by', ),
+ self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, )
);
/**
@@ -150,12 +145,12 @@ class MessageTableMap extends TableMap
* e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
*/
protected static $fieldKeys = array (
- self::TYPE_PHPNAME => array('Id' => 0, 'Code' => 1, 'Secured' => 2, 'Ref' => 3, 'CreatedAt' => 4, 'UpdatedAt' => 5, 'Version' => 6, 'VersionCreatedAt' => 7, 'VersionCreatedBy' => 8, ),
- self::TYPE_STUDLYPHPNAME => array('id' => 0, 'code' => 1, 'secured' => 2, 'ref' => 3, 'createdAt' => 4, 'updatedAt' => 5, 'version' => 6, 'versionCreatedAt' => 7, 'versionCreatedBy' => 8, ),
- self::TYPE_COLNAME => array(MessageTableMap::ID => 0, MessageTableMap::CODE => 1, MessageTableMap::SECURED => 2, MessageTableMap::REF => 3, MessageTableMap::CREATED_AT => 4, MessageTableMap::UPDATED_AT => 5, MessageTableMap::VERSION => 6, MessageTableMap::VERSION_CREATED_AT => 7, MessageTableMap::VERSION_CREATED_BY => 8, ),
- self::TYPE_RAW_COLNAME => array('ID' => 0, 'CODE' => 1, 'SECURED' => 2, 'REF' => 3, 'CREATED_AT' => 4, 'UPDATED_AT' => 5, 'VERSION' => 6, 'VERSION_CREATED_AT' => 7, 'VERSION_CREATED_BY' => 8, ),
- self::TYPE_FIELDNAME => array('id' => 0, 'code' => 1, 'secured' => 2, 'ref' => 3, 'created_at' => 4, 'updated_at' => 5, 'version' => 6, 'version_created_at' => 7, 'version_created_by' => 8, ),
- self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, )
+ self::TYPE_PHPNAME => array('Id' => 0, 'Name' => 1, 'Secured' => 2, 'CreatedAt' => 3, 'UpdatedAt' => 4, 'Version' => 5, 'VersionCreatedAt' => 6, 'VersionCreatedBy' => 7, ),
+ self::TYPE_STUDLYPHPNAME => array('id' => 0, 'name' => 1, 'secured' => 2, 'createdAt' => 3, 'updatedAt' => 4, 'version' => 5, 'versionCreatedAt' => 6, 'versionCreatedBy' => 7, ),
+ self::TYPE_COLNAME => array(MessageTableMap::ID => 0, MessageTableMap::NAME => 1, MessageTableMap::SECURED => 2, MessageTableMap::CREATED_AT => 3, MessageTableMap::UPDATED_AT => 4, MessageTableMap::VERSION => 5, MessageTableMap::VERSION_CREATED_AT => 6, MessageTableMap::VERSION_CREATED_BY => 7, ),
+ self::TYPE_RAW_COLNAME => array('ID' => 0, 'NAME' => 1, 'SECURED' => 2, 'CREATED_AT' => 3, 'UPDATED_AT' => 4, 'VERSION' => 5, 'VERSION_CREATED_AT' => 6, 'VERSION_CREATED_BY' => 7, ),
+ self::TYPE_FIELDNAME => array('id' => 0, 'name' => 1, 'secured' => 2, 'created_at' => 3, 'updated_at' => 4, 'version' => 5, 'version_created_at' => 6, 'version_created_by' => 7, ),
+ self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, )
);
/**
@@ -175,9 +170,8 @@ class MessageTableMap extends TableMap
$this->setUseIdGenerator(true);
// columns
$this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
- $this->addColumn('CODE', 'Code', 'VARCHAR', true, 45, null);
+ $this->addColumn('NAME', 'Name', 'VARCHAR', true, 255, null);
$this->addColumn('SECURED', 'Secured', 'TINYINT', false, null, null);
- $this->addColumn('REF', 'Ref', 'VARCHAR', false, 255, null);
$this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
$this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
$this->addColumn('VERSION', 'Version', 'INTEGER', false, null, 0);
@@ -204,7 +198,7 @@ class MessageTableMap extends TableMap
{
return array(
'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ),
- 'i18n' => array('i18n_table' => '%TABLE%_i18n', 'i18n_phpname' => '%PHPNAME%I18n', 'i18n_columns' => 'title, description, description_html', 'locale_column' => 'locale', 'locale_length' => '5', 'default_locale' => '', 'locale_alias' => '', ),
+ 'i18n' => array('i18n_table' => '%TABLE%_i18n', 'i18n_phpname' => '%PHPNAME%I18n', 'i18n_columns' => 'title, subject, text_message, html_message', 'locale_column' => 'locale', 'locale_length' => '5', 'default_locale' => '', 'locale_alias' => '', ),
'versionable' => array('version_column' => 'version', 'version_table' => '', 'log_created_at' => 'true', 'log_created_by' => 'true', 'log_comment' => 'false', 'version_created_at_column' => 'version_created_at', 'version_created_by_column' => 'version_created_by', 'version_comment_column' => 'version_comment', ),
);
} // getBehaviors()
@@ -358,9 +352,8 @@ class MessageTableMap extends TableMap
{
if (null === $alias) {
$criteria->addSelectColumn(MessageTableMap::ID);
- $criteria->addSelectColumn(MessageTableMap::CODE);
+ $criteria->addSelectColumn(MessageTableMap::NAME);
$criteria->addSelectColumn(MessageTableMap::SECURED);
- $criteria->addSelectColumn(MessageTableMap::REF);
$criteria->addSelectColumn(MessageTableMap::CREATED_AT);
$criteria->addSelectColumn(MessageTableMap::UPDATED_AT);
$criteria->addSelectColumn(MessageTableMap::VERSION);
@@ -368,9 +361,8 @@ class MessageTableMap extends TableMap
$criteria->addSelectColumn(MessageTableMap::VERSION_CREATED_BY);
} else {
$criteria->addSelectColumn($alias . '.ID');
- $criteria->addSelectColumn($alias . '.CODE');
+ $criteria->addSelectColumn($alias . '.NAME');
$criteria->addSelectColumn($alias . '.SECURED');
- $criteria->addSelectColumn($alias . '.REF');
$criteria->addSelectColumn($alias . '.CREATED_AT');
$criteria->addSelectColumn($alias . '.UPDATED_AT');
$criteria->addSelectColumn($alias . '.VERSION');
diff --git a/core/lib/Thelia/Model/Map/MessageVersionTableMap.php b/core/lib/Thelia/Model/Map/MessageVersionTableMap.php
index f6587e60a..db043cdc5 100755
--- a/core/lib/Thelia/Model/Map/MessageVersionTableMap.php
+++ b/core/lib/Thelia/Model/Map/MessageVersionTableMap.php
@@ -57,7 +57,7 @@ class MessageVersionTableMap extends TableMap
/**
* The total number of columns
*/
- const NUM_COLUMNS = 9;
+ const NUM_COLUMNS = 8;
/**
* The number of lazy-loaded columns
@@ -67,7 +67,7 @@ class MessageVersionTableMap extends TableMap
/**
* The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
*/
- const NUM_HYDRATE_COLUMNS = 9;
+ const NUM_HYDRATE_COLUMNS = 8;
/**
* the column name for the ID field
@@ -75,20 +75,15 @@ class MessageVersionTableMap extends TableMap
const ID = 'message_version.ID';
/**
- * the column name for the CODE field
+ * the column name for the NAME field
*/
- const CODE = 'message_version.CODE';
+ const NAME = 'message_version.NAME';
/**
* the column name for the SECURED field
*/
const SECURED = 'message_version.SECURED';
- /**
- * the column name for the REF field
- */
- const REF = 'message_version.REF';
-
/**
* the column name for the CREATED_AT field
*/
@@ -126,12 +121,12 @@ class MessageVersionTableMap extends TableMap
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
protected static $fieldNames = array (
- self::TYPE_PHPNAME => array('Id', 'Code', 'Secured', 'Ref', 'CreatedAt', 'UpdatedAt', 'Version', 'VersionCreatedAt', 'VersionCreatedBy', ),
- self::TYPE_STUDLYPHPNAME => array('id', 'code', 'secured', 'ref', 'createdAt', 'updatedAt', 'version', 'versionCreatedAt', 'versionCreatedBy', ),
- self::TYPE_COLNAME => array(MessageVersionTableMap::ID, MessageVersionTableMap::CODE, MessageVersionTableMap::SECURED, MessageVersionTableMap::REF, MessageVersionTableMap::CREATED_AT, MessageVersionTableMap::UPDATED_AT, MessageVersionTableMap::VERSION, MessageVersionTableMap::VERSION_CREATED_AT, MessageVersionTableMap::VERSION_CREATED_BY, ),
- self::TYPE_RAW_COLNAME => array('ID', 'CODE', 'SECURED', 'REF', 'CREATED_AT', 'UPDATED_AT', 'VERSION', 'VERSION_CREATED_AT', 'VERSION_CREATED_BY', ),
- self::TYPE_FIELDNAME => array('id', 'code', 'secured', 'ref', 'created_at', 'updated_at', 'version', 'version_created_at', 'version_created_by', ),
- self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, )
+ self::TYPE_PHPNAME => array('Id', 'Name', 'Secured', 'CreatedAt', 'UpdatedAt', 'Version', 'VersionCreatedAt', 'VersionCreatedBy', ),
+ self::TYPE_STUDLYPHPNAME => array('id', 'name', 'secured', 'createdAt', 'updatedAt', 'version', 'versionCreatedAt', 'versionCreatedBy', ),
+ self::TYPE_COLNAME => array(MessageVersionTableMap::ID, MessageVersionTableMap::NAME, MessageVersionTableMap::SECURED, MessageVersionTableMap::CREATED_AT, MessageVersionTableMap::UPDATED_AT, MessageVersionTableMap::VERSION, MessageVersionTableMap::VERSION_CREATED_AT, MessageVersionTableMap::VERSION_CREATED_BY, ),
+ self::TYPE_RAW_COLNAME => array('ID', 'NAME', 'SECURED', 'CREATED_AT', 'UPDATED_AT', 'VERSION', 'VERSION_CREATED_AT', 'VERSION_CREATED_BY', ),
+ self::TYPE_FIELDNAME => array('id', 'name', 'secured', 'created_at', 'updated_at', 'version', 'version_created_at', 'version_created_by', ),
+ self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, )
);
/**
@@ -141,12 +136,12 @@ class MessageVersionTableMap extends TableMap
* e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
*/
protected static $fieldKeys = array (
- self::TYPE_PHPNAME => array('Id' => 0, 'Code' => 1, 'Secured' => 2, 'Ref' => 3, 'CreatedAt' => 4, 'UpdatedAt' => 5, 'Version' => 6, 'VersionCreatedAt' => 7, 'VersionCreatedBy' => 8, ),
- self::TYPE_STUDLYPHPNAME => array('id' => 0, 'code' => 1, 'secured' => 2, 'ref' => 3, 'createdAt' => 4, 'updatedAt' => 5, 'version' => 6, 'versionCreatedAt' => 7, 'versionCreatedBy' => 8, ),
- self::TYPE_COLNAME => array(MessageVersionTableMap::ID => 0, MessageVersionTableMap::CODE => 1, MessageVersionTableMap::SECURED => 2, MessageVersionTableMap::REF => 3, MessageVersionTableMap::CREATED_AT => 4, MessageVersionTableMap::UPDATED_AT => 5, MessageVersionTableMap::VERSION => 6, MessageVersionTableMap::VERSION_CREATED_AT => 7, MessageVersionTableMap::VERSION_CREATED_BY => 8, ),
- self::TYPE_RAW_COLNAME => array('ID' => 0, 'CODE' => 1, 'SECURED' => 2, 'REF' => 3, 'CREATED_AT' => 4, 'UPDATED_AT' => 5, 'VERSION' => 6, 'VERSION_CREATED_AT' => 7, 'VERSION_CREATED_BY' => 8, ),
- self::TYPE_FIELDNAME => array('id' => 0, 'code' => 1, 'secured' => 2, 'ref' => 3, 'created_at' => 4, 'updated_at' => 5, 'version' => 6, 'version_created_at' => 7, 'version_created_by' => 8, ),
- self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, 8, )
+ self::TYPE_PHPNAME => array('Id' => 0, 'Name' => 1, 'Secured' => 2, 'CreatedAt' => 3, 'UpdatedAt' => 4, 'Version' => 5, 'VersionCreatedAt' => 6, 'VersionCreatedBy' => 7, ),
+ self::TYPE_STUDLYPHPNAME => array('id' => 0, 'name' => 1, 'secured' => 2, 'createdAt' => 3, 'updatedAt' => 4, 'version' => 5, 'versionCreatedAt' => 6, 'versionCreatedBy' => 7, ),
+ self::TYPE_COLNAME => array(MessageVersionTableMap::ID => 0, MessageVersionTableMap::NAME => 1, MessageVersionTableMap::SECURED => 2, MessageVersionTableMap::CREATED_AT => 3, MessageVersionTableMap::UPDATED_AT => 4, MessageVersionTableMap::VERSION => 5, MessageVersionTableMap::VERSION_CREATED_AT => 6, MessageVersionTableMap::VERSION_CREATED_BY => 7, ),
+ self::TYPE_RAW_COLNAME => array('ID' => 0, 'NAME' => 1, 'SECURED' => 2, 'CREATED_AT' => 3, 'UPDATED_AT' => 4, 'VERSION' => 5, 'VERSION_CREATED_AT' => 6, 'VERSION_CREATED_BY' => 7, ),
+ self::TYPE_FIELDNAME => array('id' => 0, 'name' => 1, 'secured' => 2, 'created_at' => 3, 'updated_at' => 4, 'version' => 5, 'version_created_at' => 6, 'version_created_by' => 7, ),
+ self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, )
);
/**
@@ -166,9 +161,8 @@ class MessageVersionTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'message', 'ID', true, null, null);
- $this->addColumn('CODE', 'Code', 'VARCHAR', true, 45, null);
+ $this->addColumn('NAME', 'Name', 'VARCHAR', true, 255, null);
$this->addColumn('SECURED', 'Secured', 'TINYINT', false, null, null);
- $this->addColumn('REF', 'Ref', 'VARCHAR', false, 255, null);
$this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
$this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
$this->addPrimaryKey('VERSION', 'Version', 'INTEGER', true, null, 0);
@@ -251,11 +245,11 @@ class MessageVersionTableMap extends TableMap
public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
{
// If the PK cannot be derived from the row, return NULL.
- if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 6 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)] === null) {
+ if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 5 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)] === null) {
return null;
}
- return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 6 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)]));
+ return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 5 + $offset : static::translateFieldName('Version', TableMap::TYPE_PHPNAME, $indexType)]));
}
/**
@@ -372,9 +366,8 @@ class MessageVersionTableMap extends TableMap
{
if (null === $alias) {
$criteria->addSelectColumn(MessageVersionTableMap::ID);
- $criteria->addSelectColumn(MessageVersionTableMap::CODE);
+ $criteria->addSelectColumn(MessageVersionTableMap::NAME);
$criteria->addSelectColumn(MessageVersionTableMap::SECURED);
- $criteria->addSelectColumn(MessageVersionTableMap::REF);
$criteria->addSelectColumn(MessageVersionTableMap::CREATED_AT);
$criteria->addSelectColumn(MessageVersionTableMap::UPDATED_AT);
$criteria->addSelectColumn(MessageVersionTableMap::VERSION);
@@ -382,9 +375,8 @@ class MessageVersionTableMap extends TableMap
$criteria->addSelectColumn(MessageVersionTableMap::VERSION_CREATED_BY);
} else {
$criteria->addSelectColumn($alias . '.ID');
- $criteria->addSelectColumn($alias . '.CODE');
+ $criteria->addSelectColumn($alias . '.NAME');
$criteria->addSelectColumn($alias . '.SECURED');
- $criteria->addSelectColumn($alias . '.REF');
$criteria->addSelectColumn($alias . '.CREATED_AT');
$criteria->addSelectColumn($alias . '.UPDATED_AT');
$criteria->addSelectColumn($alias . '.VERSION');
diff --git a/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php b/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php
index 67b7a34ef..a8e680f1c 100755
--- a/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/ModuleI18nTableMap.php
@@ -151,7 +151,7 @@ class ModuleI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'module', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/ModuleTableMap.php b/core/lib/Thelia/Model/Map/ModuleTableMap.php
index 5370c1da1..cccaa890a 100755
--- a/core/lib/Thelia/Model/Map/ModuleTableMap.php
+++ b/core/lib/Thelia/Model/Map/ModuleTableMap.php
@@ -116,7 +116,7 @@ class ModuleTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php b/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php
index 5d78c474c..1b2052c2e 100755
--- a/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/OrderStatusI18nTableMap.php
@@ -151,7 +151,7 @@ class OrderStatusI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'order_status', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/OrderStatusTableMap.php b/core/lib/Thelia/Model/Map/OrderStatusTableMap.php
index eecfe5a03..18406d9aa 100755
--- a/core/lib/Thelia/Model/Map/OrderStatusTableMap.php
+++ b/core/lib/Thelia/Model/Map/OrderStatusTableMap.php
@@ -101,7 +101,7 @@ class OrderStatusTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/ProductDocumentI18nTableMap.php b/core/lib/Thelia/Model/Map/ProductDocumentI18nTableMap.php
index 103914ee6..09e1dc0e4 100755
--- a/core/lib/Thelia/Model/Map/ProductDocumentI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/ProductDocumentI18nTableMap.php
@@ -151,7 +151,7 @@ class ProductDocumentI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'product_document', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/ProductDocumentTableMap.php b/core/lib/Thelia/Model/Map/ProductDocumentTableMap.php
index f1420cc43..ff50bad77 100755
--- a/core/lib/Thelia/Model/Map/ProductDocumentTableMap.php
+++ b/core/lib/Thelia/Model/Map/ProductDocumentTableMap.php
@@ -111,7 +111,7 @@ class ProductDocumentTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/ProductI18nTableMap.php b/core/lib/Thelia/Model/Map/ProductI18nTableMap.php
index 8da33f15d..79a01514a 100755
--- a/core/lib/Thelia/Model/Map/ProductI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/ProductI18nTableMap.php
@@ -151,7 +151,7 @@ class ProductI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'product', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/ProductImageI18nTableMap.php b/core/lib/Thelia/Model/Map/ProductImageI18nTableMap.php
index de3455c07..39ad567f9 100755
--- a/core/lib/Thelia/Model/Map/ProductImageI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/ProductImageI18nTableMap.php
@@ -151,7 +151,7 @@ class ProductImageI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'product_image', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/ProductImageTableMap.php b/core/lib/Thelia/Model/Map/ProductImageTableMap.php
index 945799020..36aabed3e 100755
--- a/core/lib/Thelia/Model/Map/ProductImageTableMap.php
+++ b/core/lib/Thelia/Model/Map/ProductImageTableMap.php
@@ -111,7 +111,7 @@ class ProductImageTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/ProductTableMap.php b/core/lib/Thelia/Model/Map/ProductTableMap.php
index 1d46d483e..f69f6f702 100755
--- a/core/lib/Thelia/Model/Map/ProductTableMap.php
+++ b/core/lib/Thelia/Model/Map/ProductTableMap.php
@@ -131,7 +131,7 @@ class ProductTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php b/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php
index 8a8ce501a..ec22e2fd3 100755
--- a/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/ResourceI18nTableMap.php
@@ -151,7 +151,7 @@ class ResourceI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'resource', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'CLOB', false, null, null);
$this->addColumn('CHAPO', 'Chapo', 'LONGVARCHAR', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/ResourceTableMap.php b/core/lib/Thelia/Model/Map/ResourceTableMap.php
index e56960892..8d7708ddd 100755
--- a/core/lib/Thelia/Model/Map/ResourceTableMap.php
+++ b/core/lib/Thelia/Model/Map/ResourceTableMap.php
@@ -101,7 +101,7 @@ class ResourceTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/RewritingUrlTableMap.php b/core/lib/Thelia/Model/Map/RewritingUrlTableMap.php
index 1d6129ed8..c6d5e5473 100644
--- a/core/lib/Thelia/Model/Map/RewritingUrlTableMap.php
+++ b/core/lib/Thelia/Model/Map/RewritingUrlTableMap.php
@@ -162,9 +162,9 @@ class RewritingUrlTableMap extends TableMap
// columns
$this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
$this->addColumn('URL', 'Url', 'VARCHAR', true, 255, null);
- $this->addColumn('VIEW', 'View', 'VARCHAR', true, 255, null);
+ $this->addColumn('VIEW', 'View', 'VARCHAR', false, 255, null);
$this->addColumn('VIEW_ID', 'ViewId', 'VARCHAR', false, 255, null);
- $this->addColumn('VIEW_LOCALE', 'ViewLocale', 'VARCHAR', true, 255, null);
+ $this->addColumn('VIEW_LOCALE', 'ViewLocale', 'VARCHAR', false, 255, null);
$this->addForeignKey('REDIRECTED', 'Redirected', 'INTEGER', 'rewriting_url', 'ID', false, null, null);
$this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
$this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
diff --git a/core/lib/Thelia/Model/Map/TaxI18nTableMap.php b/core/lib/Thelia/Model/Map/TaxI18nTableMap.php
index 2c4c92f4f..a06230c37 100755
--- a/core/lib/Thelia/Model/Map/TaxI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/TaxI18nTableMap.php
@@ -141,7 +141,7 @@ class TaxI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'tax', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
$this->addColumn('TITLE', 'Title', 'VARCHAR', false, 255, null);
$this->addColumn('DESCRIPTION', 'Description', 'LONGVARCHAR', false, null, null);
} // initialize()
diff --git a/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php
index 689f30728..1f0ed1e96 100755
--- a/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php
+++ b/core/lib/Thelia/Model/Map/TaxRuleI18nTableMap.php
@@ -131,7 +131,7 @@ class TaxRuleI18nTableMap extends TableMap
$this->setUseIdGenerator(false);
// columns
$this->addForeignPrimaryKey('ID', 'Id', 'INTEGER' , 'tax_rule', 'ID', true, null, null);
- $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_EN');
+ $this->addPrimaryKey('LOCALE', 'Locale', 'VARCHAR', true, 5, 'en_US');
} // initialize()
/**
diff --git a/core/lib/Thelia/Model/Map/TaxRuleTableMap.php b/core/lib/Thelia/Model/Map/TaxRuleTableMap.php
index 9b862de99..cc5f628b9 100755
--- a/core/lib/Thelia/Model/Map/TaxRuleTableMap.php
+++ b/core/lib/Thelia/Model/Map/TaxRuleTableMap.php
@@ -111,7 +111,7 @@ class TaxRuleTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Map/TaxTableMap.php b/core/lib/Thelia/Model/Map/TaxTableMap.php
index b941e7b52..6d43f20e9 100755
--- a/core/lib/Thelia/Model/Map/TaxTableMap.php
+++ b/core/lib/Thelia/Model/Map/TaxTableMap.php
@@ -101,7 +101,7 @@ class TaxTableMap extends TableMap
*
* @var string
*/
- const DEFAULT_LOCALE = 'en_EN';
+ const DEFAULT_LOCALE = 'en_US';
/**
* holds an array of fieldnames
diff --git a/core/lib/Thelia/Model/Message.php b/core/lib/Thelia/Model/Message.php
index 777c9eaaf..97fb45469 100755
--- a/core/lib/Thelia/Model/Message.php
+++ b/core/lib/Thelia/Model/Message.php
@@ -3,7 +3,65 @@
namespace Thelia\Model;
use Thelia\Model\Base\Message as BaseMessage;
+use Propel\Runtime\Connection\ConnectionInterface;
+use Thelia\Core\Event\TheliaEvents;
+use Thelia\Core\Event\MessageEvent;
class Message extends BaseMessage {
+ use \Thelia\Model\Tools\ModelEventDispatcherTrait;
+
+ /**
+ * {@inheritDoc}
+ */
+ public function preInsert(ConnectionInterface $con = null)
+ {
+ $this->dispatchEvent(TheliaEvents::BEFORE_CREATEMESSAGE, new MessageEvent($this));
+
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function postInsert(ConnectionInterface $con = null)
+ {
+ $this->dispatchEvent(TheliaEvents::AFTER_CREATEMESSAGE, new MessageEvent($this));
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function preUpdate(ConnectionInterface $con = null)
+ {
+ $this->dispatchEvent(TheliaEvents::BEFORE_CHANGEMESSAGE, new MessageEvent($this));
+
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function postUpdate(ConnectionInterface $con = null)
+ {
+ $this->dispatchEvent(TheliaEvents::AFTER_CHANGEMESSAGE, new MessageEvent($this));
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function preDelete(ConnectionInterface $con = null)
+ {
+ $this->dispatchEvent(TheliaEvents::BEFORE_DELETEMESSAGE, new MessageEvent($this));
+
+ return true;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function postDelete(ConnectionInterface $con = null)
+ {
+ $this->dispatchEvent(TheliaEvents::AFTER_DELETEMESSAGE, new MessageEvent($this));
+ }
}
diff --git a/install/thelia.sql b/install/thelia.sql
index 99b18513e..c62b8738d 100755
--- a/install/thelia.sql
+++ b/install/thelia.sql
@@ -410,7 +410,8 @@ CREATE TABLE `config`
`hidden` TINYINT DEFAULT 1 NOT NULL,
`created_at` DATETIME,
`updated_at` DATETIME,
- PRIMARY KEY (`id`)
+ PRIMARY KEY (`id`),
+ UNIQUE INDEX `name_UNIQUE` (`name`)
) ENGINE=InnoDB;
-- ---------------------------------------------------------------------
@@ -1017,15 +1018,15 @@ DROP TABLE IF EXISTS `message`;
CREATE TABLE `message`
(
`id` INTEGER NOT NULL AUTO_INCREMENT,
- `code` VARCHAR(45) NOT NULL,
+ `name` VARCHAR(255) NOT NULL,
`secured` TINYINT,
- `ref` VARCHAR(255),
`created_at` DATETIME,
`updated_at` DATETIME,
`version` INTEGER DEFAULT 0,
`version_created_at` DATETIME,
`version_created_by` VARCHAR(100),
- PRIMARY KEY (`id`)
+ PRIMARY KEY (`id`),
+ UNIQUE INDEX `name_UNIQUE` (`name`)
) ENGINE=InnoDB;
-- ---------------------------------------------------------------------
@@ -1443,9 +1444,9 @@ CREATE TABLE `rewriting_url`
(
`id` INTEGER NOT NULL AUTO_INCREMENT,
`url` VARCHAR(255) NOT NULL,
- `view` VARCHAR(255) NOT NULL,
+ `view` VARCHAR(255),
`view_id` VARCHAR(255),
- `view_locale` VARCHAR(255) NOT NULL,
+ `view_locale` VARCHAR(255),
`redirected` INTEGER,
`created_at` DATETIME,
`updated_at` DATETIME,
@@ -1474,7 +1475,7 @@ CREATE TABLE `rewriting_argument`
`created_at` DATETIME,
`updated_at` DATETIME,
PRIMARY KEY (`rewriting_url_id`,`parameter`,`value`),
- INDEX `fk_rewriting_argument_rewirting_url_id` (`rewriting_url_id`),
+ INDEX `idx_rewriting_argument_rewirting_url_id` (`rewriting_url_id`),
CONSTRAINT `fk_rewriting_argument_rewirting_url_id`
FOREIGN KEY (`rewriting_url_id`)
REFERENCES `rewriting_url` (`id`)
@@ -1491,7 +1492,7 @@ DROP TABLE IF EXISTS `category_i18n`;
CREATE TABLE `category_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` VARCHAR(255),
`description` LONGTEXT,
`chapo` TEXT,
@@ -1512,7 +1513,7 @@ DROP TABLE IF EXISTS `product_i18n`;
CREATE TABLE `product_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` VARCHAR(255),
`description` LONGTEXT,
`chapo` TEXT,
@@ -1533,7 +1534,7 @@ DROP TABLE IF EXISTS `country_i18n`;
CREATE TABLE `country_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` VARCHAR(255),
`description` LONGTEXT,
`chapo` TEXT,
@@ -1554,7 +1555,7 @@ DROP TABLE IF EXISTS `tax_i18n`;
CREATE TABLE `tax_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` VARCHAR(255),
`description` TEXT,
PRIMARY KEY (`id`,`locale`),
@@ -1573,7 +1574,7 @@ DROP TABLE IF EXISTS `tax_rule_i18n`;
CREATE TABLE `tax_rule_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
PRIMARY KEY (`id`,`locale`),
CONSTRAINT `tax_rule_i18n_FK_1`
FOREIGN KEY (`id`)
@@ -1590,7 +1591,7 @@ DROP TABLE IF EXISTS `feature_i18n`;
CREATE TABLE `feature_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` VARCHAR(255),
`description` LONGTEXT,
`chapo` TEXT,
@@ -1611,7 +1612,7 @@ DROP TABLE IF EXISTS `feature_av_i18n`;
CREATE TABLE `feature_av_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` VARCHAR(255),
`description` LONGTEXT,
`chapo` TEXT,
@@ -1632,7 +1633,7 @@ DROP TABLE IF EXISTS `attribute_i18n`;
CREATE TABLE `attribute_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` VARCHAR(255),
`description` LONGTEXT,
`chapo` TEXT,
@@ -1653,7 +1654,7 @@ DROP TABLE IF EXISTS `attribute_av_i18n`;
CREATE TABLE `attribute_av_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` VARCHAR(255),
`description` LONGTEXT,
`chapo` TEXT,
@@ -1674,7 +1675,7 @@ DROP TABLE IF EXISTS `config_i18n`;
CREATE TABLE `config_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` VARCHAR(255),
`description` LONGTEXT,
`chapo` TEXT,
@@ -1695,7 +1696,7 @@ DROP TABLE IF EXISTS `customer_title_i18n`;
CREATE TABLE `customer_title_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`short` VARCHAR(10),
`long` VARCHAR(45),
PRIMARY KEY (`id`,`locale`),
@@ -1714,7 +1715,7 @@ DROP TABLE IF EXISTS `folder_i18n`;
CREATE TABLE `folder_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` VARCHAR(255),
`description` LONGTEXT,
`chapo` TEXT,
@@ -1735,7 +1736,7 @@ DROP TABLE IF EXISTS `content_i18n`;
CREATE TABLE `content_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` VARCHAR(255),
`description` LONGTEXT,
`chapo` TEXT,
@@ -1756,7 +1757,7 @@ DROP TABLE IF EXISTS `product_image_i18n`;
CREATE TABLE `product_image_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` VARCHAR(255),
`description` LONGTEXT,
`chapo` TEXT,
@@ -1777,7 +1778,7 @@ DROP TABLE IF EXISTS `product_document_i18n`;
CREATE TABLE `product_document_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` VARCHAR(255),
`description` LONGTEXT,
`chapo` TEXT,
@@ -1798,7 +1799,7 @@ DROP TABLE IF EXISTS `currency_i18n`;
CREATE TABLE `currency_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`name` VARCHAR(45),
PRIMARY KEY (`id`,`locale`),
CONSTRAINT `currency_i18n_FK_1`
@@ -1816,7 +1817,7 @@ DROP TABLE IF EXISTS `order_status_i18n`;
CREATE TABLE `order_status_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` VARCHAR(255),
`description` LONGTEXT,
`chapo` TEXT,
@@ -1837,7 +1838,7 @@ DROP TABLE IF EXISTS `module_i18n`;
CREATE TABLE `module_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` VARCHAR(255),
`description` LONGTEXT,
`chapo` TEXT,
@@ -1858,7 +1859,7 @@ DROP TABLE IF EXISTS `group_i18n`;
CREATE TABLE `group_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` VARCHAR(255),
`description` LONGTEXT,
`chapo` TEXT,
@@ -1879,7 +1880,7 @@ DROP TABLE IF EXISTS `resource_i18n`;
CREATE TABLE `resource_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` VARCHAR(255),
`description` LONGTEXT,
`chapo` TEXT,
@@ -1900,10 +1901,11 @@ DROP TABLE IF EXISTS `message_i18n`;
CREATE TABLE `message_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` TEXT,
- `description` LONGTEXT,
- `description_html` LONGTEXT,
+ `subject` TEXT,
+ `text_message` LONGTEXT,
+ `html_message` LONGTEXT,
PRIMARY KEY (`id`,`locale`),
CONSTRAINT `message_i18n_FK_1`
FOREIGN KEY (`id`)
@@ -1920,7 +1922,7 @@ DROP TABLE IF EXISTS `coupon_i18n`;
CREATE TABLE `coupon_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
PRIMARY KEY (`id`,`locale`),
CONSTRAINT `coupon_i18n_FK_1`
FOREIGN KEY (`id`)
@@ -1937,7 +1939,7 @@ DROP TABLE IF EXISTS `category_image_i18n`;
CREATE TABLE `category_image_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` VARCHAR(255),
`description` LONGTEXT,
`chapo` TEXT,
@@ -1958,7 +1960,7 @@ DROP TABLE IF EXISTS `folder_image_i18n`;
CREATE TABLE `folder_image_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` VARCHAR(255),
`description` LONGTEXT,
`chapo` TEXT,
@@ -1979,7 +1981,7 @@ DROP TABLE IF EXISTS `content_image_i18n`;
CREATE TABLE `content_image_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` VARCHAR(255),
`description` LONGTEXT,
`chapo` TEXT,
@@ -2000,7 +2002,7 @@ DROP TABLE IF EXISTS `category_document_i18n`;
CREATE TABLE `category_document_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` VARCHAR(255),
`description` LONGTEXT,
`chapo` TEXT,
@@ -2021,7 +2023,7 @@ DROP TABLE IF EXISTS `content_document_i18n`;
CREATE TABLE `content_document_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` VARCHAR(255),
`description` LONGTEXT,
`chapo` TEXT,
@@ -2042,7 +2044,7 @@ DROP TABLE IF EXISTS `folder_document_i18n`;
CREATE TABLE `folder_document_i18n`
(
`id` INTEGER NOT NULL,
- `locale` VARCHAR(5) DEFAULT 'en_EN' NOT NULL,
+ `locale` VARCHAR(5) DEFAULT 'en_US' NOT NULL,
`title` VARCHAR(255),
`description` LONGTEXT,
`chapo` TEXT,
@@ -2159,9 +2161,8 @@ DROP TABLE IF EXISTS `message_version`;
CREATE TABLE `message_version`
(
`id` INTEGER NOT NULL,
- `code` VARCHAR(45) NOT NULL,
+ `name` VARCHAR(255) NOT NULL,
`secured` TINYINT,
- `ref` VARCHAR(255),
`created_at` DATETIME,
`updated_at` DATETIME,
`version` INTEGER DEFAULT 0 NOT NULL,
diff --git a/local/config/schema.xml b/local/config/schema.xml
index 17fcf612f..757e9141f 100755
--- a/local/config/schema.xml
+++ b/local/config/schema.xml
@@ -1,1129 +1,1135 @@
-
-