friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Fix spaces around t() and tt()

This commit is contained in:
fabrixxm 2011-03-13 13:50:44 +01:00
parent a00beafe7f
commit a7af6df962
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/dfrn_confirm.php
View File

@ -645,7 +645,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
'$uid' => $newuid ) '$uid' => $newuid )
); );
$res = mail($r[0]['email'], sprintf(t("Connection accepted at %s"), $a->config['sitename']), $res = mail($r[0]['email'], sprintf( t("Connection accepted at %s") , $a->config['sitename']),
$email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] ); $email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] );
if(!$res) { if(!$res) {
// pointless throwing an error here and confusing the person at the other end of the wire. // pointless throwing an error here and confusing the person at the other end of the wire.

4
mod/dfrn_notify.php
View File

@ -471,8 +471,8 @@ function dfrn_notify_post(&$a) {
'$body' => html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8') '$body' => html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8')
)); ));
$res = mail($importer['email'], sprintf(t("%s commented on an item at %s"), $from ,$a->config['sitename']), $res = mail($importer['email'], sprintf( t("%s commented on an item at %s") , $from ,$a->config['sitename']),
$email_tpl,t("From: Administrator@") . $a->get_hostname() ); $email_tpl, t("From: Administrator@") . $a->get_hostname() );
break; break;
} }
} }

2
mod/dfrn_request.php
View File

@ -540,7 +540,7 @@ function dfrn_request_content(&$a) {
'$sitename' => $a->config['sitename'] '$sitename' => $a->config['sitename']
)); ));
$res = mail($r[0]['email'], $res = mail($r[0]['email'],
t("Introduction received at ") . $a->config['sitename'], t("Introduction received at ") . $a->config['sitename'],
$email, $email,
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] ); 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] );
// This is a redundant notification - no point throwing errors if it fails. // This is a redundant notification - no point throwing errors if it fails.

2
mod/home.php
View File

@ -20,7 +20,7 @@ function home_content(&$a) {
if(x($_SESSION,'theme')) if(x($_SESSION,'theme'))
unset($_SESSION['theme']); unset($_SESSION['theme']);
$o .= '<h1>' . ((x($a->config,'sitename')) ? sprintf(t("Welcome to %s"),$a->config['sitename']) : "" ) . '</h1>'; $o .= '<h1>' . ((x($a->config,'sitename')) ? sprintf( t("Welcome to %s") ,$a->config['sitename']) : "" ) . '</h1>';
if(file_exists('home.html')) if(file_exists('home.html'))
$o .= file_get_contents('home.html'); $o .= file_get_contents('home.html');

2
mod/invite.php
View File

@ -39,7 +39,7 @@ function invite_post(&$a) {
} }
} }
notice( sprintf(tt("%d message sent.", "%d messages sent.", $total), $total) . EOL); notice( sprintf( tt("%d message sent.", "%d messages sent.", $total) , $total) . EOL);
return; return;
} }

4
mod/item.php
View File

@ -419,7 +419,7 @@ function item_post(&$a) {
'$body' => strip_tags(bbcode($datarray['body'])) '$body' => strip_tags(bbcode($datarray['body']))
)); ));
$res = mail($user['email'], sprintf(t("%s commented on your item at %s"),$from,$a->config['sitename']), $res = mail($user['email'], sprintf( t("%s commented on your item at %s") ,$from,$a->config['sitename']),
$email_tpl,"From: " . t("Administrator") . "@" . $a->get_hostname() ); $email_tpl,"From: " . t("Administrator") . "@" . $a->get_hostname() );
} }
} }
@ -442,7 +442,7 @@ function item_post(&$a) {
'$body' => strip_tags(bbcode($datarray['body'])) '$body' => strip_tags(bbcode($datarray['body']))
)); ));
$res = mail($user['email'], sprintf(t("%s posted on your profile wall at %s"),$from, $a->config['sitename']), $res = mail($user['email'], sprintf( t("%s posted on your profile wall at %s") ,$from, $a->config['sitename']),
$email_tpl,"From: " . t("Administrator@") . "@" . $a->get_hostname() ); $email_tpl,"From: " . t("Administrator@") . "@" . $a->get_hostname() );
} }
} }

2
mod/like.php
View File

@ -148,7 +148,7 @@ EOT;
$arr['author-link'] = $contact['url']; $arr['author-link'] = $contact['url'];
$arr['author-avatar'] = $contact['thumb']; $arr['author-avatar'] = $contact['thumb'];
$arr['body'] = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' . ' ' . $bodyverb . ' ' $arr['body'] = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' . ' ' . $bodyverb . ' '
. '[url=' . $item['author-link'] . ']' . sprintf(t("%s's"),$item['author-name']) . '[/url]' . ' ' . '[url=' . $item['author-link'] . ']' . sprintf( t("%s's") ,$item['author-name']) . '[/url]' . ' '
. '[url=' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]' ; . '[url=' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]' ;
$arr['verb'] = $activity; $arr['verb'] = $activity;

2
mod/manage.php
View File

@ -34,7 +34,7 @@ function manage_post(&$a) {
$_SESSION['page_flags'] = $r[0]['page-flags']; $_SESSION['page_flags'] = $r[0]['page-flags'];
$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['nickname']; $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['nickname'];
notice( sprintf(t("Welcome back %s"), $r[0]['username']) . EOL); notice( sprintf( t("Welcome back %s") , $r[0]['username']) . EOL);
$a->user = $r[0]; $a->user = $r[0];
if(strlen($a->user['timezone'])) { if(strlen($a->user['timezone'])) {