diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-10-23 11:50:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-23 11:50:58 +0200 |
| commit | 304fcdf83798140d9370fc209513bc3ab757d459 (patch) | |
| tree | 03a4689176fa8ff069ed81259d944c3be55c1d1b | |
| parent | 7ca126299e2ca9638008b7cfd1a6526556ea4bfc (diff) | |
| parent | 9ea758758eae95bf80df0ef417586071ee8c6265 (diff) | |
| download | nextcloud-server-304fcdf83798140d9370fc209513bc3ab757d459.tar.gz nextcloud-server-304fcdf83798140d9370fc209513bc3ab757d459.zip | |
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
| -rw-r--r-- | lib/private/Template/JSResourceLocator.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/private/Template/JSResourceLocator.php b/lib/private/Template/JSResourceLocator.php index d38488e4618..8b23a8d1486 100644 --- a/lib/private/Template/JSResourceLocator.php +++ b/lib/private/Template/JSResourceLocator.php @@ -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) { |