diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-10-23 09:13:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-23 09:13:31 +0200 |
| commit | baa8b65b0766d340a4ecaf43a3ad7f1f1ea812ab (patch) | |
| tree | 1835dc40131ff71af0d83f22f76408bb27f2d092 | |
| parent | 1623b2774329653fa45f1afdd8bf8e7c74e4fdd1 (diff) | |
| parent | 2a17281cb60ba3495cd76f0918a5df65847a12c6 (diff) | |
| download | nextcloud-server-baa8b65b0766d340a4ecaf43a3ad7f1f1ea812ab.tar.gz nextcloud-server-baa8b65b0766d340a4ecaf43a3ad7f1f1ea812ab.zip | |
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
| -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) { |