joomla/patchtester
31
0
Fork 0
mirror of https://github.com/joomla-extensions/patchtester.git synced 2024-05-29 03:50:46 +00:00
Code Issues Releases Activity

Add missing translations

Browse Source
This commit is contained in:
Nikolai Plath 2012-06-12 15:07:26 -05:00
parent 573198f24e
commit 9b1887b38c
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
administrator/components/com_patchtester/controllers/pull.php
View File

@ -24,7 +24,7 @@ class PatchtesterControllerPull extends JController
$this->getModel('pull')
->apply(JRequest::getVar('pull_id'));
$msg = 'Patch successfully applied';
$msg = JText::_('COM_PATCHTESTER_APPLY_OK');
$type = 'message';
}
catch (Exception $e)
@ -43,12 +43,12 @@ class PatchtesterControllerPull extends JController
$this->getModel('pull')
->revert(JRequest::getVar('pull_id'));
$msg = 'Patch successfully reverted';
$msg = JText::_('COM_PATCHTESTER_REVERT_OK');
$type = 'message';
}
catch (Exception $e)
{
$msg = $e->getMessage() ?: 'Patch did not revert';
$msg = $e->getMessage();
$type = 'error';
}

15
administrator/components/com_patchtester/models/pull.php
View File

@ -201,14 +201,15 @@ class PatchtesterModelPull extends JModel
$table->store();
*/
$table->delete();
return true;
return $this;
}
$files = json_decode($table->data);
if (!$files)
{
throw new Exception(sprintf('%s - Error retrieving table data (%s)'
throw new Exception(sprintf(JText::_('%s - Error retrieving table data (%s)')
, __METHOD__, htmlentities($table->data)));
}
@ -223,14 +224,16 @@ class PatchtesterModelPull extends JModel
, JPATH_ROOT . '/' . $file->old)
)
{
throw new Exception(sprintf('Can not copy file %s to %s'
throw new Exception(sprintf(
JText::_('Can not copy file %s to %s')
, JPATH_COMPONENT . '/backups/' . md5($file->old) . '.txt'
, JPATH_ROOT . '/' . $file->old));
}
if (!JFile::delete(JPATH_COMPONENT . '/backups/' . md5($file->old) . '.txt'))
{
throw new Exception(sprintf('Can not delete the file: %s'
throw new Exception(sprintf(
JText::_('Can not delete the file: %s')
, JPATH_COMPONENT . '/backups/' . md5($file->old) . '.txt'));
}
break;
@ -238,7 +241,9 @@ class PatchtesterModelPull extends JModel
case 'added':
if (!JFile::delete(JPath::clean(JPATH_ROOT . '/' . $file->new)))
{
throw new Exception(sprintf('Can not delete the file: %s', JPATH_ROOT . '/' . $file->new));
throw new Exception(sprintf(
JText::_('Can not delete the file: %s')
, JPATH_ROOT . '/' . $file->new));
}
break;
}