Skip to content

fix(JSResourceLocator): Handle missing translations silently #38207

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
skjnldsv merged 1 commit into from
May 12, 2023
Merged

fix(JSResourceLocator): Handle missing translations silently #38207

Show file tree
Hide file tree
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
25 changes: 16 additions & 9 deletions lib/private/Template/JSResourceLocator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,21 +99,28 @@ public function doFind($script) {
// gets turned into cwd.
$app_path = realpath($app_path);

// missing translations files will be ignored
if (strpos($script, 'l10n/') === 0) {
$this->appendScriptIfExist($app_path, $script, $app_url);
// check combined files
if ($this->cacheAndAppendCombineJsonIfExist($app_path, $script.'.json', $app)) {
return;
}

if (!$this->cacheAndAppendCombineJsonIfExist($app_path, $script.'.json', $app)) {
$this->appendScriptIfExist($app_path, $script, $app_url);
// fallback to plain file location
if ($this->appendScriptIfExist($app_path, $script, $app_url)) {
return;
}
} catch (AppPathNotFoundException) {
$this->logger->error('Could not find resource {resource} to load', [
'resource' => $app . '/' . $script . '.js',
'app' => 'jsresourceloader',
]);
// pass (general error handling happens below)
}

// missing translations files will be ignored
if (strpos($script, 'l10n/') === 0) {
return;
}

$this->logger->error('Could not find resource {resource} to load', [
'resource' => $app . '/' . $script . '.js',
'app' => 'jsresourceloader',
]);
}

/**
Expand Down
22 changes: 22 additions & 0 deletions tests/lib/Template/JSResourceLocatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
use OC\SystemConfig;
use OC\Template\JSCombiner;
use OC\Template\JSResourceLocator;
use OCP\App\AppPathNotFoundException;
use OCP\App\IAppManager;
use OCP\Files\IAppData;
use OCP\ICacheFactory;
Expand Down Expand Up @@ -139,6 +140,27 @@ public function testFindWithAppPathSymlink() {
$this->rrmdir($new_apps_path);
}

public function testNotExistingTranslationHandledSilent() {
$this->appManager->expects($this->once())
->method('getAppPath')
->with('core')
->willThrowException(new AppPathNotFoundException());
$this->appManager->expects($this->once())
->method('getAppWebPath')
->with('core')
->willThrowException(new AppPathNotFoundException());
// Assert logger is not called
$this->logger->expects($this->never())
->method('error');

// Run the tests
$locator = $this->jsResourceLocator();
$locator->find(["core/l10n/en.js"]);

$resources = $locator->getResources();
$this->assertCount(0, $resources);
}

public function testFindModuleJSWithFallback() {
// First create new apps path, and a symlink to it
$apps_dirname = $this->randomString();
Expand Down