Fixed review issues
This commit is contained in:
parent
25e3c9cbeb
commit
179b42c56d
|
@ -840,7 +840,8 @@ class OC_App{
|
|||
}
|
||||
catch (Exception $e) {
|
||||
OC_Hook::emit('update', 'failure', 'Failed to update '.$info['name'].' app: '.$e->getMessage());
|
||||
throw new RuntimeException('Failed to upgrade "'.$app.'". Exception="'.$e->getMessage().'"');
|
||||
$l = OC_L10N::get('lib');
|
||||
throw new RuntimeException($l->t('Failed to upgrade "%s".', array($app)), 0, $e);
|
||||
}
|
||||
OC_Appconfig::setValue($app, 'installed_version', OC_App::getAppVersion($app));
|
||||
}
|
||||
|
|
|
@ -62,7 +62,8 @@ class OC_Files {
|
|||
$zip = new ZipArchive();
|
||||
$filename = OC_Helper::tmpFile('.zip');
|
||||
if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==true) {
|
||||
throw new Exception("cannot open '$filename'\n");
|
||||
$l = OC_L10N::get('lib');
|
||||
throw new Exception($l->t('cannot open "%s"', array($filename)));
|
||||
}
|
||||
foreach ($files as $file) {
|
||||
$file = $dir . '/' . $file;
|
||||
|
@ -93,7 +94,8 @@ class OC_Files {
|
|||
$zip = new ZipArchive();
|
||||
$filename = OC_Helper::tmpFile('.zip');
|
||||
if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==true) {
|
||||
throw new Exception("cannot open '$filename'\n");
|
||||
$l = OC_L10N::get('lib');
|
||||
throw new Exception($l->t('cannot open "%s"', array($filename)));
|
||||
}
|
||||
$file = $dir . '/' . $files;
|
||||
self::zipAddDir($file, $zip);
|
||||
|
@ -249,8 +251,8 @@ class OC_Files {
|
|||
header("HTTP/1.0 409 Conflict");
|
||||
OC_Template::printErrorPage(
|
||||
$l->t('Selected files too large to generate zip file.'),
|
||||
'Download the files in smaller chunks, seperately'
|
||||
.' or kindly ask your administrator.<br/><a href="javascript:history.back()">'
|
||||
$l->t('Download the files in smaller chunks, seperately or kindly ask your administrator.')
|
||||
.'<br/><a href="javascript:history.back()">'
|
||||
. $l->t('Back to Files') . '</a>'
|
||||
);
|
||||
exit;
|
||||
|
|
|
@ -536,8 +536,9 @@ class OC_Template{
|
|||
if (!empty($hint)) {
|
||||
$hint = '<pre>'.$hint.'</pre>';
|
||||
}
|
||||
while (method_exists($exception,'previous') && $exception = $exception->previous()) {
|
||||
$error_msg .= '<br/>Caused by: ';
|
||||
$l = OC_L10N::get('lib');
|
||||
while (method_exists($exception, 'previous') && $exception = $exception->previous()) {
|
||||
$error_msg .= '<br/>'.$l->t('Caused by:').' ';
|
||||
if ($exception->getCode()) {
|
||||
$error_msg .= '['.$exception->getCode().'] ';
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue