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

// merge 5983, 5985

Browse Source
This commit is contained in:
tDidierjean
2011-04-19 14:59:39 +00:00
parent 11096964e2
commit 5286dc7e50
3 changed files with 78 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Logger.php
+1 -1
View File
@@ -81,7 +81,7 @@ class LoggerCore extends ObjectModel
{
/* Send e-mail to the shop owner only if the minimal severity level has been reached */
if (intval(Configuration::get('PS_LOGS_BY_EMAIL')) <= intval($log->severity))
Mail::Send((int)Configuration::get('PS_LANG_DEFAULT'), 'log_alert', Mail::l('[Log] You have a new alert from your shop'), array(), Configuration::get('PS_SHOP_EMAIL'));
Mail::Send((int)Configuration::get('PS_LANG_DEFAULT'), 'log_alert', Mail::l('Log: You have a new alert from your shop'), array(), Configuration::get('PS_SHOP_EMAIL'));
}
/**
localization/gb.xml
+77
View File
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<localizationPack name="United Kingdom" version="1.0">
<currencies>
<currency name="Pound" iso_code="GBP" iso_code_num="826" sign="£" blank="1" conversion_rate="0.8633100" format="2" decimals="1"/>
</currencies>
<taxes>
<tax id="1" name="VAT UK 20%" rate="20.0"/>
<tax id="2" name="VAT UK 5%" rate="5"/>
<taxRulesGroup name="UK Standard Rate (20%)">
<taxRule iso_code_country="be" id_tax="1"/>
<taxRule iso_code_country="bg" id_tax="1"/>
<taxRule iso_code_country="cz" id_tax="1"/>
<taxRule iso_code_country="dk" id_tax="1"/>
<taxRule iso_code_country="de" id_tax="1"/>
<taxRule iso_code_country="ee" id_tax="1"/>
<taxRule iso_code_country="gr" id_tax="1"/>
<taxRule iso_code_country="es" id_tax="1"/>
<taxRule iso_code_country="fr" id_tax="1"/>
<taxRule iso_code_country="ie" id_tax="1"/>
<taxRule iso_code_country="it" id_tax="1"/>
<taxRule iso_code_country="cy" id_tax="1"/>
<taxRule iso_code_country="lv" id_tax="1"/>
<taxRule iso_code_country="lt" id_tax="1"/>
<taxRule iso_code_country="lu" id_tax="1"/>
<taxRule iso_code_country="hu" id_tax="1"/>
<taxRule iso_code_country="mt" id_tax="1"/>
<taxRule iso_code_country="nl" id_tax="1"/>
<taxRule iso_code_country="at" id_tax="1"/>
<taxRule iso_code_country="pl" id_tax="1"/>
<taxRule iso_code_country="pt" id_tax="1"/>
<taxRule iso_code_country="ro" id_tax="1"/>
<taxRule iso_code_country="si" id_tax="1"/>
<taxRule iso_code_country="sk" id_tax="1"/>
<taxRule iso_code_country="fi" id_tax="1"/>
<taxRule iso_code_country="se" id_tax="1"/>
<taxRule iso_code_country="uk" id_tax="1"/>
</taxRulesGroup>
<taxRulesGroup name="UK Reduced Rate (5%)">
<taxRule iso_code_country="be" id_tax="2"/>
<taxRule iso_code_country="bg" id_tax="2"/>
<taxRule iso_code_country="cz" id_tax="2"/>
<taxRule iso_code_country="dk" id_tax="2"/>
<taxRule iso_code_country="de" id_tax="2"/>
<taxRule iso_code_country="ee" id_tax="2"/>
<taxRule iso_code_country="gr" id_tax="2"/>
<taxRule iso_code_country="es" id_tax="2"/>
<taxRule iso_code_country="fr" id_tax="2"/>
<taxRule iso_code_country="ie" id_tax="2"/>
<taxRule iso_code_country="it" id_tax="2"/>
<taxRule iso_code_country="cy" id_tax="2"/>
<taxRule iso_code_country="lv" id_tax="2"/>
<taxRule iso_code_country="lt" id_tax="2"/>
<taxRule iso_code_country="lu" id_tax="2"/>
<taxRule iso_code_country="hu" id_tax="2"/>
<taxRule iso_code_country="mt" id_tax="2"/>
<taxRule iso_code_country="nl" id_tax="2"/>
<taxRule iso_code_country="at" id_tax="2"/>
<taxRule iso_code_country="pl" id_tax="2"/>
<taxRule iso_code_country="pt" id_tax="2"/>
<taxRule iso_code_country="ro" id_tax="2"/>
<taxRule iso_code_country="si" id_tax="2"/>
<taxRule iso_code_country="sk" id_tax="2"/>
<taxRule iso_code_country="fi" id_tax="2"/>
<taxRule iso_code_country="se" id_tax="2"/>
<taxRule iso_code_country="uk" id_tax="2"/>
</taxRulesGroup>
</taxes>
<units>
<unit type="weight" value="lb"/>
<unit type="volume" value="gal"/>
<unit type="short_distance" value="in"/>
<unit type="base_distance" value="ft"/>
<unit type="long_distance" value="mi"/>
</units>
</localizationPack>
localization/uk.xml
View File