wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not save the language as request lang for apps when we didn't find any

Browse source
This commit is contained in:
Joas Schilling 2016-05-04 08:28:13 +02:00
parent adf7e7295e
commit 9fbb8ce302
No known key found for this signature in database
GPG key ID: 70A0B324C41C0946
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', ''],
];
}