From 23c0f4ff5f3b0023b4a2413536504d7065975a76 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 17 Mar 2016 16:15:37 +0100 Subject: Read available l10n files also from theme folder The old behaviour was that only languages could be used for an app that are already present in the apps/$app/l10n folder. If there is a themed l10n that is not present in the apps default l10n folder the language could not be used and the texts are not translated. With this change this is possible and also the l10n files are loaded even if the default l10n doesn't contain the l10n file. --- tests/data/themes/abc/apps/files/l10n/zz.json | 0 tests/lib/l10n/factorytest.php | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 tests/data/themes/abc/apps/files/l10n/zz.json (limited to 'tests') diff --git a/tests/data/themes/abc/apps/files/l10n/zz.json b/tests/data/themes/abc/apps/files/l10n/zz.json new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/lib/l10n/factorytest.php b/tests/lib/l10n/factorytest.php index 9f5954d0ee1..228ec482fc9 100644 --- a/tests/lib/l10n/factorytest.php +++ b/tests/lib/l10n/factorytest.php @@ -287,6 +287,31 @@ class FactoryTest extends TestCase { ]; } + public function testFindAvailableLanguagesWithThemes() { + $serverRoot = \OC::$SERVERROOT; + \OC::$SERVERROOT = \OC::$SERVERROOT . '/tests/data'; + $app = 'files'; + + $factory = $this->getFactory(['findL10nDir']); + $factory->expects($this->once()) + ->method('findL10nDir') + ->with($app) + ->willReturn(\OC::$SERVERROOT . '/apps/files/l10n/'); + $this->config + ->expects($this->once()) + ->method('getSystemValue') + ->with('theme') + ->willReturn('abc'); + + try { + $this->assertEquals(['en', 'zz'], $factory->findAvailableLanguages($app), '', 0.0, 10, true); + } catch (\Exception $e) { + \OC::$SERVERROOT = $serverRoot; + throw $e; + } + \OC::$SERVERROOT = $serverRoot; + } + /** * @dataProvider dataLanguageExists * -- cgit v1.2.3 From 76455204c0851b8bf373164140c7987e853925d2 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 18 Mar 2016 13:59:44 +0100 Subject: Inject server root - allows proper testing and separation of concerns --- lib/private/Server.php | 3 ++- lib/private/l10n/factory.php | 24 +++++++++++++++--------- tests/lib/l10n/factorytest.php | 23 +++++++++++------------ tests/lib/l10n/l10nlegacytest.php | 2 +- tests/lib/l10n/l10ntest.php | 2 +- 5 files changed, 30 insertions(+), 24 deletions(-) (limited to 'tests') diff --git a/lib/private/Server.php b/lib/private/Server.php index d68a361955f..48ee4b27d32 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -261,7 +261,8 @@ class Server extends ServerContainer implements IServerContainer { return new \OC\L10N\Factory( $c->getConfig(), $c->getRequest(), - $c->getUserSession() + $c->getUserSession(), + \OC::$SERVERROOT ); }); $this->registerService('URLGenerator', function (Server $c) { diff --git a/lib/private/l10n/factory.php b/lib/private/l10n/factory.php index 198c5605413..fd093c3601b 100644 --- a/lib/private/l10n/factory.php +++ b/lib/private/l10n/factory.php @@ -64,17 +64,23 @@ class Factory implements IFactory { /** @var IUserSession */ protected $userSession; + /** @var string */ + protected $serverRoot; + /** * @param IConfig $config * @param IRequest $request * @param IUserSession $userSession + * @param string $serverRoot */ public function __construct(IConfig $config, IRequest $request, - IUserSession $userSession) { + IUserSession $userSession, + $serverRoot) { $this->config = $config; $this->request = $request; $this->userSession = $userSession; + $this->serverRoot = $serverRoot; } /** @@ -189,7 +195,7 @@ class Factory implements IFactory { // merge with translations from theme $theme = $this->config->getSystemValue('theme'); if (!empty($theme)) { - $themeDir = \OC::$SERVERROOT . '/themes/' . $theme . substr($dir, strlen(\OC::$SERVERROOT)); + $themeDir = $this->serverRoot . '/themes/' . $theme . substr($dir, strlen($this->serverRoot)); if (is_dir($themeDir)) { $files = scandir($themeDir); @@ -280,9 +286,9 @@ class Factory implements IFactory { $i18nDir = $this->findL10nDir($app); $transFile = strip_tags($i18nDir) . strip_tags($lang) . '.json'; - if ((\OC_Helper::isSubDirectory($transFile, \OC::$SERVERROOT . '/core/l10n/') - || \OC_Helper::isSubDirectory($transFile, \OC::$SERVERROOT . '/lib/l10n/') - || \OC_Helper::isSubDirectory($transFile, \OC::$SERVERROOT . '/settings/l10n/') + if ((\OC_Helper::isSubDirectory($transFile, $this->serverRoot . '/core/l10n/') + || \OC_Helper::isSubDirectory($transFile, $this->serverRoot . '/lib/l10n/') + || \OC_Helper::isSubDirectory($transFile, $this->serverRoot . '/settings/l10n/') || \OC_Helper::isSubDirectory($transFile, \OC_App::getAppPath($app) . '/l10n/') ) && file_exists($transFile)) { @@ -293,7 +299,7 @@ class Factory implements IFactory { // merge with translations from theme $theme = $this->config->getSystemValue('theme'); if (!empty($theme)) { - $transFile = \OC::$SERVERROOT . '/themes/' . $theme . substr($transFile, strlen(\OC::$SERVERROOT)); + $transFile = $this->serverRoot . '/themes/' . $theme . substr($transFile, strlen($this->serverRoot)); if (file_exists($transFile)) { $languageFiles[] = $transFile; } @@ -310,14 +316,14 @@ class Factory implements IFactory { */ protected function findL10nDir($app = null) { if (in_array($app, ['core', 'lib', 'settings'])) { - if (file_exists(\OC::$SERVERROOT . '/' . $app . '/l10n/')) { - return \OC::$SERVERROOT . '/' . $app . '/l10n/'; + if (file_exists($this->serverRoot . '/' . $app . '/l10n/')) { + return $this->serverRoot . '/' . $app . '/l10n/'; } } else if ($app && \OC_App::getAppPath($app) !== false) { // Check if the app is in the app folder return \OC_App::getAppPath($app) . '/l10n/'; } - return \OC::$SERVERROOT . '/core/l10n/'; + return $this->serverRoot . '/core/l10n/'; } diff --git a/tests/lib/l10n/factorytest.php b/tests/lib/l10n/factorytest.php index 228ec482fc9..e4c0eab2e6a 100644 --- a/tests/lib/l10n/factorytest.php +++ b/tests/lib/l10n/factorytest.php @@ -28,6 +28,9 @@ class FactoryTest extends TestCase { /** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject */ protected $userSession; + /** @var string */ + protected $serverRoot; + public function setUp() { parent::setUp(); @@ -42,6 +45,8 @@ class FactoryTest extends TestCase { ->getMock(); $this->userSession = $this->getMock('\OCP\IUserSession'); + + $this->serverRoot = \OC::$SERVERROOT; } /** @@ -54,12 +59,13 @@ class FactoryTest extends TestCase { ->setConstructorArgs([ $this->config, $this->request, - $this->userSession + $this->userSession, + $this->serverRoot, ]) ->setMethods($methods) ->getMock(); } else { - return new Factory($this->config, $this->request, $this->userSession); + return new Factory($this->config, $this->request, $this->userSession, $this->serverRoot); } } @@ -288,28 +294,21 @@ class FactoryTest extends TestCase { } public function testFindAvailableLanguagesWithThemes() { - $serverRoot = \OC::$SERVERROOT; - \OC::$SERVERROOT = \OC::$SERVERROOT . '/tests/data'; + $this->serverRoot .= '/tests/data'; $app = 'files'; $factory = $this->getFactory(['findL10nDir']); $factory->expects($this->once()) ->method('findL10nDir') ->with($app) - ->willReturn(\OC::$SERVERROOT . '/apps/files/l10n/'); + ->willReturn($this->serverRoot . '/apps/files/l10n/'); $this->config ->expects($this->once()) ->method('getSystemValue') ->with('theme') ->willReturn('abc'); - try { - $this->assertEquals(['en', 'zz'], $factory->findAvailableLanguages($app), '', 0.0, 10, true); - } catch (\Exception $e) { - \OC::$SERVERROOT = $serverRoot; - throw $e; - } - \OC::$SERVERROOT = $serverRoot; + $this->assertEquals(['en', 'zz'], $factory->findAvailableLanguages($app), '', 0.0, 10, true); } /** diff --git a/tests/lib/l10n/l10nlegacytest.php b/tests/lib/l10n/l10nlegacytest.php index 025f761fe5c..1df22ba36bd 100644 --- a/tests/lib/l10n/l10nlegacytest.php +++ b/tests/lib/l10n/l10nlegacytest.php @@ -124,7 +124,7 @@ class L10nLegacyTest extends \Test\TestCase { } public function testFactoryGetLanguageCode() { - $factory = new \OC\L10N\Factory($this->getMock('OCP\IConfig'), $this->getMock('OCP\IRequest'), $this->getMock('OCP\IUserSession')); + $factory = new \OC\L10N\Factory($this->getMock('OCP\IConfig'), $this->getMock('OCP\IRequest'), $this->getMock('OCP\IUserSession'), \OC::$SERVERROOT); $l = $factory->get('lib', 'de'); $this->assertEquals('de', $l->getLanguageCode()); } diff --git a/tests/lib/l10n/l10ntest.php b/tests/lib/l10n/l10ntest.php index 0d175954bc1..227e07056a8 100644 --- a/tests/lib/l10n/l10ntest.php +++ b/tests/lib/l10n/l10ntest.php @@ -31,7 +31,7 @@ class L10nTest extends TestCase { $request = $this->getMock('OCP\IRequest'); /** @var IUserSession $userSession */ $userSession = $this->getMock('OCP\IUserSession'); - return new Factory($config, $request, $userSession); + return new Factory($config, $request, $userSession, \OC::$SERVERROOT); } public function testGermanPluralTranslations() { -- cgit v1.2.3