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

// changed English strings, especially focusing on colons harmonization

Browse Source
This commit is contained in:
fram
2013-03-12 19:39:30 +01:00
parent f7c76f60fb
commit ed947bc123
590 changed files with 6160 additions and 7064 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
controllers/admin/AdminLocalizationController.php
View File

@@ -130,7 +130,7 @@ class AdminLocalizationControllerCore extends AdminController
if (function_exists('date_default_timezone_set'))
$this->fields_options['general']['fields']['PS_TIMEZONE'] = array(
'title' => $this->l('Time Zone.'),
'title' => $this->l('Time zone:'),
'validation' => 'isAnything',
'type' => 'select',
'list' => Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT name FROM '._DB_PREFIX_.'timezone'),
@@ -152,7 +152,7 @@ class AdminLocalizationControllerCore extends AdminController
$pack = @Tools::file_get_contents('http://api.prestashop.com/localization/'.$version.'/'.Tools::getValue('iso_localization_pack').'.xml');
if (!$pack && !($pack = @Tools::file_get_contents(dirname(__FILE__).'/../../localization/'.Tools::getValue('iso_localization_pack').'.xml')))
$this->errors[] = Tools::displayError('Cannot load localization pack (from prestashop.com and from your local folder "localization")');
$this->errors[] = Tools::displayError('Cannot load the localization pack.');
if (!$selection = Tools::getValue('selection'))
$this->errors[] = Tools::displayError('Please select at least one item to import.');
@@ -221,12 +221,12 @@ class AdminLocalizationControllerCore extends AdminController
array(
'id' => 'taxes',
'val' => 'taxes',
'name' => $this->l('Taxes:')
'name' => $this->l('Taxes')
),
array(
'id' => 'currencies',
'val' => 'currencies',
'name' => $this->l('Currencies:')
'name' => $this->l('Currencies')
),
array(
'id' => 'languages',