upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 10:10:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

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

Browse source 
[stable13] 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:34 +02:00 committed by GitHub
commit 18b4b6c324
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, $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) {