summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkesselb <mail@danielkesselberg.de>2020-10-27 17:28:13 +0100
committerGitHub <noreply@github.com>2020-10-27 17:28:13 +0100
commit54f2d9b5248ebf393e69840e8308d9593a6a9faf (patch)
tree54fc6781cd6313319851bd7a9d89098d2125c93e
parenta3ae8ee48c58aa565d198dc9d8a21aeab2c0de75 (diff)
parentfc403135d1bfb69afc8abe565e061e94e03fbca5 (diff)
downloadnextcloud-server-54f2d9b5248ebf393e69840e8308d9593a6a9faf.tar.gz
nextcloud-server-54f2d9b5248ebf393e69840e8308d9593a6a9faf.zip
Merge pull request #23722 from nextcloud/fix/noid/use-correct-l10n-module
Use lib instead if core as l10n module in OC_Files
-rw-r--r--lib/private/legacy/OC_Files.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/legacy/OC_Files.php b/lib/private/legacy/OC_Files.php
index ab8a70941fd..8b3ce2d0291 100644
--- a/lib/private/legacy/OC_Files.php
+++ b/lib/private/legacy/OC_Files.php
@@ -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);
}