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

[-] BO : fix #PSTEST-1114 - unrecognized chars in e-mail

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14385 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2012-03-30 13:42:50 +00:00
parent 16c232ed52
commit e774ee6ab1
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/products/combinations.tpl
+9 -10
View File
@@ -25,17 +25,16 @@
*}
<script type="text/javascript">
{if $product->is_virtual}
$('#virtual_good_attributes').show();
{else}
$('#virtual_good_attributes').hide();
{/if}
var msg_combination_1 = '{l s='Please choose an attribute'}';
var msg_combination_2 = '{l s='Please choose a value'}';
var msg_combination_3 = '{l s='You can only add one combination per type of attribute'}';
var msg_new_combination = '{l s='New combination'}';
$(document).ready(function(){
{if $product->is_virtual}
$('#virtual_good_attributes').show();
{/if}
var msg_combination_1 = '{l s='Please choose an attribute'}';
var msg_combination_2 = '{l s='Please choose a value'}';
var msg_combination_3 = '{l s='You can only add one combination per type of attribute'}';
var msg_new_combination = '{l s='New combination'}';
});
</script>
{if isset($product->id)}
admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
+1 -1
View File
@@ -221,7 +221,7 @@
<label for="virtual_product_name" class="t">{l s='Filename'}</label>
</td>
<td class="col-right">
<input type="text" id="virtual_product_name" name="virtual_product_name" style="width:200px" value="{$product->productDownload->display_filename|htmlentities}" />
<input type="text" id="virtual_product_name" name="virtual_product_name" style="width:200px" value="{$product->productDownload->display_filename|escape:'htmlall':'UTF-8'}" />
<p class="preference_description" name="help_box">{l s='The full filename with its extension (e.g. Book.pdf)'}</p>
</td>
</tr>