mexon/friendica
1
0
Fork 0
Code Pull requests Activity

deindent calls

Browse source 
implement function in new class
This commit is contained in:
Adam Magness 2018-11-08 10:26:49 -05:00
parent 916b3e551e
commit b73af72deb
4 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mod/admin.php
View file

@ -1696,10 +1696,10 @@ function admin_page_users_post(App $a)
} }
$user = $result['user']; $user = $result['user'];
$preamble = deindent(L10n::t(' $preamble = Strings::deindent(L10n::t('
Dear %1$s, Dear %1$s,
the administrator of %2$s has set up an account for you.')); the administrator of %2$s has set up an account for you.'));
$body = deindent(L10n::t(' $body = Strings::deindent(L10n::t('
The login details are as follows: The login details are as follows:
Site Location: %1$s Site Location: %1$s

8
mod/lostpass.php
View file

@ -45,7 +45,7 @@ function lostpass_post(App $a)
$sitename = Config::get('config', 'sitename'); $sitename = Config::get('config', 'sitename');
$resetlink = System::baseUrl() . '/lostpass/' . $pwdreset_token; $resetlink = System::baseUrl() . '/lostpass/' . $pwdreset_token;
$preamble = deindent(L10n::t(' $preamble = Strings::deindent(L10n::t('
Dear %1$s, Dear %1$s,
A request was recently received at "%2$s" to reset your account A request was recently received at "%2$s" to reset your account
password. In order to confirm this request, please select the verification link password. In order to confirm this request, please select the verification link
@ -56,7 +56,7 @@ function lostpass_post(App $a)
Your password will not be changed unless we can verify that you Your password will not be changed unless we can verify that you
issued this request.', $user['username'], $sitename)); issued this request.', $user['username'], $sitename));
$body = deindent(L10n::t(' $body = Strings::deindent(L10n::t('
Follow this link soon to verify your identity: Follow this link soon to verify your identity:
%1$s %1$s
@ -151,13 +151,13 @@ function lostpass_generate_password($user)
info("Your password has been reset." . EOL); info("Your password has been reset." . EOL);
$sitename = Config::get('config', 'sitename'); $sitename = Config::get('config', 'sitename');
$preamble = deindent(L10n::t(' $preamble = Strings::deindent(L10n::t('
Dear %1$s, Dear %1$s,
Your password has been changed as requested. Please retain this Your password has been changed as requested. Please retain this
information for your records ' . "\x28" . 'or change your password immediately to information for your records ' . "\x28" . 'or change your password immediately to
something that you will remember' . "\x29" . '. something that you will remember' . "\x29" . '.
', $user['username'])); ', $user['username']));
$body = deindent(L10n::t(' $body = Strings::deindent(L10n::t('
Your login details are as follows: Your login details are as follows:
Site Location: %1$s Site Location: %1$s

5
src/Core/Update.php
View file

@ -4,6 +4,7 @@ namespace Friendica\Core;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Database\DBStructure; use Friendica\Database\DBStructure;
use Friendica\Util\Strings;
class Update class Update
{ {
@ -209,7 +210,7 @@ class Update
$lang = (($admin['language'])?$admin['language']:'en'); $lang = (($admin['language'])?$admin['language']:'en');
L10n::pushLang($lang); L10n::pushLang($lang);
$preamble = deindent(L10n::t(" $preamble = Strings::deindent(L10n::t("
The friendica developers released update %s recently, The friendica developers released update %s recently,
but when I tried to install it, something went terribly wrong. but when I tried to install it, something went terribly wrong.
This needs to be fixed soon and I can't do it alone. Please contact a This needs to be fixed soon and I can't do it alone. Please contact a
@ -244,7 +245,7 @@ class Update
$lang = (($admin['language']) ? $admin['language'] : 'en'); $lang = (($admin['language']) ? $admin['language'] : 'en');
L10n::pushLang($lang); L10n::pushLang($lang);
$preamble = 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.",
$from_build, $to_build)); $from_build, $to_build));

6
src/Model/User.php
View file

@ -693,7 +693,7 @@ class User
*/ */
public static function sendRegisterPendingEmail($user, $sitename, $siteurl, $password) public static function sendRegisterPendingEmail($user, $sitename, $siteurl, $password)
{ {
$body = deindent(L10n::t(' $body = Strings::deindent(L10n::t('
Dear %1$s, Dear %1$s,
Thank you for registering at %2$s. Your account is pending for approval by the administrator. Thank you for registering at %2$s. Your account is pending for approval by the administrator.
@ -728,13 +728,13 @@ class User
*/ */
public static function sendRegisterOpenEmail($user, $sitename, $siteurl, $password) public static function sendRegisterOpenEmail($user, $sitename, $siteurl, $password)
{ {
$preamble = deindent(L10n::t(' $preamble = Strings::deindent(L10n::t('
Dear %1$s, Dear %1$s,
Thank you for registering at %2$s. Your account has been created. Thank you for registering at %2$s. Your account has been created.
', ',
$preamble, $user['username'], $sitename $preamble, $user['username'], $sitename
)); ));
$body = deindent(L10n::t(' $body = Strings::deindent(L10n::t('
The login details are as follows: The login details are as follows:
Site Location: %3$s Site Location: %3$s