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

Merge pull request #583 from djfm/development

Browse Source 
[*] TR : Small localization fixes & correction in templates so that translation regexes work OK
This commit is contained in:
Gregory Roussac
2013-07-23 00:59:31 -07:00
parent 209615d4f4 3c59c5e779
commit 3b213a505c
8 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
+2 -2
View File
@@ -106,7 +106,7 @@
if ($(this).attr('name') == 'category_reduction['+$('[name="id_category"]:checked').val()+']') if ($(this).attr('name') == 'category_reduction['+$('[name="id_category"]:checked').val()+']')
{ {
exist = true; exist = true;
jAlert('{l s='This category already exists for this group.' js='1'}'); jAlert('{l s='This category already exists for this group.' js=1}');
return false; return false;
} }
}); });
@@ -268,4 +268,4 @@
{else} {else}
{$smarty.block.parent} {$smarty.block.parent}
{/if} {/if}
{/block} {/block}
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+1 -1
View File
@@ -57,7 +57,7 @@
} }
else else
{ {
jAlert('{l s='You do not have permission to delete here. When the multistore is enabled, only a SuperAdmin can delete all items before an import.' js='1'}'); jAlert('{l s='You do not have permission to delete here. When the multistore is enabled, only a SuperAdmin can delete all items before an import.' js=1}');
return false; return false;
} }
} }
admin-dev/themes/default/template/controllers/orders/form.tpl
+2 -2
View File
@@ -33,8 +33,8 @@
var currencies = new Array(); var currencies = new Array();
var id_currency = ''; var id_currency = '';
var id_lang = ''; var id_lang = '';
var txt_show_carts = '{l s='Show carts and orders for this customer.' js='1'}'; var txt_show_carts = '{l s='Show carts and orders for this customer.' js=1}';
var txt_hide_carts = '{l s='Hide carts and orders for this customer.' js='1'}'; var txt_hide_carts = '{l s='Hide carts and orders for this customer.' js=1}';
var defaults_order_state = new Array(); var defaults_order_state = new Array();
var customization_errors = false; var customization_errors = false;
var pic_dir = '{$pic_dir}'; var pic_dir = '{$pic_dir}';
admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl
+1 -1
View File
@@ -90,7 +90,7 @@
var table = $('#selectTables select').val(); var table = $('#selectTables select').val();
if (!table) if (!table)
jAlert("{l s='Please choose a table.' js='1'}"); jAlert("{l s='Please choose a table.' js=1}");
else else
AddRequestSql(table); AddRequestSql(table);
}); });
admin-dev/themes/default/template/controllers/shop/helpers/list/list_action_delete.tpl
+1 -1
View File
@@ -24,7 +24,7 @@
*} *}
<a href="{$href}" class="delete" <a href="{$href}" class="delete"
{if in_array($id_shop, $shops_having_dependencies)} {if in_array($id_shop, $shops_having_dependencies)}
onclick="jAlert('{l s='You cannot delete this shop\'s (customer and/or order dependency)' js='1'}'); return false;" onclick="jAlert('{l s='You cannot delete this shop\'s (customer and/or order dependency)' js=1}'); return false;"
{elseif isset($confirm)} {elseif isset($confirm)}
onclick="if (confirm('{$confirm}')){ return true; } else { event.stopPropagation(); event.preventDefault();};" onclick="if (confirm('{$confirm}')){ return true; } else { event.stopPropagation(); event.preventDefault();};"
{/if} title="{$action}"> {/if} title="{$action}">
admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl
+1 -1
View File
@@ -138,7 +138,7 @@
// check if it's possible to add the product // check if it's possible to add the product
if (product_infos == null || $('#cur_product_name').val() == '') if (product_infos == null || $('#cur_product_name').val() == '')
{ {
jAlert('{l s='Please select at least one product.' js='1'}'); jAlert('{l s='Please select at least one product.' js=1}');
return false; return false;
} }
localization/be.xml
+3 -3
View File
@@ -166,8 +166,8 @@
<units> <units>
<unit type="weight" value="kg" /> <unit type="weight" value="kg" />
<unit type="volume" value="L" /> <unit type="volume" value="L" />
<unit type="short_distance" value="in" /> <unit type="short_distance" value="cm" />
<unit type="base_distance" value="ft" /> <unit type="base_distance" value="m" />
<unit type="long_distance" value="mi" /> <unit type="long_distance" value="km" />
</units> </units>
</localizationPack> </localizationPack>
localization/il.xml
+2 -2
View File
@@ -8,9 +8,9 @@
<language iso_code="he" /> <language iso_code="he" />
</languages> </languages>
<taxes> <taxes>
<tax id="1" name="Ma'am IL 16%" rate="16" /> <tax id="1" name="Ma'am IL 18%" rate="18" />
<taxRulesGroup name="IL Standard Rate (16%)"> <taxRulesGroup name="IL Standard Rate (18%)">
<taxRule iso_code_country="il" id_tax="1" /> <taxRule iso_code_country="il" id_tax="1" />
</taxRulesGroup> </taxRulesGroup>
</taxes> </taxes>