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

Fetch proper translations

Browse source 
Fixes #14793

This is caused by the mess we have with OC\Settings mapping to settings
and lib/private/Settings.

Anyway this is the quick fix. Moving stuff around for 17 seems better.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2019-03-22 09:46:41 +01:00
parent 4785faed0b
commit a7fb71f908
No known key found for this signature in database
GPG key ID: F941078878347C0C
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/private/Settings/Admin/Sharing.php
View file

@ -31,6 +31,7 @@ use OCP\AppFramework\Http\TemplateResponse;
use OCP\Constants;
use OCP\IConfig;
use OCP\IL10N;
use OCP\L10N\IFactory;
use OCP\Settings\ISettings;
use OCP\Share\IManager;
use OCP\Util;
@ -48,9 +49,9 @@ class Sharing implements ISettings {
/**
* @param IConfig $config
*/
public function __construct(IConfig $config, IL10N $l, IManager $shareManager) {
public function __construct(IConfig $config, IFactory $l, IManager $shareManager) {
$this->config = $config;
$this->l = $l;
$this->l = $l->get('lib');
$this->shareManager = $shareManager;
}

8
tests/lib/Settings/Admin/SharingTest.php
View file

@ -28,6 +28,7 @@ use OCP\AppFramework\Http\TemplateResponse;
use OCP\Constants;
use OCP\IConfig;
use OCP\IL10N;
use OCP\L10N\IFactory;
use OCP\Share\IManager;
use Test\TestCase;
@ -45,11 +46,16 @@ class SharingTest extends TestCase {
parent::setUp();
$this->config = $this->getMockBuilder(IConfig::class)->getMock();
$this->l10n = $this->getMockBuilder(IL10N::class)->getMock();
$l10Factory = $this->createMock(IFactory::class);
$l10Factory->method('get')
->willReturn($this->l10n);
$this->shareManager = $this->getMockBuilder(IManager::class)->getMock();
$this->admin = new Sharing(
$this->config,
$this->l10n,
$l10Factory,
$this->shareManager
);
}