tobias/friendica
1
0
Fork 0
Code Pull requests Activity

update source strings

Browse source
This commit is contained in:
fabrixxm 2011-03-11 00:22:21 +01:00
parent 89781ba428
commit 9f7878057f
18 changed files with 2458 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mod/contacts.php
View file

@ -137,7 +137,8 @@ function contacts_content(&$a) {
intval(local_user()) intval(local_user())
); );
if($r) { if($r) {
notice( t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL ); //notice( t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL );
notice( (($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')) . EOL );
} }
goaway($a->get_baseurl() . '/contacts/' . $contact_id); goaway($a->get_baseurl() . '/contacts/' . $contact_id);
return; // NOTREACHED return; // NOTREACHED
@ -151,7 +152,7 @@ function contacts_content(&$a) {
intval(local_user()) intval(local_user())
); );
if($r) { if($r) {
notice( t('Contact has been ') . (($readonly) ? t('ignored') : t('unignored')) . EOL ); notice( (($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')) . EOL );
} }
goaway($a->get_baseurl() . '/contacts/' . $contact_id); goaway($a->get_baseurl() . '/contacts/' . $contact_id);
return; // NOTREACHED return; // NOTREACHED
@ -364,13 +365,14 @@ function contacts_content(&$a) {
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(
'$img_hover' => t('Visit ') . $rr['name'] . t('\'s profile'), '$img_hover' => t('Visit $username\'s profile'),
'$edit_hover' => t('Edit contact'), '$edit_hover' => t('Edit contact'),
'$id' => $rr['id'], '$id' => $rr['id'],
'$alt_text' => $alt_text, '$alt_text' => $alt_text,
'$dir_icon' => $dir_icon, '$dir_icon' => $dir_icon,
'$thumb' => $rr['thumb'], '$thumb' => $rr['thumb'],
'$name' => substr($rr['name'],0,20), '$name' => substr($rr['name'],0,20),
'$username' => $rr['name'],
'$sparkle' => $sparkle, '$sparkle' => $sparkle,
'$url' => $url '$url' => $url
)); ));

4
mod/dfrn_confirm.php
View file

@ -491,7 +491,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
dbesc($node)); dbesc($node));
if(! count($r)) { if(! count($r)) {
$message = t('No user record found for ') . '\'' . $node . '\''; $message = sprintf(t('No user record found for \'%s\' '), $node);
xml_status(3,$message); // failure xml_status(3,$message); // failure
// NOTREACHED // NOTREACHED
} }
@ -645,7 +645,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
'$uid' => $newuid ) '$uid' => $newuid )
); );
$res = mail($r[0]['email'], t("Connection accepted at ") . $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.

5
mod/dfrn_notify.php
View file

@ -385,7 +385,7 @@ 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'], $from . t(' commented on an item at ') . $a->config['sitename'], $res = mail($importer['email'], sprintf(t('%s commented on an item at %s'), $from , $a->config['sitename']),
$email_tpl, "From: " . t('Administrator') . '@' . $a->get_hostname() ); $email_tpl, "From: " . t('Administrator') . '@' . $a->get_hostname() );
} }
} }
@ -471,8 +471,7 @@ 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'], $from . t(" commented on an item at ") $res = mail($importer['email'], sprintf(t("%s commented on an item at %s"), $from ,$a->config['sitename']),
. $a->config['sitename'],
$email_tpl,t("From: Administrator@") . $a->get_hostname() ); $email_tpl,t("From: Administrator@") . $a->get_hostname() );
break; break;
} }

4
mod/dfrn_poll.php
View file

