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

Merge pull request #11990 from nextcloud/backport/11972/fix-l10n-fetching-from-theme 

[stable14] Load apps/APP/l10n/*.js and themes/THEME/apps/APP/l10n/*.js
This commit is contained in:
Roeland Jago Douma 2018-10-23 11:50:58 +02:00 committed by GitHub
parent 7ca126299e 9ea758758e
commit 304fcdf837
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/private/Template/JSResourceLocator.php
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, $theme_dir.'core/'.$script.'.js');
$found += $this->appendIfExist($this->serverroot, $script.'.js'); $found += $this->appendIfExist($this->serverroot, $script.'.js');
$found += $this->appendIfExist($this->serverroot, $theme_dir.$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'); $found += $this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$script.'.js');
if ($found) { if ($found) {