From de6940352a2f708376219a89ec84a8e6d25ca59e Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Tue, 17 Sep 2019 16:33:27 +0200 Subject: Move settings to an app Signed-off-by: Christoph Wurst Signed-off-by: npmbuildbot[bot] --- lib/private/L10N/Factory.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib/private/L10N/Factory.php') diff --git a/lib/private/L10N/Factory.php b/lib/private/L10N/Factory.php index 80f12c0a832..2e1652e9a1b 100644 --- a/lib/private/L10N/Factory.php +++ b/lib/private/L10N/Factory.php @@ -469,7 +469,6 @@ class Factory implements IFactory { if (($this->isSubDirectory($transFile, $this->serverRoot . '/core/l10n/') || $this->isSubDirectory($transFile, $this->serverRoot . '/lib/l10n/') - || $this->isSubDirectory($transFile, $this->serverRoot . '/settings/l10n/') || $this->isSubDirectory($transFile, \OC_App::getAppPath($app) . '/l10n/') ) && file_exists($transFile)) { @@ -496,7 +495,7 @@ class Factory implements IFactory { * @return string directory */ protected function findL10nDir($app = null) { - if (in_array($app, ['core', 'lib', 'settings'])) { + if (in_array($app, ['core', 'lib'])) { if (file_exists($this->serverRoot . '/' . $app . '/l10n/')) { return $this->serverRoot . '/' . $app . '/l10n/'; } -- cgit v1.2.3