@ -75,7 +75,7 @@ function dfrn_poll_init(&$a) {
$_SESSION['authenticated'] = 1; $_SESSION['authenticated'] = 1;
$_SESSION['visitor_id'] = $r[0]['id']; $_SESSION['visitor_id'] = $r[0]['id'];
$_SESSION['visitor_home'] = $r[0]['url']; $_SESSION['visitor_home'] = $r[0]['url'];
notice( $r[0]['username'] . t(' welcomes ') . $r[0]['name'] . EOL); notice( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL);
// Visitors get 1 day session. // Visitors get 1 day session.
$session_id = session_id(); $session_id = session_id();
$expire = time() + 86400; $expire = time() + 86400;
@ -389,7 +389,7 @@ function dfrn_poll_content(&$a) {
$_SESSION['authenticated'] = 1; $_SESSION['authenticated'] = 1;
$_SESSION['visitor_id'] = $r[0]['id']; $_SESSION['visitor_id'] = $r[0]['id'];
$_SESSION['visitor_home'] = $r[0]['url']; $_SESSION['visitor_home'] = $r[0]['url'];
notice( $r[0]['username'] . t(' welcomes ') . $r[0]['name'] . EOL); notice( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL);
// Visitors get 1 day session. // Visitors get 1 day session.
$session_id = session_id(); $session_id = session_id();
$expire = time() + 86400; $expire = time() + 86400;

16
mod/dfrn_request.php
View file

@ -123,9 +123,9 @@ function dfrn_request_post(&$a) {
notice( t('Warning: profile location has no profile photo.') . EOL ); notice( t('Warning: profile location has no profile photo.') . EOL );
$invalid = validate_dfrn($parms); $invalid = validate_dfrn($parms);
if($invalid) { if($invalid) {
notice( $invalid . t(' required parameter') notice( sprintf( tt("%d required parameter was not found at the given location",
. (($invalid == 1) ? t(" was ") : t("s were ") ) "%d required parameters were not found at the given location",
. t("not found at the given location.") . EOL ) ; $invalid), $invalid) . EOL );
return; return;
} }
} }
@ -238,7 +238,7 @@ function dfrn_request_post(&$a) {
intval($uid) intval($uid)
); );
if(count($r) > $maxreq) { if(count($r) > $maxreq) {
notice( $a->profile['name'] . t(' has received too many connection requests today.') . EOL); notice( sprintf( t('%s has received too many connection requests today.'), $a->profile['name']) . EOL);
notice( t('Spam protection measures have been invoked.') . EOL); notice( t('Spam protection measures have been invoked.') . EOL);
notice( t('Friends are advised to please try again in 24 hours.') . EOL); notice( t('Friends are advised to please try again in 24 hours.') . EOL);
return; return;
@ -306,7 +306,7 @@ function dfrn_request_post(&$a) {
return; return;
} }
elseif($ret[0]['rel'] == REL_BUD) { elseif($ret[0]['rel'] == REL_BUD) {
notice( t('Apparently you are already friends with .') . $a->profile['name'] . EOL); notice( sprintf( t('Apparently you are already friends with %s.'), $a->profile['name']) . EOL);
return; return;
} }
else { else {
@ -354,9 +354,9 @@ function dfrn_request_post(&$a) {
notice( t('Warning: profile location has no profile photo.') . EOL ); notice( t('Warning: profile location has no profile photo.') . EOL );
$invalid = validate_dfrn($parms); $invalid = validate_dfrn($parms);
if($invalid) { if($invalid) {
notice( $invalid . t(' required parameter') notice( sprintf( tt("%d required parameter was not found at the given location",
. (($invalid == 1) ? t(" was ") : t("s were ") ) "%d required parameters were not found at the given location",
. t("not found at the given location.") . EOL ) ; $invalid), $invalid) . EOL );
return; return;
} }

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')) ? t("Welcome to ").$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');

10
mod/invite.php
View file

@ -25,21 +25,21 @@ function invite_post(&$a) {
$recip = trim($recip); $recip = trim($recip);
if(! valid_email($recip)) { if(! valid_email($recip)) {
notice( $recip . t(' : ') . t('Not a valid email address.') . EOL); notice( sprintf( t('%s : Not a valid email address.'), $recip) . EOL);
continue; continue;
} }
$res = mail($recip, t('Please join my network on ') . $a->config['sitename'], $res = mail($recip, sprintf(t('Please join my network on %s'), $a->config['sitename']),
$message, "From: " . $a->user['email']); $message, "From: " . $a->user['email']);
if($res) { if($res) {
$total ++; $total ++;
} }
else { else {
notice( $recip . t(' : ') . t('Message delivery failed.') . EOL); notice( sprintf( t('%s : Message delivery failed.'), $recip) . EOL);
} }
} }
notice( $total . t(' messages sent.') . EOL); notice( sprintf(tt("%d message sent.", "%d messages sent.", $total), $total) . EOL);
return; return;
} }
@ -57,7 +57,7 @@ function invite_content(&$a) {
'$invite' => t('Send invitations'), '$invite' => t('Send invitations'),
'$addr_text' => t('Enter email addresses, one per line:'), '$addr_text' => t('Enter email addresses, one per line:'),
'$msg_text' => t('Your message:'), '$msg_text' => t('Your message:'),
'$default_message' => t('Please join my social network on ') . $a->config['sitename'] . "\r\n" . "\r\n" '$default_message' => sprintf(t('Please join my social network on %s'), $a->config['sitename']) . "\r\n" . "\r\n"
. t('To accept this invitation, please visit:') . "\r\n" . "\r\n" . $a->get_baseurl() . t('To accept this invitation, please visit:') . "\r\n" . "\r\n" . $a->get_baseurl()
. "\r\n" . "\r\n" . t('Once you have registered, please connect with me via my profile page at:') . "\r\n" . "\r\n" . t('Once you have registered, please connect with me via my profile page at:')
. "\r\n" . "\r\n" . $a->get_baseurl() . '/profile/' . $a->user['nickname'] , . "\r\n" . "\r\n" . $a->get_baseurl() . '/profile/' . $a->user['nickname'] ,

14
mod/item.php
View file

@ -419,8 +419,8 @@ function item_post(&$a) {
'$body' => strip_tags(bbcode($datarray['body'])) '$body' => strip_tags(bbcode($datarray['body']))
)); ));
$res = mail($user['email'], $from . t(" commented on your item at ") . $a->config['sitename'], $res = mail($user['email'], sprintf(t("%s commented on your item at %s"),$from,$a->config['sitename']),
$email_tpl,t("From: Administrator@") . $a->get_hostname() ); $email_tpl,"From: " . t("Administrator") . "@" . $a->get_hostname() );
} }
} }
else { else {
@ -442,8 +442,8 @@ function item_post(&$a) {
'$body' => strip_tags(bbcode($datarray['body'])) '$body' => strip_tags(bbcode($datarray['body']))
)); ));
$res = mail($user['email'], $from . t(" posted on your profile wall at ") . $a->config['sitename'], $res = mail($user['email'], sprintf(t("%s posted on your profile wall at %s"),$from, $a->config['sitename']),
$email_tpl,t("From: Administrator@") . $a->get_hostname() ); $email_tpl,"From: " . t("Administrator@") . "@" . $a->get_hostname() );
} }
} }
@ -486,13 +486,13 @@ function item_post(&$a) {
$addr = trim($recip); $addr = trim($recip);
if(! strlen($addr)) if(! strlen($addr))
continue; continue;
$disclaimer = '<hr />' . t('This message was sent to you by ') . $a->user['username'] $disclaimer = '<hr />' . sprintf(t('This message was sent to you by %s, a member of the Friendika social network.'),$a->user['username'])
. t(', a member of the Friendika social network.') . '<br />'; . '<br />';
$disclaimer .= t('You may visit them online at') . ' ' $disclaimer .= t('You may visit them online at') . ' '
. $a->get_baseurl() . '/profile/' . $a->user['nickname'] . '<br />'; . $a->get_baseurl() . '/profile/' . $a->user['nickname'] . '<br />';
$disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . '<br />'; $disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . '<br />';
$subject = '[Friendika]' . ' ' . $a->user['username'] . ' ' . t('posted an update.'); $subject = '[Friendika]' . ' ' . sprintf( t('%s posted an update.'),$a->user['username']);
$headers = 'From: ' . $a->user['username'] . ' <' . $a->user['email'] . '>' . "\n"; $headers = 'From: ' . $a->user['username'] . ' <' . $a->user['email'] . '>' . "\n";
$headers .= 'MIME-Version: 1.0' . "\n"; $headers .= 'MIME-Version: 1.0' . "\n";
$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n"; $headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";

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'] . ']' . $item['author-name'] . t('\'s') . '[/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/lostpass.php
View file

