Coding standards

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

diff --git a/src/Core/L10n.php b/src/Core/L10n.php
index cda83ac3f4987b37372a4bb2fa2f0ccf470046df..dc31b418325b1bd453f0194fca6703ff2c519eb6 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
  *
@@ -33,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.
@@ -64,7 +67,7 @@ class L10n
                $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);
        }
@@ -158,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;
 
@@ -284,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)) {
@@ -294,16 +299,20 @@ 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 {
                        $s = $singular;