X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FL10n.php;h=8e6ee171c86cca18c5e4d302b1a4ce95e4797857;hb=0d1fa70e2ecb372d158871285e0cda5f6d77194a;hp=3f92dd5800c35b857295dcb391050c69bf8a8d0b;hpb=2838635d648cee828f1f2dc29a499e0a61a3b9a1;p=friendica.git

diff --git a/src/Core/L10n.php b/src/Core/L10n.php
index 3f92dd5800..8e6ee171c8 100644
--- a/src/Core/L10n.php
+++ b/src/Core/L10n.php
@@ -1,8 +1,27 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Core;
 
-use Friendica\Core\Config\IConfiguration;
+use Friendica\Core\Config\IConfig;
 use Friendica\Core\Session\ISession;
 use Friendica\Database\Database;
 use Friendica\Util\Strings;
@@ -14,6 +33,9 @@ use Psr\Log\LoggerInterface;
  */
 class L10n
 {
+	/** @var string The default language */
+	const DEFAULT = 'en';
+
 	/**
 	 * A string indicating the current language used for translation:
 	 * - Two-letter ISO 639-1 code.
@@ -40,12 +62,12 @@ class L10n
 	 */
 	private $logger;
 
-	public function __construct(IConfiguration $config, Database $dba, LoggerInterface $logger, ISession $session, array $server, array $get)
+	public function __construct(IConfig $config, Database $dba, LoggerInterface $logger, ISession $session, array $server, array $get)
 	{
 		$this->dba    = $dba;
 		$this->logger = $logger;
 
-		$this->loadTranslationTable(L10n::detectLanguage($server, $get, $config->get('system', 'language', 'en')));
+		$this->loadTranslationTable(L10n::detectLanguage($server, $get, $config->get('system', 'language', self::DEFAULT)));
 		$this->setSessionVariable($session);
 		$this->setLangFromSession($session);
 	}
@@ -115,13 +137,13 @@ class L10n
 		$addons = $this->dba->select('addon', ['name'], ['installed' => true]);
 		while ($p = $this->dba->fetch($addons)) {
 			$name = Strings::sanitizeFilePathItem($p['name']);
-			if (file_exists("addon/$name/lang/$lang/strings.php")) {
-				include __DIR__ . "/../../../addon/$name/lang/$lang/strings.php";
+			if (file_exists(__DIR__ . "/../../addon/$name/lang/$lang/strings.php")) {
+				include __DIR__ . "/../../addon/$name/lang/$lang/strings.php";
 			}
 		}
 
-		if (file_exists(__DIR__ . "/../../../view/lang/$lang/strings.php")) {
-			include __DIR__ . "/../../../view/lang/$lang/strings.php";
+		if (file_exists(__DIR__ . "/../../view/lang/$lang/strings.php")) {
+			include __DIR__ . "/../../view/lang/$lang/strings.php";
 		}
 
 		$this->lang    = $lang;
@@ -131,7 +153,7 @@ class L10n
 	}
 
 	/**
-	 * @brief Returns the preferred language from the HTTP_ACCEPT_LANGUAGE header
+	 * Returns the preferred language from the HTTP_ACCEPT_LANGUAGE header
 	 *
 	 * @param string $sysLang The default fallback language
 	 * @param array  $server  The $_SERVER array
@@ -139,7 +161,7 @@ class L10n
 	 *
 	 * @return string The two-letter language code
 	 */
-	public static function detectLanguage(array $server, array $get, string $sysLang = 'en')
+	public static function detectLanguage(array $server, array $get, string $sysLang = self::DEFAULT)
 	{
 		$lang_variable = $server['HTTP_ACCEPT_LANGUAGE'] ?? null;
 
@@ -191,8 +213,8 @@ class L10n
 			while (count($lang_code)) {
 				// try to mix them so we can get double-code parts too
 				$match_lang = strtolower(join('-', $lang_code));
-				if (file_exists(__DIR__ . "/../../../view/lang/$match_lang") &&
-				    is_dir(__DIR__ . "/../../../view/lang/$match_lang")) {
+				if (file_exists(__DIR__ . "/../../view/lang/$match_lang") &&
+				    is_dir(__DIR__ . "/../../view/lang/$match_lang")) {
 					if ($lang_quality > $current_q) {
 						$current_lang = $match_lang;
 						$current_q    = $lang_quality;