@ -35,7 +35,7 @@ function lostpass_post(&$a) {
'$reset_link' => $a->get_baseurl() . '/lostpass?verify=' . $new_password '$reset_link' => $a->get_baseurl() . '/lostpass?verify=' . $new_password
)); ));
$res = mail($email, t('Password reset requested at ') . $a->config['sitename'], $res = mail($email, sprintf(t('Password reset requested at %s'),$a->config['sitename']),
$email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER[SERVER_NAME]); $email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER[SERVER_NAME]);
goaway($a->get_baseurl()); goaway($a->get_baseurl());

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( t("Welcome back ") . $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'])) {

2
mod/openid.php
View file

@ -70,7 +70,7 @@ function openid_content(&$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( t("Welcome back ") . $r[0]['username'] . EOL); notice( sprintf( t("Welcome back "), $r[0]['username']) . EOL);
$a->user = $r[0]; $a->user = $r[0];
if(strlen($a->user['timezone'])) { if(strlen($a->user['timezone'])) {

10
mod/profile_photo.php
View file

@ -58,21 +58,21 @@ function profile_photo_post(&$a) {
$r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 4, 1); $r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 4, 1);
if($r === false) if($r === false)
notice ( t('Image size reduction [175] failed.') . EOL ); notice ( sprintf(t('Image size reduction [%s] failed.'),"175") . EOL );
$im->scaleImage(80); $im->scaleImage(80);
$r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 5, 1); $r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 5, 1);
if($r === false) if($r === false)
notice( t('Image size reduction [80] failed.') . EOL ); notice( sprintf(t('Image size reduction [%s] failed.'),"80") . EOL );
$im->scaleImage(48); $im->scaleImage(48);
$r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 6, 1); $r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 6, 1);
if($r === false) if($r === false)
notice( t('Image size reduction [48] failed.') . EOL ); notice( sprintf(t('Image size reduction [%s] failed.'),"48") . EOL );
// Unset the profile photo flag from any other photos I own // Unset the profile photo flag from any other photos I own
@ -106,7 +106,7 @@ function profile_photo_post(&$a) {
$maximagesize = get_config('system','maximagesize'); $maximagesize = get_config('system','maximagesize');
if(($maximagesize) && ($filesize > $maximagesize)) { if(($maximagesize) && ($filesize > $maximagesize)) {
notice( t('Image exceeds size limit of ') . $maximagesize . EOL); notice( sprintf(t('Image exceeds size limit of %d'), $maximagesize) . EOL);
@unlink($src); @unlink($src);
return; return;
} }
@ -234,7 +234,7 @@ function profile_photo_crop_ui_head(&$a, $ph){
$r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 1 ); $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 1 );
if($r === false) if($r === false)
notice( t('Image size reduction [640] failed.') . EOL ); notice( sprintf(t('Image size reduction [%s] failed.'),"640") . EOL );
else else
$smallest = 1; $smallest = 1;
} }

