Skip to content

[stable13] Load apps/APP/l10n/*.js and themes/THEME/apps/APP/l10n/*.js #11992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 1 commit into from
Oct 23, 2018
Merged

[stable13] Load apps/APP/l10n/*.js and themes/THEME/apps/APP/l10n/*.js #11992

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Load apps/APP/l10n/*.js and themes/THEME/apps/APP/l10n/*.js 
Before it quit right after finding the theme version of the l10n file which results in a not translated part of the UI.

Signed-off-by: Morris Jobke <[email protected]>
  • Loading branch information
@MorrisJobke
MorrisJobke committed Oct 23, 2018
commit 28fa1e3c7d8b1981df455b3c769121a83093d652
1 change: 1 addition & 0 deletions lib/private/Template/JSResourceLocator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public function doFind($script) {
$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) {
Expand Down