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

//Changed English strings using the translationsenglish module.

Browse Source
This commit is contained in:
djfm
2013-01-04 16:58:58 +01:00
parent 507309ddf5
commit 385c593129
319 changed files with 5991 additions and 5991 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminBackupController.php
+7 -7
View File
@@ -58,8 +58,8 @@ class AdminBackupControllerCore extends AdminController
'type' => 'bool'
),
'PS_BACKUP_DROP_TABLE' => array(
'title' => $this->l('Drop existing tables during import:'),
'desc' => $this->l('If enabled, the backup script will drop your tables prior to restoring the backed up data').
'title' => $this->l('Drop existing tables during import'),
'desc' => $this->l('If enabled, the backup script will drop your tables prior to restoring data.').
'<br />(ie. "DROP TABLE IF EXISTS")',
'cast' => 'intval',
'type' => 'bool'
@@ -154,7 +154,7 @@ class AdminBackupControllerCore extends AdminController
// Test if the backup dir is writable
if (!is_writable(_PS_ADMIN_DIR_.'/backups/'))
$this->warnings[] = $this->l('"Backups" Directory in admin directory must be writeable (CHMOD 755 / 777)');
$this->warnings[] = $this->l('The "Backups" directory located in the admin directory must be writeable (CHMOD 755 / 777)');
if ($this->display == 'add' && is_writable(_PS_ADMIN_DIR_.'/backups/'))
{
@@ -164,7 +164,7 @@ class AdminBackupControllerCore extends AdminController
$this->errors[] = $object->error;
else
$this->context->smarty->assign(array(
'conf' => $this->l('It appears that the Backup was successful, however, you must download and carefully verify the Backup file.'),
'conf' => $this->l('It appears the backup was successful, however you must download and carefully verify the backup file before proceeding. '),
'backup_url' => $object->getBackupURL(),
'backup_weight' => number_format((filesize($object->id) * 0.000001), 2, '.', '')
));
@@ -234,16 +234,16 @@ class AdminBackupControllerCore extends AdminController
$date = date('Y-m-d H:i:s', $timestamp);
$age = time() - $timestamp;
if ($age < 3600)
$age = '< 1 '.$this->l('hour');
$age = '< 1 '.$this->l('Hour');
else if ($age < 86400)
{
$age = floor($age / 3600);
$age = $age.' '.(($age == 1) ? $this->l('hour') : $this->l('hours'));
$age = $age.' '.(($age == 1) ? $this->l('Hour') : $this->l('Hours'));
}
else
{
$age = floor($age / 86400);
$age = $age.' '.(($age == 1) ? $this->l('day') : $this->l('days'));
$age = $age.' '.(($age == 1) ? $this->l('Day') : $this->l('Days'));
}
$size = filesize(_PS_ADMIN_DIR_.'/backups/'.$file);
$this->_list[] = array(