Merge pull request #23727 from nextcloud/backport/23722/stable20
[stable20] Use lib instead if core as l10n module in OC_Files
This commit is contained in:
commit
9cfaf9081d
|
@ -209,18 +209,18 @@ class OC_Files {
|
|||
} catch (\OCP\Lock\LockedException $ex) {
|
||||
self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
|
||||
OC::$server->getLogger()->logException($ex);
|
||||
$l = \OC::$server->getL10N('core');
|
||||
$l = \OC::$server->getL10N('lib');
|
||||
$hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
|
||||
\OC_Template::printErrorPage($l->t('File is currently busy, please try again later'), $hint, 200);
|
||||
} catch (\OCP\Files\ForbiddenException $ex) {
|
||||
self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
|
||||
OC::$server->getLogger()->logException($ex);
|
||||
$l = \OC::$server->getL10N('core');
|
||||
$l = \OC::$server->getL10N('lib');
|
||||
\OC_Template::printErrorPage($l->t('Can\'t read file'), $ex->getMessage(), 200);
|
||||
} catch (\Exception $ex) {
|
||||
self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
|
||||
OC::$server->getLogger()->logException($ex);
|
||||
$l = \OC::$server->getL10N('core');
|
||||
$l = \OC::$server->getL10N('lib');
|
||||
$hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
|
||||
\OC_Template::printErrorPage($l->t('Can\'t read file'), $hint, 200);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue