Merge pull request #10941 from nupplaphil/feat/worker_paradigm

[friendica.git] / src / Core / L10n.php

diff --git a/src/Core/L10n.php b/src/Core/L10n.php
index 8e6ee171c86cca18c5e4d302b1a4ce95e4797857..aca57793ca9711d1208c5e60f5c37231784f4a64 100644 (file)
--- a/src/Core/L10n.php
+++ b/src/Core/L10n.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,8 +21,8 @@
 
 namespace Friendica\Core;
 
-use Friendica\Core\Config\IConfig;
-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;
@@ -62,7 +62,7 @@ class L10n
         */
        private $logger;
 
-       public function __construct(IConfig $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;
@@ -85,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);
@@ -103,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'));
@@ -287,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)) {
@@ -297,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;
                }