mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24432 from owncloud/issue-24270-never-save-app-language-into-request-lang 

Do not save the language as request lang for apps when we didn't find…
This commit is contained in:
Morris Jobke 2016-05-04 13:47:08 +02:00
parent 61be98f554 9fbb8ce302
commit 873849e843
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/L10N/Factory.php
View File

@ -263,7 +263,7 @@ class Factory implements IFactory {
}
}
if (!$this->requestLanguage) {
if ($app === null && !$this->requestLanguage) {
$this->requestLanguage = 'en';
}
return 'en'; // Last try: English

9
tests/lib/l10n/factorytest.php
View File

@ -343,6 +343,15 @@ class FactoryTest extends TestCase {
[null, 'de', 'ru', ['de'], 'de', 'ru'],
[null, 'de,en', 'ru', ['de'], 'de', 'ru'],
[null, 'de-DE,en-US;q=0.8,en;q=0.6', 'ru', ['de'], 'de', 'ru'],
// Request lang should not be set for apps: Language is available
['files_pdfviewer', 'de', null, ['de'], 'de', ''],
['files_pdfviewer', 'de,en', null, ['de'], 'de', ''],
['files_pdfviewer', 'de-DE,en-US;q=0.8,en;q=0.6', null, ['de'], 'de', ''],
// Request lang should not be set for apps: Language is not available
['files_pdfviewer', 'de', null, ['ru'], 'en', ''],
['files_pdfviewer', 'de,en', null, ['ru', 'en'], 'en', ''],
['files_pdfviewer', 'de-DE,en-US;q=0.8,en;q=0.6', null, ['ru', 'en'], 'en', ''],
];
}