Don't cache local avatars

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

diff --git a/src/Core/L10n.php b/src/Core/L10n.php
index 33c670443674c2ecaa7f21a1e968aa5105146809..8f6b093f2d8cf3c561fc723d8030ce6619ec96fa 100644 (file)
--- a/src/Core/L10n.php
+++ b/src/Core/L10n.php
@@ -25,7 +25,6 @@ use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Session\Capability\IHandleSessions;
 use Friendica\Database\Database;
 use Friendica\Util\Strings;
-use Psr\Log\LoggerInterface;
 
 /**
  * Provide Language, Translation, and Localization functions to the application
@@ -35,6 +34,34 @@ class L10n
 {
        /** @var string The default language */
        const DEFAULT = 'en';
+       /** @var string[] The language names in their language */
+       const LANG_NAMES = [
+               'ar'    => 'العربية',
+               'bg'    => 'Български',
+               'ca'    => 'Català',
+               'cs'    => 'Česky',
+               'de'    => 'Deutsch',
+               'en-gb' => 'English (United Kingdom)',
+               'en-us' => 'English (United States)',
+               'en'    => 'English (Default)',
+               'eo'    => 'Esperanto',
+               'es'    => 'Español',
+               'et'    => 'Eesti',
+               'fi-fi' => 'Suomi',
+               'fr'    => 'Français',
+               'hu'    => 'Magyar',
+               'is'    => 'Íslenska',
+               'it'    => 'Italiano',
+               'ja'    => '日本語',
+               'nb-no' => 'Norsk bokmål',
+               'nl'    => 'Nederlands',
+               'pl'    => 'Polski',
+               'pt-br' => 'Português Brasileiro',
+               'ro'    => 'Română',
+               'ru'    => 'Русский',
+               'sv'    => 'Svenska',
+               'zh-cn' => '简体中文',
+       ];
 
        /**
         * A string indicating the current language used for translation:
@@ -57,15 +84,9 @@ class L10n
         */
        private $dba;
 
-       /**
-        * @var LoggerInterface
-        */
-       private $logger;
-
-       public function __construct(IManageConfigValues $config, Database $dba, LoggerInterface $logger, IHandleSessions $session, array $server, array $get)
+       public function __construct(IManageConfigValues $config, Database $dba, IHandleSessions $session, array $server, array $get)
        {
                $this->dba    = $dba;
-               $this->logger = $logger;
 
                $this->loadTranslationTable(L10n::detectLanguage($server, $get, $config->get('system', 'language', self::DEFAULT)));
                $this->setSessionVariable($session);
@@ -351,33 +372,6 @@ class L10n
        {
                $langs              = [];
                $strings_file_paths = glob('view/lang/*/strings.php');
-               $lang_names = [
-                       'ar'    => 'العربية',
-                       'bg'    => 'Български',
-                       'ca'    => 'Català',
-                       'cs'    => 'Česky',
-                       'de'    => 'Deutsch',
-                       'en-gb' => 'English (United Kingdom)',
-                       'en-us' => 'English (United States)',
-                       'en'    => 'English (Default)',
-                       'eo'    => 'Esperanto',
-                       'es'    => 'Español',
-                       'et'    => 'Eesti',
-                       'fi-fi' => 'Suomi',
-                       'fr'    => 'Français',
-                       'hu'    => 'Magyar',
-                       'is'    => 'Íslenska',
-                       'it'    => 'Italiano',
-                       'ja'    => '日本語',
-                       'nb-no' => 'Norsk bokmål',
-                       'nl'    => 'Nederlands',
-                       'pl'    => 'Polski',
-                       'pt-br' => 'Português Brasileiro',
-                       'ro'    => 'Română',
-                       'ru'    => 'Русский',
-                       'sv'    => 'Svenska',
-                       'zh-cn' => '简体中文',
-               ];
 
                if (is_array($strings_file_paths) && count($strings_file_paths)) {
                        if (!in_array('view/lang/en/strings.php', $strings_file_paths)) {
@@ -386,7 +380,7 @@ class L10n
                        asort($strings_file_paths);
                        foreach ($strings_file_paths as $strings_file_path) {
                                $path_array            = explode('/', $strings_file_path);
-                               $langs[$path_array[2]] = isset($lang_names[$path_array[2]]) ? $lang_names[$path_array[2]] : $path_array[2];
+                               $langs[$path_array[2]] = self::LANG_NAMES[$path_array[2]] ?? $path_array[2];
                        }
                }
                return $langs;