summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-10-04 15:22:02 -0700
committerBrion Vibber <brion@pobox.com>2010-10-04 15:22:02 -0700
commitf58008ebaff81cd8066c21b4a389de2fc9383259 (patch)
treeb9b16004f403e9b2f8a4d8b856449d71ad003173 /lib
parentde185a14057e52d6acd306a643eb8f38cd83973e (diff)
parentc6e8fbebefe7182b9584501d55bc0b32ce7b53a1 (diff)
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib')
-rw-r--r--lib/mail.php6
-rw-r--r--lib/usernoprofileexception.php2
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/mail.php b/lib/mail.php
index ab5742e33..a3b3e05b8 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -252,14 +252,14 @@ function mail_subscribe_notify_profile($listenee, $other)
// TRANS: Main body of new-subscriber notification e-mail
$body = sprintf(_('%1$s is now listening to your notices on %2$s.'."\n\n".
- "\t".'%3$s'."\n\n".
+ "\t".'%3\$s'."\n\n".
'%4$s'.
'%5$s'.
'%6$s'.
- "\n".'Faithfully yours,'."\n".'%7$s.'."\n\n".
+ "\n".'Faithfully yours,'."\n".'%7\$s.'."\n\n".
"----\n".
"Change your email address or ".
- "notification options at ".'%8$s' ."\n"),
+ "notification options at ".'%8\$s' ."\n"),
$long_name,
common_config('site', 'name'),
$other->profileurl,
diff --git a/lib/usernoprofileexception.php b/lib/usernoprofileexception.php
index e0186fef9..954d31b0d 100644
--- a/lib/usernoprofileexception.php
+++ b/lib/usernoprofileexception.php
@@ -57,7 +57,7 @@ class UserNoProfileException extends ServerException
// TRANS: Exception text shown when no profile can be found for a user.
// TRANS: %1$s is a user nickname, $2$d is a user ID (number).
- $message = sprintf(_("User %1$s (%2$d) has no profile record."),
+ $message = sprintf(_('User %1$s (%2$d) has no profile record.'),
$user->nickname, $user->id);
parent::__construct($message);