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

Fetch proper translations 

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\Constants;
use OCP\IConfig; use OCP\IConfig;
use OCP\IL10N; use OCP\IL10N;
use OCP\L10N\IFactory;
use OCP\Settings\ISettings; use OCP\Settings\ISettings;
use OCP\Share\IManager; use OCP\Share\IManager;
use OCP\Util; use OCP\Util;
@ -48,9 +49,9 @@ class Sharing implements ISettings {
/** /**
* @param IConfig $config * @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->config = $config;
$this->l = $l; $this->l = $l->get('lib');
$this->shareManager = $shareManager; $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\Constants;
use OCP\IConfig; use OCP\IConfig;
use OCP\IL10N; use OCP\IL10N;
use OCP\L10N\IFactory;
use OCP\Share\IManager; use OCP\Share\IManager;
use Test\TestCase; use Test\TestCase;
@ -45,11 +46,16 @@ class SharingTest extends TestCase {
parent::setUp(); parent::setUp();
$this->config = $this->getMockBuilder(IConfig::class)->getMock(); $this->config = $this->getMockBuilder(IConfig::class)->getMock();
$this->l10n = $this->getMockBuilder(IL10N::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->shareManager = $this->getMockBuilder(IManager::class)->getMock();
$this->admin = new Sharing( $this->admin = new Sharing(
$this->config, $this->config,
$this->l10n, $l10Factory,
$this->shareManager $this->shareManager
); );
} }