Merge branch 'gettext' of https://github.com/fabrixxm/friendika into fabrixxm-gettext

17 files changed, 56 insertions, 52 deletions

diff --git a/mod/contacts.php b/mod/contacts.php
index c2d28dc1f..029330b7a 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -137,7 +137,8 @@ function contacts_content(&$a) {
 					intval(local_user())
 			);
 			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);
 			return; // NOTREACHED
@@ -151,7 +152,7 @@ function contacts_content(&$a) {
 					intval(local_user())
 			);
 			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);
 			return; // NOTREACHED
@@ -364,13 +365,14 @@ function contacts_content(&$a) {
 
 
 			$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'),
 				'$id' => $rr['id'],
 				'$alt_text' => $alt_text,
 				'$dir_icon' => $dir_icon,
 				'$thumb' => $rr['thumb'], 
 				'$name' => substr($rr['name'],0,20),
+				'$username' => $rr['name'],
 				'$sparkle' => $sparkle,
 				'$url' => $url
 			));
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 1b42c13b8..1bf1ba954 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -491,7 +491,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			dbesc($node));
 
 		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
 			// NOTREACHED
 		}
@@ -645,7 +645,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 				'$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'] );
 			if(!$res) {
 				// pointless throwing an error here and confusing the person at the other end of the wire.
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index f447b5453..2cc5a62f3 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -385,7 +385,7 @@ function dfrn_notify_post(&$a) {
 								'$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() );
 						}
 					}
@@ -471,9 +471,8 @@ function dfrn_notify_post(&$a) {
 								'$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'],
-								$email_tpl,t("From: Administrator@") . $a->get_hostname() );
+							$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() );
 							break;
 						}
 					}
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 334e10307..bacfe9b94 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -75,7 +75,7 @@ function dfrn_poll_init(&$a) {
 					$_SESSION['authenticated'] = 1;
 					$_SESSION['visitor_id'] = $r[0]['id'];
 					$_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.
 					$session_id = session_id();
 					$expire = time() + 86400;
@@ -389,7 +389,7 @@ function dfrn_poll_content(&$a) {
 					$_SESSION['authenticated'] = 1;
 					$_SESSION['visitor_id'] = $r[0]['id'];
 					$_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.
 					$session_id = session_id();
 					$expire = time() + 86400;
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 24c466bba..3cd8473cf 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -123,9 +123,9 @@ function dfrn_request_post(&$a) {
 							notice( t('Warning: profile location has no profile photo.') . EOL );
 						$invalid = validate_dfrn($parms);		
 						if($invalid) {
-							notice( $invalid . t(' required parameter') 
-								. (($invalid == 1) ? t(" was ") : t("s were ") )
-								. t("not found at the given location.") . EOL ) ;
+							notice( sprintf( tt("%d required parameter was not found at the given location",
+												"%d required parameters were not found at the given location",
+												$invalid), $invalid) . EOL );
 							return;
 						}
 					}
@@ -238,7 +238,7 @@ function dfrn_request_post(&$a) {
 				intval($uid)
 			);
 			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('Friends are advised to please try again in 24 hours.') . EOL);
 				return;
@@ -306,7 +306,7 @@ function dfrn_request_post(&$a) {
 					return;
 				}
 				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;
 				}
 				else {
@@ -354,9 +354,9 @@ function dfrn_request_post(&$a) {
 						notice( t('Warning: profile location has no profile photo.') . EOL );
 					$invalid = validate_dfrn($parms);		
 					if($invalid) {
-						notice( $invalid . t(' required parameter') 
-							. (($invalid == 1) ? t(" was ") : t("s were ") )
-							. t("not found at the given location.") . EOL ) ;
+						notice( sprintf( tt("%d required parameter was not found at the given location",
+											"%d required parameters were not found at the given location",
+											$invalid), $invalid) . EOL );
 	
 						return;
 					}
@@ -540,7 +540,7 @@ function dfrn_request_content(&$a) {
 						'$sitename' => $a->config['sitename']
 					));
 					$res = mail($r[0]['email'], 
-						t("Introduction received at ") . $a->config['sitename'],
+					    t("Introduction received at ") . $a->config['sitename'],
 						$email,
 						'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] );
 					// This is a redundant notification - no point throwing errors if it fails.
diff --git a/mod/home.php b/mod/home.php
index 20d38cfca..225bd294d 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -20,7 +20,7 @@ function home_content(&$a) {
 	if(x($_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'))
  		$o .= file_get_contents('home.html');
 
diff --git a/mod/invite.php b/mod/invite.php
index f67432746..84fa978ad 100644
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -25,21 +25,21 @@ function invite_post(&$a) {
 		$recip = trim($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;
 		}
 
-		$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']);
 		if($res) {
 			$total ++;
 		}
 		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;
 }
 
@@ -57,7 +57,7 @@ function invite_content(&$a) {
 		'$invite' => t('Send invitations'),
 		'$addr_text' => t('Enter email addresses, one per line:'),
 		'$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()
 			. "\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'] ,
diff --git a/mod/item.php b/mod/item.php
index 6a6116336..5cefb3be3 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -471,8 +471,8 @@ function item_post(&$a) {
 					'$body' => strip_tags(bbcode($datarray['body']))
 				));
 
-				$res = mail($user['email'], $from . t(" commented on your item at ") . $a->config['sitename'],
-					$email_tpl,t("From: Administrator@") . $a->get_hostname() );
+				$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() );
 			}
 		}
 		else {
@@ -494,8 +494,8 @@ function item_post(&$a) {
 					'$body' => strip_tags(bbcode($datarray['body']))
 				));
 
-				$res = mail($user['email'], $from . t(" posted on your profile wall at ") . $a->config['sitename'],
-					$email_tpl,t("From: Administrator@") . $a->get_hostname() );
+				$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() );
 			}
 		}
 
