diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-01-14 18:12:05 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-01-14 18:12:05 +0100 |
| commit | 455ad005a01d3eeeb4d6d655f702d4c02ee811c8 (patch) | |
| tree | b2d7c5386485c7f1173c946058dfdc35d6a15a00 /lib | |
| parent | 01304aa27eb12beedf23b1faaee77ff6f2b283e9 (diff) | |
| parent | 6737dd111d582973abd3f40651d4d38ca5576df3 (diff) | |
| download | nextcloud-server-455ad005a01d3eeeb4d6d655f702d4c02ee811c8.tar.gz nextcloud-server-455ad005a01d3eeeb4d6d655f702d4c02ee811c8.zip | |
Merge pull request #13350 from owncloud/autoload-translations
Autoload app's js translations
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/util.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/util.php b/lib/private/util.php index d2d286fc11e..3b943f046bf 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -362,6 +362,10 @@ class OC_Util { public static function addScript($application, $file = null) { $path = OC_Util::generatePath($application, 'js', $file); if (!in_array($path, self::$scripts)) { + // core js files need separate handling + if ($application !== 'core' && $file !== null) { + self::addTranslations($application); + } self::$scripts[] = $path; } } |