From 79e69ee52807967858f5cb89e702be035f979ba5 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Tue, 16 Jul 2019 16:50:49 +0200 Subject: [PATCH] Fix language (again ;-) ) --- src/Factory/DependencyFactory.php | 4 ++-- tests/include/ApiTest.php | 2 +- tests/src/Database/DBATest.php | 2 +- tests/src/Database/DBStructureTest.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Factory/DependencyFactory.php b/src/Factory/DependencyFactory.php index 79d51331ae..10d4ea587f 100644 --- a/src/Factory/DependencyFactory.php +++ b/src/Factory/DependencyFactory.php @@ -3,8 +3,8 @@ namespace Friendica\Factory; use Friendica\App; -use Friendica\Core\L10n\L10n; use Friendica\Core\Config\Cache\PConfigCache; +use Friendica\Core\L10n\L10n; use Friendica\Factory; use Friendica\Util\BasePath; use Friendica\Util\BaseURL; @@ -40,7 +40,7 @@ class DependencyFactory $logger = Factory\LoggerFactory::create($channel, $database, $config, $profiler); Factory\LoggerFactory::createDev($channel, $config, $profiler); $baseURL = new BaseURL($config, $_SERVER); - $l10n = new L10n(L10n::detectLanguage($config->get('system', 'language', 'de')), + $l10n = new L10n(L10n::detectLanguage($config->get('system', 'language')), $database, $logger); diff --git a/tests/include/ApiTest.php b/tests/include/ApiTest.php index 05ce00b10f..0c25ccc1c7 100644 --- a/tests/include/ApiTest.php +++ b/tests/include/ApiTest.php @@ -56,7 +56,7 @@ class ApiTest extends DatabaseTest $logger = Factory\LoggerFactory::create('test', self::$dba, $config, self::$profiler); $baseUrl = new BaseURL($config, $_SERVER); $router = new App\Router(); - $l10n = new L10n(L10n::detectLanguage($config->get('system', 'language', 'en')), + $l10n = new L10n(L10n::detectLanguage($config->get('system', 'language')), self::$dba, $logger); $this->app = new App(self::$dba, $config, self::$mode, $router, $baseUrl, $logger, self::$profiler, $l10n, false); diff --git a/tests/src/Database/DBATest.php b/tests/src/Database/DBATest.php index 97142976be..cc25373e1a 100644 --- a/tests/src/Database/DBATest.php +++ b/tests/src/Database/DBATest.php @@ -21,7 +21,7 @@ class DBATest extends DatabaseTest $logger = Factory\LoggerFactory::create('test', self::$dba, $config, self::$profiler); $baseUrl = new BaseURL($config, $_SERVER); $router = new App\Router(); - $l10n = new L10n(L10n::detectLanguage($config->get('system', 'language', 'en')), + $l10n = new L10n(L10n::detectLanguage($config->get('system', 'language')), self::$dba, $logger); $this->app = new App(self::$dba, $config, self::$mode, $router, $baseUrl, $logger, self::$profiler, $l10n, false); diff --git a/tests/src/Database/DBStructureTest.php b/tests/src/Database/DBStructureTest.php index 29de13cb78..3cecec62a9 100644 --- a/tests/src/Database/DBStructureTest.php +++ b/tests/src/Database/DBStructureTest.php @@ -25,7 +25,7 @@ class DBStructureTest extends DatabaseTest $logger = Factory\LoggerFactory::create('test', self::$dba, $config, self::$profiler); $baseUrl = new BaseURL($config, $_SERVER); $router = new App\Router(); - $l10n = new L10n(L10n::detectLanguage($config->get('system', 'language', 'en')), + $l10n = new L10n(L10n::detectLanguage($config->get('system', 'language')), self::$dba, $logger); $this->app = new App(self::$dba, $config, self::$mode, $router, $baseUrl, $logger, self::$profiler, $l10n, false); -- 2.39.5