@@ -538,13 +538,13 @@ function item_post(&$a) {
 				$addr = trim($recip);
 				if(! strlen($addr))
 					continue;
-				$disclaimer = '<hr />' . t('This message was sent to you by ') . $a->user['username'] 
-					. t(', a member of the Friendika social network.') . '<br />';
+				$disclaimer = '<hr />' . sprintf(t('This message was sent to you by %s, a member of the Friendika social network.'),$a->user['username']) 
+					. '<br />';
 				$disclaimer .= t('You may visit them online at') . ' ' 
 					. $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 />'; 
 
-				$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 .= 'MIME-Version: 1.0' . "\n";
 				$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
diff --git a/mod/like.php b/mod/like.php
index 3a8ca4b7d..3e3d69529 100644
--- a/mod/like.php
+++ b/mod/like.php
@@ -124,9 +124,9 @@ function like_content(&$a) {
 	</object>
 EOT;
 	if($verb === 'like')
-		$bodyverb = t('likes');
+		$bodyverb = t('%1$s likes %2$s\'s %3$s');
 	if($verb === 'dislike')
-		$bodyverb = t('doesn\'t like');
+		$bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
 
 	if(! isset($bodyverb))
 			return; 
@@ -147,9 +147,11 @@ EOT;
 	$arr['author-name'] = $contact['name'];
 	$arr['author-link'] = $contact['url'];
 	$arr['author-avatar'] = $contact['thumb'];
-	$arr['body'] = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' . ' ' . $bodyverb . ' ' 
-		. '[url=' . $item['author-link'] . ']' . $item['author-name'] . t('\'s') . '[/url]' . ' '
-		. '[url=' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]' ;
+	
+	$ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
+	$alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
+	$plink = '[url=' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
+	$arr['body'] =  sprintf( $bodyverb, $ulink, $alink, $plink );
 
 	$arr['verb'] = $activity;
 	$arr['object-type'] = $objtype;
diff --git a/mod/lostpass.php b/mod/lostpass.php
index 30bdc059c..3dcf41be7 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -35,7 +35,7 @@ function lostpass_post(&$a) {
 			'$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]);
 
 	goaway($a->get_baseurl());
diff --git a/mod/manage.php b/mod/manage.php
index 9981a0446..26f7315c3 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -34,7 +34,7 @@ function manage_post(&$a) {
 	$_SESSION['page_flags'] = $r[0]['page-flags'];
 	$_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];
 
 	if(strlen($a->user['timezone'])) {
diff --git a/mod/openid.php b/mod/openid.php
index 6ccd28e5b..68d7c3fd2 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -70,7 +70,7 @@ function openid_content(&$a) {
 			$_SESSION['page_flags'] = $r[0]['page-flags'];
 			$_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];
 
 			if(strlen($a->user['timezone'])) {
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 5365aa3b8..68c05625b 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -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);
 
 				if($r === false)
-					notice ( t('Image size reduction [175] failed.') . EOL );
+					notice ( sprintf(t('Image size reduction [%s] failed.'),"175") . EOL );
 
 				$im->scaleImage(80);
 
 				$r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 5, 1);
 			
 				if($r === false)
-					notice( t('Image size reduction [80] failed.') . EOL );
+					notice( sprintf(t('Image size reduction [%s] failed.'),"80") . EOL );
 
 				$im->scaleImage(48);
 
 				$r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 6, 1);
 			
 				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
 
@@ -106,7 +106,7 @@ function profile_photo_post(&$a) {
 	$maximagesize = get_config('system','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);
 		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 );	
 		
 		if($r === false)
-			notice( t('Image size reduction [640] failed.') . EOL );
+			notice( sprintf(t('Image size reduction [%s] failed.'),"640") . EOL );
 		else
 			$smallest = 1;
 	}
diff --git a/mod/register.php b/mod/register.php
index fdf488b1a..95e9d581f 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -307,7 +307,7 @@ function register_post(&$a) {
 				'$password' => $new_password,
 				'$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']);
 
 
@@ -344,7 +344,7 @@ function register_post(&$a) {
 				'$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']);
 
 		if($res) {
diff --git a/mod/regmod.php b/mod/regmod.php
index 00cfa06e2..2cbe810bc 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -51,7 +51,7 @@ function regmod_content(&$a) {
 		$r = q("DELETE FROM `register` WHERE `hash` = '%s' LIMIT 1",
 			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;
 
 	}
@@ -89,7 +89,7 @@ function regmod_content(&$a) {
 				'$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'] );
 
 		if($res) {
diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index 90ff85b9d..063637bf9 100644
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -41,9 +41,10 @@ function viewcontacts_content(&$a) {
 
 		$o .= replace_macros($tpl, array(
 			'$id' => $rr['id'],
-			'$alt_text' => t('Visit ') . $rr['name'] . t('\'s profile'),
+			'$alt_text' => t('Visit $username\'s profile'),
 			'$thumb' => $rr['thumb'], 
 			'$name' => substr($rr['name'],0,20),
+			'$username' => $rr['name'],
 			'$url' => $rr['url'] 
 		));
 	}
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index b5725311d..f7638b730 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -53,7 +53,7 @@ function wall_upload_post(&$a) {
 	$maximagesize = get_config('system','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);
 		return;
 	}