Fix language (again ;-) )

diff --git a/src/Factory/DependencyFactory.php b/src/Factory/DependencyFactory.php
index 79d51331aedc60d927f77eaa133c00bbf9633419..10d4ea587f66ef563a702e6929b350d621bca91f 100644 (file)
--- 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 05ce00b10f2309a76363227da3656bb75152a2c7..0c25ccc1c71524d9772efceaa8c5d2d4320a0f05 100644 (file)
--- 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 97142976be214256b204f6fa620cbc6aadfd9ba8..cc25373e1aceba9d04bbb160ca7c1b6aa11591aa 100644 (file)
--- 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 29de13cb7886a4d2d3144dab51026c996268d070..3cecec62a9bd40dcdd80d0986b7faa8bd5ecf609 100644 (file)
--- 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);