X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FL10n.php;h=aca57793ca9711d1208c5e60f5c37231784f4a64;hb=06284e60073f374c1bd411e0bba6474a13c14f10;hp=0238af3bd169d9d5d1e29b84553d25978f3b78e1;hpb=1bc4b2e0788ac11d3b377013b410f2250fff68aa;p=friendica.git

diff --git a/src/Core/L10n.php b/src/Core/L10n.php
index 0238af3bd1..aca57793ca 100644
--- a/src/Core/L10n.php
+++ b/src/Core/L10n.php
@@ -1,9 +1,28 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @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\Session\ISession;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\Session\Capability\IHandleSessions;
 use Friendica\Database\Database;
 use Friendica\Util\Strings;
 use Psr\Log\LoggerInterface;
@@ -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(IManageConfigValues $config, Database $dba, LoggerInterface $logger, IHandleSessions $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);
 	}
@@ -63,7 +85,7 @@ class L10n
 	/**
 	 * Sets the language session variable
 	 */
-	private function setSessionVariable(ISession $session)
+	private function setSessionVariable(IHandleSessions $session)
 	{
 		if ($session->get('authenticated') && !$session->get('language')) {
 			$session->set('language', $this->lang);
@@ -81,7 +103,7 @@ class L10n
 		}
 	}
 
-	private function setLangFromSession(ISession $session)
+	private function setLangFromSession(IHandleSessions $session)
 	{
 		if ($session->get('language') !== $this->lang) {
 			$this->loadTranslationTable($session->get('language'));
@@ -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;
 
@@ -265,6 +287,8 @@ class L10n
 	 */
 	public function tt(string $singular, string $plural, int $count)
 	{
+		$s = null;
+
 		if (!empty($this->strings[$singular])) {
 			$t = $this->strings[$singular];
 			if (is_array($t)) {
@@ -275,18 +299,22 @@ class L10n
 					$i = $this->stringPluralSelectDefault($count);
 				}
 
-				// for some languages there is only a single array item
-				if (!isset($t[$i])) {
-					$s = $t[0];
-				} else {
+				if (isset($t[$i])) {
 					$s = $t[$i];
+				} elseif (count($t) > 0) {
+					// for some languages there is only a single array item
+					$s = $t[0];
 				}
+				// if $t is empty, skip it, because empty strings array are indended
+				// to make string file smaller when there's no translation
 			} else {
 				$s = $t;
 			}
-		} elseif ($this->stringPluralSelectDefault($count)) {
+		}
+
+		if (is_null($s) && $this->stringPluralSelectDefault($count)) {
 			$s = $plural;
-		} else {
+		} elseif (is_null($s)) {
 			$s = $singular;
 		}