bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Move L10n::withLang() calls to DI::l10n()->withLang() calls

Browse source
This commit is contained in:
Philipp Holzer 2020-01-18 20:54:15 +01:00
parent a9a36fb302
commit d3255afa66
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/enotify.php
View file

@ -57,7 +57,7 @@ function notification($params)
$params['to_email'] = ($params['to_email'] ?? '') ?: $user['email']; $params['to_email'] = ($params['to_email'] ?? '') ?: $user['email'];
// from here on everything is in the recipients language // from here on everything is in the recipients language
$l10n = L10n::withLang($params['language']); $l10n = DI::l10n()->withLang($params['language']);
$banner = $l10n->t('Friendica Notification'); $banner = $l10n->t('Friendica Notification');
$product = FRIENDICA_PLATFORM; $product = FRIENDICA_PLATFORM;

2
mod/regmod.php
View file

@ -36,7 +36,7 @@ function user_allow($hash)
Worker::add(PRIORITY_LOW, "Directory", $url); Worker::add(PRIORITY_LOW, "Directory", $url);
} }
$l10n = L10n::withLang($register['language']); $l10n = DI::l10n()->withLang($register['language']);
$res = User::sendRegisterOpenEmail( $res = User::sendRegisterOpenEmail(
$l10n, $l10n,

4
src/Core/Update.php
View file

@ -253,7 +253,7 @@ class Update
$sent[] = $admin['email']; $sent[] = $admin['email'];
$lang = (($admin['language'])?$admin['language']:'en'); $lang = (($admin['language'])?$admin['language']:'en');
$l10n = L10n::withLang($lang); $l10n = DI::l10n()->withLang($lang);
$preamble = Strings::deindent($l10n->t(" $preamble = Strings::deindent($l10n->t("
The friendica developers released update %s recently, The friendica developers released update %s recently,
@ -295,7 +295,7 @@ class Update
$sent[] = $admin['email']; $sent[] = $admin['email'];
$lang = (($admin['language']) ? $admin['language'] : 'en'); $lang = (($admin['language']) ? $admin['language'] : 'en');
$l10n = L10n::withLang($lang); $l10n = DI::l10n()->withLang($lang);
$preamble = Strings::deindent($l10n->t(" $preamble = Strings::deindent($l10n->t("
The friendica database was successfully updated from %s to %s.", The friendica database was successfully updated from %s to %s.",

2
src/Module/Register.php
View file

@ -297,7 +297,7 @@ class Register extends BaseModule
// Only send a password mail when the password wasn't manually provided // Only send a password mail when the password wasn't manually provided
if (empty($_POST['password1']) || empty($_POST['confirm'])) { if (empty($_POST['password1']) || empty($_POST['confirm'])) {
$res = Model\User::sendRegisterOpenEmail( $res = Model\User::sendRegisterOpenEmail(
L10n::withLang($arr['language']), DI::l10n()->withLang($arr['language']),
$user, $user,
Config::get('config', 'sitename'), Config::get('config', 'sitename'),
$base_url, $base_url,