dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release

Browse Source
This commit is contained in:
djfm
2013-09-30 07:09:17 +00:00
parent 66435cbf4a 813ef8bc7e
commit 67d0ac95b5
5 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Language.php
+5 -2
View File
@@ -691,6 +691,7 @@ class LanguageCore extends ObjectModel
// Initialize the language // Initialize the language
$lang = new Language(); $lang = new Language();
$lang->iso_code = $iso_code; $lang->iso_code = $iso_code;
$lang->language_code = $iso_code;
$lang->active = true; $lang->active = true;
// If the language pack has not been provided, retrieve it from prestashop.com // If the language pack has not been provided, retrieve it from prestashop.com
@@ -700,12 +701,14 @@ class LanguageCore extends ObjectModel
// If a language pack has been found or provided, prefill the language object with the value // If a language pack has been found or provided, prefill the language object with the value
if ($lang_pack) if ($lang_pack)
foreach (get_object_vars($lang_pack) as $key => $value) foreach (get_object_vars($lang_pack) as $key => $value)
$lang->$key = $value; if ($key != 'iso_code' && isset(Language::$definition['fields'][$key]))
$lang->$key = $value;
// Use the values given in parameters to override the data retrieved automatically // Use the values given in parameters to override the data retrieved automatically
if ($params_lang !== null && is_array($params_lang)) if ($params_lang !== null && is_array($params_lang))
foreach ($params_lang as $key => $value) foreach ($params_lang as $key => $value)
$lang->$key = $value; if ($key != 'iso_code' && isset(Language::$definition['fields'][$key]))
$lang->$key = $value;
if (!$lang->add(true, false, $only_add)) if (!$lang->add(true, false, $only_add))
return false; return false;
controllers/admin/AdminImportController.php
+22 -22
View File
@@ -928,7 +928,7 @@ class AdminImportControllerCore extends AdminController
$this->errors[] = sprintf( $this->errors[] = sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'), Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
$category_to_create->name[$default_language_id], $category_to_create->name[$default_language_id],
(isset($category_to_create->id) ? $category_to_create->id : 'null') (isset($category_to_create->id) && !empty($category_to_create->id))? $category_to_create->id : 'null'
); );
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : ''). $this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError(); Db::getInstance()->getMsgError();
@@ -961,7 +961,7 @@ class AdminImportControllerCore extends AdminController
$this->warnings[] = sprintf( $this->warnings[] = sprintf(
Tools::displayError('Rewrite link for %1$s (ID: %2$s) was re-written as %3$s.'), Tools::displayError('Rewrite link for %1$s (ID: %2$s) was re-written as %3$s.'),
$bak, $bak,
(isset($info['id']) ? $info['id'] : 'null'), (isset($info['id']) && !empty($info['id']))? $info['id'] : 'null',
$category->link_rewrite[$default_language_id] $category->link_rewrite[$default_language_id]
); );
$res = false; $res = false;
@@ -1009,8 +1009,8 @@ class AdminImportControllerCore extends AdminController
{ {
$this->errors[] = sprintf( $this->errors[] = sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'), Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
(isset($info['name']) ? Tools::safeOutput($info['name']) : 'No Name'), (isset($info['name']) && !empty($info['name']))? Tools::safeOutput($info['name']) : 'No Name',
(isset($info['id']) ? Tools::safeOutput($info['id']) : 'No ID') (isset($info['id']) && !empty($info['id']))? Tools::safeOutput($info['id']) : 'No ID'
); );
$error_tmp = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').Db::getInstance()->getMsgError(); $error_tmp = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').Db::getInstance()->getMsgError();
if ($error_tmp != '') if ($error_tmp != '')
@@ -1138,7 +1138,7 @@ class AdminImportControllerCore extends AdminController
$this->errors[] = sprintf( $this->errors[] = sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'), Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
$manufacturer->name, $manufacturer->name,
(isset($manufacturer->id) ? $manufacturer->id : 'null') (isset($manufacturer->id) && !empty($manufacturer->id))? $manufacturer->id : 'null'
); );
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : ''). $this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError(); Db::getInstance()->getMsgError();
@@ -1169,7 +1169,7 @@ class AdminImportControllerCore extends AdminController
$this->errors[] = sprintf( $this->errors[] = sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'), Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
$supplier->name, $supplier->name,
(isset($supplier->id) ? $supplier->id : 'null') (isset($supplier->id) && !empty($supplier->id))? $supplier->id : 'null'
); );
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : ''). $this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError(); Db::getInstance()->getMsgError();
@@ -1215,7 +1215,7 @@ class AdminImportControllerCore extends AdminController
$this->errors[] = sprintf( $this->errors[] = sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'), Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
$category_to_create->name[$default_language_id], $category_to_create->name[$default_language_id],
(isset($category_to_create->id) ? $category_to_create->id : 'null') (isset($category_to_create->id) && !empty($category_to_create->id))? $category_to_create->id : 'null'
); );
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : ''). $this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError(); Db::getInstance()->getMsgError();
@@ -1247,7 +1247,7 @@ class AdminImportControllerCore extends AdminController
$this->errors[] = sprintf( $this->errors[] = sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'), Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
$category_to_create->name[$default_language_id], $category_to_create->name[$default_language_id],
(isset($category_to_create->id) ? $category_to_create->id : 'null') (isset($category_to_create->id) && !empty($category_to_create->id))? $category_to_create->id : 'null'
); );
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : ''). $this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError(); Db::getInstance()->getMsgError();
@@ -1274,11 +1274,11 @@ class AdminImportControllerCore extends AdminController
$this->warnings[] = sprintf( $this->warnings[] = sprintf(
Tools::displayError('Rewrite link for %1$s (ID: %2$s) was re-written as %3$s.'), Tools::displayError('Rewrite link for %1$s (ID: %2$s) was re-written as %3$s.'),
$product->name[$id_lang], $product->name[$id_lang],
(isset($info['id']) ? $info['id'] : 'null'), (isset($info['id']) && !empty($info['id']))? $info['id'] : 'null',
$link_rewrite $link_rewrite
); );
if (!Tools::getValue('match_ref') || !(is_array($product->link_rewrite) && count($product->link_rewrite))) if (!Tools::getValue('match_ref') || !(is_array($product->link_rewrite) && count($product->link_rewrite) && !empty($product->link_rewrite[$id_lang])))
$product->link_rewrite = AdminImportController::createMultiLangField($link_rewrite); $product->link_rewrite = AdminImportController::createMultiLangField($link_rewrite);
// replace the value of separator by coma // replace the value of separator by coma
@@ -1357,8 +1357,8 @@ class AdminImportControllerCore extends AdminController
{ {
$this->errors[] = sprintf( $this->errors[] = sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'), Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
(isset($info['name']) ? Tools::safeOutput($info['name']) : 'No Name'), (isset($info['name']) && !empty($info['name']))? Tools::safeOutput($info['name']) : 'No Name',
(isset($info['id']) ? Tools::safeOutput($info['id']) : 'No ID') (isset($info['id']) && !empty($info['id']))? Tools::safeOutput($info['id']) : 'No ID'
); );
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : ''). $this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError(); Db::getInstance()->getMsgError();
@@ -1964,7 +1964,7 @@ class AdminImportControllerCore extends AdminController
$this->errors[] = sprintf( $this->errors[] = sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'), Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
$info['email'], $info['email'],
(isset($info['id']) ? $info['id'] : 'null') (isset($info['id']) && !empty($info['id']))? $info['id'] : 'null'
); );
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : ''). $this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError(); Db::getInstance()->getMsgError();
@@ -2061,7 +2061,7 @@ class AdminImportControllerCore extends AdminController
Tools::displayError('%1$s does not exist in database %2$s (ID: %3$s) cannot be saved'), Tools::displayError('%1$s does not exist in database %2$s (ID: %3$s) cannot be saved'),
Db::getInstance()->getMsgError(), Db::getInstance()->getMsgError(),
$address->customer_email, $address->customer_email,
(isset($info['id']) ? $info['id'] : 'null') (isset($info['id']) && !empty($info['id']))? $info['id'] : 'null'
); );
} }
else else
@@ -2110,7 +2110,7 @@ class AdminImportControllerCore extends AdminController
$this->errors[] = Db::getInstance()->getMsgError().' '.sprintf( $this->errors[] = Db::getInstance()->getMsgError().' '.sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'), Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
$manufacturer->name, $manufacturer->name,
(isset($manufacturer->id) ? $manufacturer->id : 'null') (isset($manufacturer->id) && !empty($manufacturer->id))? $manufacturer->id : 'null'
); );
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : ''). $this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError(); Db::getInstance()->getMsgError();
@@ -2131,7 +2131,7 @@ class AdminImportControllerCore extends AdminController
$this->errors[] = Db::getInstance()->getMsgError().' '.sprintf( $this->errors[] = Db::getInstance()->getMsgError().' '.sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'), Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
$supplier->name, $supplier->name,
(isset($supplier->id) ? $supplier->id : 'null') (isset($supplier->id) && !empty($supplier->id))? $supplier->id : 'null'
); );
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : ''). $this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError(); Db::getInstance()->getMsgError();
@@ -2160,7 +2160,7 @@ class AdminImportControllerCore extends AdminController
$this->errors[] = sprintf( $this->errors[] = sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'), Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
$info['alias'], $info['alias'],
(isset($info['id']) ? $info['id'] : 'null') (isset($info['id']) && !empty($info['id']))? $info['id'] : 'null'
); );
} }
} }
@@ -2177,7 +2177,7 @@ class AdminImportControllerCore extends AdminController
$this->errors[] = sprintf( $this->errors[] = sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'), Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
$info['alias'], $info['alias'],
(isset($info['id']) ? $info['id'] : 'null') (isset($info['id']) && !empty($info['id']))? $info['id'] : 'null'
); );
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : ''). $this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError(); Db::getInstance()->getMsgError();
@@ -2247,8 +2247,8 @@ class AdminImportControllerCore extends AdminController
{ {
$this->errors[] = Db::getInstance()->getMsgError().' '.sprintf( $this->errors[] = Db::getInstance()->getMsgError().' '.sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'), Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
(isset($info['name']) ? Tools::safeOutput($info['name']) : 'No Name'), (isset($info['name']) && !empty($info['name']))? Tools::safeOutput($info['name']) : 'No Name',
(isset($info['id']) ? Tools::safeOutput($info['id']) : 'No ID') (isset($info['id']) && !empty($info['id']))? Tools::safeOutput($info['id']) : 'No ID'
); );
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : ''). $this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError(); Db::getInstance()->getMsgError();
@@ -2294,8 +2294,8 @@ class AdminImportControllerCore extends AdminController
if (!$res) if (!$res)
$this->errors[] = Db::getInstance()->getMsgError().' '.sprintf( $this->errors[] = Db::getInstance()->getMsgError().' '.sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'), Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
(isset($info['name']) ? Tools::safeOutput($info['name']) : 'No Name'), (isset($info['name']) && !empty($info['name']))? Tools::safeOutput($info['name']) : 'No Name',
(isset($info['id']) ? Tools::safeOutput($info['id']) : 'No ID') (isset($info['id']) && !empty($info['id']))? Tools::safeOutput($info['id']) : 'No ID'
); );
else else
{ {
controllers/admin/AdminProductsController.php
+1 -1
View File
@@ -2023,7 +2023,7 @@ class AdminProductsControllerCore extends AdminController
// Check multilingual fields validity // Check multilingual fields validity
foreach ($rules['validateLang'] as $fieldLang => $function) foreach ($rules['validateLang'] as $fieldLang => $function)
foreach ($languages as $language) foreach ($languages as $language)
if ($this->isProductFieldUpdated('description_short', $language['id_lang']) && ($value = Tools::getValue($fieldLang.'_'.$language['id_lang']))) if ($this->isProductFieldUpdated($fieldLang, $language['id_lang']) && ($value = Tools::getValue($fieldLang.'_'.$language['id_lang'])))
if (!Validate::$function($value, (int)Configuration::get('PS_ALLOW_HTML_IFRAME'))) if (!Validate::$function($value, (int)Configuration::get('PS_ALLOW_HTML_IFRAME')))
$this->errors[] = sprintf( $this->errors[] = sprintf(
Tools::displayError('The %1$s field (%2$s) is invalid.'), Tools::displayError('The %1$s field (%2$s) is invalid.'),
modules/productcomments/productcomments.tpl
+3 -1
View File
@@ -76,11 +76,13 @@ var moderation_active = {$moderation_active};
</div> </div>
{/if} {/if}
{/foreach} {/foreach}
{if (!$too_early AND ($logged OR $allow_guests))}
<p class="align_center"> <p class="align_center">
<a id="new_comment_tab_btn" class="open-comment-form" href="#new_comment_form">{l s='Write your review' mod='productcomments'} !</a> <a id="new_comment_tab_btn" class="open-comment-form" href="#new_comment_form">{l s='Write your review' mod='productcomments'} !</a>
</p> </p>
{/if}
{else} {else}
{if ($too_early == false AND ($logged OR $allow_guests))} {if (!$too_early AND ($logged OR $allow_guests))}
<p class="align_center"> <p class="align_center">
<a id="new_comment_tab_btn" class="open-comment-form" href="#new_comment_form">{l s='Be the first to write your review' mod='productcomments'} !</a> <a id="new_comment_tab_btn" class="open-comment-form" href="#new_comment_form">{l s='Be the first to write your review' mod='productcomments'} !</a>
</p> </p>
themes/default/modules/productcomments/productcomments.tpl
+4 -2
View File
@@ -76,11 +76,13 @@ var moderation_active = {$moderation_active};
</div> </div>
{/if} {/if}
{/foreach} {/foreach}
{if (!$too_early AND ($logged OR $allow_guests))}
<p class="align_center"> <p class="align_center">
<a id="new_comment_tab_btn" class="open-comment-form" href="#new_comment_form">{l s='Write your review' mod='productcomments'} !</a> <a id="new_comment_tab_btn" class="open-comment-form" href="#new_comment_form">{l s='Write your review' mod='productcomments'} !</a>
</p> </p>
{/if}
{else} {else}
{if ($too_early == false AND ($logged OR $allow_guests))} {if (!$too_early AND ($logged OR $allow_guests))}
<p class="align_center"> <p class="align_center">
<a id="new_comment_tab_btn" class="open-comment-form" href="#new_comment_form">{l s='Be the first to write your review' mod='productcomments'} !</a> <a id="new_comment_tab_btn" class="open-comment-form" href="#new_comment_form">{l s='Be the first to write your review' mod='productcomments'} !</a>
</p> </p>
@@ -141,7 +143,7 @@ var moderation_active = {$moderation_active};
{/if} {/if}
<div id="new_comment_form_footer"> <div id="new_comment_form_footer">
<input id="id_product_comment_send" name="id_product" type="hidden" value='{$id_product_comment_form}'></input> <input id="id_product_comment_send" name="id_product" type="hidden" value='{$id_product_comment_form}' />
<p class="fl required"><sup>*</sup> {l s='Required fields' mod='productcomments'}</p> <p class="fl required"><sup>*</sup> {l s='Required fields' mod='productcomments'}</p>
<p class="fr"> <p class="fr">
<button id="submitNewMessage" name="submitMessage" type="submit">{l s='Send' mod='productcomments'}</button>&nbsp; <button id="submitNewMessage" name="submitMessage" type="submit">{l s='Send' mod='productcomments'}</button>&nbsp;