Replace global $lang with system.language

diff --git a/config/defaults.ini.php b/config/defaults.ini.php
index 84c039c2a00134d3e280daabe8f2a407d513b87e..2f1357e3aa6ab7b67d91921768251a68034ff403 100644 (file)
--- a/config/defaults.ini.php
+++ b/config/defaults.ini.php
@@ -209,7 +209,7 @@ invitation_only = false
 jpeg_quality = 100
 
 ; language (String)
-; Admin-created user default language.
+; System default languague, inluding admin-created user default language.
 ; Two-letters ISO 639-1 code.
 language = en
 

diff --git a/mod/help.php b/mod/help.php
index ef640737aa1bf3ceb94a78590449d18b8c7c8f77..5db74c15e8f68c9cee6c7e58c49cd0bba8fc1fd9 100644 (file)
--- a/mod/help.php
+++ b/mod/help.php
@@ -6,13 +6,13 @@
 use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Content\Text\Markdown;
+use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 
 function load_doc_file($s)
 {
-       global $lang;
-       if (!isset($lang)) $lang = 'en';
+       $lang = Config::get('system', 'language');
        $b = basename($s);
        $d = dirname($s);
        if (file_exists("$d/$lang/$b")) {
@@ -30,8 +30,6 @@ function help_content(App $a)
 {
        Nav::setSelected('help');
 
-       global $lang;
-
        $text = '';
 
        if ($a->argc > 1) {

diff --git a/mod/register.php b/mod/register.php
index 75f2ec8532eab6428d565d95fc779ebf006fded3..53bca684050991ac76ae0f3b7e526d26d03ab0af 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -21,8 +21,6 @@ function register_post(App $a)
 {
        check_form_security_token_redirectOnErr('/register', 'register');
 
-       global $lang;
-
        $verified = 0;
        $blocked  = 1;
 
@@ -123,7 +121,7 @@ function register_post(App $a)
                        dbesc(DateTimeFormat::utcNow()),
                        intval($user['uid']),
                        dbesc($result['password']),
-                       dbesc($lang),
+                       dbesc(Config::get('system', 'language')),
                        dbesc($_POST['permonlybox'])
                );
 

diff --git a/mod/regmod.php b/mod/regmod.php
index 083465984f75e0144fbdeb81ae4d151eee2a2d82..2a418fcda053def513c06560d68866b73572fa21 100644 (file)
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -97,8 +97,6 @@ function user_deny($hash)
 
 function regmod_content(App $a)
 {
-       global $lang;
-
        if (!local_user()) {
                info(L10n::t('Please login.') . EOL);
                $o = '<br /><br />' . Login::form($a->query_string, Config::get('config', 'register_policy') === REGISTER_CLOSED ? 0 : 1);

diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php
index 896db876f581bd5fa4eb0440f12e1bf49a3496d3..d6e699ed7b90e0b894419a823c911cdd08de8bcf 100644 (file)
--- a/src/Content/Text/HTML.php
+++ b/src/Content/Text/HTML.php
@@ -549,8 +549,6 @@ class HTML
 
        public static function toPlaintext($html, $wraplength = 75, $compact = false)
        {
-               global $lang;
-
                $message = str_replace("\r", "", $html);
 
                $doc = new DOMDocument();

diff --git a/src/Core/L10n.php b/src/Core/L10n.php
index 24be0109554b2e4ba0a02e98502ffbddc4a83e2a..2389817021b2a5bc26e9e511f94ec8a4df7f1ef5 100644 (file)
--- a/src/Core/L10n.php
+++ b/src/Core/L10n.php
@@ -14,7 +14,7 @@ require_once 'include/dba.php';
  * Provide Languange, Translation, and Localisation functions to the application
  * Localisation can be referred to by the numeronym L10N (as in: "L", followed by ten more letters, and then "N").
  */
-class L10n
+class L10n extends \Friendica\BaseObject
 {
        /**
         * @brief get the prefered language from the HTTP_ACCEPT_LANGUAGE header
@@ -62,11 +62,11 @@ class L10n
         */
        public static function pushLang($language)
        {
-               global $lang, $a;
+               $a = self::getApp();
 
-               $a->langsave = $lang;
+               $a->langsave = Config::get('system', 'language');
 
-               if ($language === $lang) {
+               if ($language === $a->langsave) {
                        return;
                }
 
@@ -75,7 +75,7 @@ class L10n
                }
                $a->strings = [];
                self::loadTranslationTable($language);
-               $lang = $language;
+               Config::set('system', 'language', $language);
        }
 
        /**
@@ -83,9 +83,9 @@ class L10n
         */
        public static function popLang()
        {
-               global $lang, $a;
+               $a = self::getApp();
 
-               if ($lang === $a->langsave) {
+               if (Config::get('system', 'language') === $a->langsave) {
                        return;
                }
 
@@ -95,7 +95,7 @@ class L10n
                        $a->strings = [];
                }
 
-               $lang = $a->langsave;
+               Config::set('system', 'language', $a->langsave);
        }
 
        /**
@@ -107,7 +107,7 @@ class L10n
         */
        public static function loadTranslationTable($lang)
        {
-               $a = get_app();
+               $a = self::getApp();
 
                $a->strings = [];
                // load enabled addons strings
@@ -142,7 +142,7 @@ class L10n
         */
        public static function t($s, ...$vars)
        {
-               $a = get_app();
+               $a = self::getApp();
 
                if (empty($s)) {
                        return '';
@@ -173,7 +173,6 @@ class L10n
         * - L10n::tt('Like', 'Likes', $count)
         * - L10n::tt("%s user deleted", "%s users deleted", count($users))
         *
-        * @global type $lang
         * @param string $singular
         * @param string $plural
         * @param int $count
@@ -181,10 +180,9 @@ class L10n
         */
        public static function tt($singular, $plural, $count)
        {
-               global $lang;
-               $a = get_app();
+               $lang = Config::get('system', 'language');
 
-               if (x($a->strings, $singular)) {
+               if (!empty($a->strings[$singular])) {
                        $t = $a->strings[$singular];
                        if (is_array($t)) {
                                $plural_function = 'string_plural_select_' . str_replace('-', '_', $lang);