diff options
| author | Friendika <info@friendika.com> | 2011-03-18 05:07:42 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-03-18 05:07:42 -0700 |
| commit | 9838245c6c9b2e311650b53a1c3aa1ef778ef935 (patch) | |
| tree | ceb9f5edd50cd039e28362a59c4c2d354bb88e67 /mod/dfrn_request.php | |
| parent | 43234a667878327a825914070884161c6d57271e (diff) | |
| parent | e307846c2d89cf450ed2e7ddf8f325f5f4581f8f (diff) | |
| download | volse-hubzilla-9838245c6c9b2e311650b53a1c3aa1ef778ef935.tar.gz volse-hubzilla-9838245c6c9b2e311650b53a1c3aa1ef778ef935.tar.bz2 volse-hubzilla-9838245c6c9b2e311650b53a1c3aa1ef778ef935.zip | |
Merge branch 'gettext' of https://github.com/fabrixxm/friendika into fabrixxm-gettext
Diffstat (limited to 'mod/dfrn_request.php')
| -rw-r--r-- | mod/dfrn_request.php | 18 |
1 files changed, 9 insertions, 9 deletions
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. |