bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Replace global $lang with system.language

Browse source
This commit is contained in:
Hypolite Petovan 2018-07-09 22:37:51 -04:00
commit d0780ccf7d
6 changed files with 16 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Content/Text/HTML.php
View file

@ -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();

26
src/Core/L10n.php
View file

@ -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);