mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23728 from nextcloud/backport/23722/stable19 

[stable19] Use lib instead if core as l10n module in OC_Files
This commit is contained in:
Roeland Jago Douma 2020-10-27 20:08:30 +01:00 committed by GitHub
parent e9cfc6fd10 2561f4c02a
commit fe8e238df2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/legacy/OC_Files.php
View File

@ -208,18 +208,18 @@ class OC_Files {
} catch (\OCP\Lock\LockedException $ex) { } catch (\OCP\Lock\LockedException $ex) {
self::unlockAllTheFiles($dir, $files, $getType, $view, $filename); self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
OC::$server->getLogger()->logException($ex); OC::$server->getLogger()->logException($ex);
$l = \OC::$server->getL10N('core'); $l = \OC::$server->getL10N('lib');
$hint = method_exists($ex, 'getHint') ? $ex->getHint() : ''; $hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
\OC_Template::printErrorPage($l->t('File is currently busy, please try again later'), $hint, 200); \OC_Template::printErrorPage($l->t('File is currently busy, please try again later'), $hint, 200);
} catch (\OCP\Files\ForbiddenException $ex) { } catch (\OCP\Files\ForbiddenException $ex) {
self::unlockAllTheFiles($dir, $files, $getType, $view, $filename); self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
OC::$server->getLogger()->logException($ex); 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); \OC_Template::printErrorPage($l->t('Can\'t read file'), $ex->getMessage(), 200);
} catch (\Exception $ex) { } catch (\Exception $ex) {
self::unlockAllTheFiles($dir, $files, $getType, $view, $filename); self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
OC::$server->getLogger()->logException($ex); OC::$server->getLogger()->logException($ex);
$l = \OC::$server->getL10N('core'); $l = \OC::$server->getL10N('lib');
$hint = method_exists($ex, 'getHint') ? $ex->getHint() : ''; $hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
\OC_Template::printErrorPage($l->t('Can\'t read file'), $hint, 200); \OC_Template::printErrorPage($l->t('Can\'t read file'), $hint, 200);
} }