profile match

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 24c466bba5655e9533073ffe5d89d383e7ffb9cb..3cd8473cf314120f12f421dc2d874d0983fc2cd1 100644 (file)
--- 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.