4
mod/register.php
View file

@ -307,7 +307,7 @@ function register_post(&$a) {
'$password' => $new_password, '$password' => $new_password,
'$uid' => $newuid )); '$uid' => $newuid ));
$res = mail($email, t('Registration details for ') . $a->config['sitename'], $res = mail($email, sprintf(t('Registration details for %s'), $a->config['sitename']),
$email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME']); $email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME']);
@ -344,7 +344,7 @@ function register_post(&$a) {
'$hash' => $hash '$hash' => $hash
)); ));
$res = mail($a->config['admin_email'], t('Registration request at ') . $a->config['sitename'], $res = mail($a->config['admin_email'], sprintf(t('Registration request 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) {

4
mod/regmod.php
View file

@ -51,7 +51,7 @@ function regmod_content(&$a) {
$r = q("DELETE FROM `register` WHERE `hash` = '%s' LIMIT 1", $r = q("DELETE FROM `register` WHERE `hash` = '%s' LIMIT 1",
dbesc($register[0]['hash']) dbesc($register[0]['hash'])
); );
notice( t('Registration revoked for ') . $user[0]['username'] . EOL); notice( sprintf(t('Registration revoked for %s'), $user[0]['username']) . EOL);
return; return;
} }
@ -89,7 +89,7 @@ function regmod_content(&$a) {
'$uid' => $user[0]['uid'] '$uid' => $user[0]['uid']
)); ));
$res = mail($user[0]['email'], t('Registration details for '). $a->config['sitename'], $res = mail($user[0]['email'], sprintf(t('Registration details for %s'), $a->config['sitename']),
$email_tpl,'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] ); $email_tpl,'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] );
if($res) { if($res) {

3
mod/viewcontacts.php
View file

@ -41,9 +41,10 @@ function viewcontacts_content(&$a) {
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(
'$id' => $rr['id'], '$id' => $rr['id'],
'$alt_text' => t('Visit ') . $rr['name'] . t('\'s profile'), '$alt_text' => t('Visit $username\'s profile'),
'$thumb' => $rr['thumb'], '$thumb' => $rr['thumb'],
'$name' => substr($rr['name'],0,20), '$name' => substr($rr['name'],0,20),
'$username' => $rr['name'],
'$url' => $rr['url'] '$url' => $rr['url']
)); ));
} }

2
mod/wall_upload.php
View file

@ -53,7 +53,7 @@ function wall_upload_post(&$a) {
$maximagesize = get_config('system','maximagesize'); $maximagesize = get_config('system','maximagesize');
if(($maximagesize) && ($filesize > $maximagesize)) { if(($maximagesize) && ($filesize > $maximagesize)) {
notice( t('Image exceeds size limit of ') . $maximagesize . EOL); notice( sprintf(t('Image exceeds size limit of %d'), $maximagesize) . EOL);
@unlink($src); @unlink($src);
return; return;
} }

2410
util/messages.po Normal file
View file

File diff suppressed because it is too large Load diff