Merge pull request #11972 from nextcloud/bugfix/noid/fix-l10n-fetching-from-theme

Load apps/APP/l10n/*.js and themes/THEME/apps/APP/l10n/*.js
This commit is contained in:
Morris Jobke 2018-10-23 09:13:31 +02:00 committed by GitHub
commit baa8b65b07
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -55,6 +55,7 @@ class JSResourceLocator extends ResourceLocator {
$found += $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$script.'.js');
$found += $this->appendIfExist($this->serverroot, $script.'.js');
$found += $this->appendIfExist($this->serverroot, $theme_dir.$script.'.js');
$found += $this->appendIfExist($this->serverroot, 'apps/'.$script.'.js');
$found += $this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$script.'.js');
if ($found) {