Commit d6b3d7fb authored by Brion Vibber's avatar Brion Vibber

Fix unescaped dollar signs in double-quoted strings due to localization updates (%1$s etc)

parent 2295bbec
......@@ -148,7 +148,7 @@ class Fave extends Memcached_DataObject
$act->title = _("Favor");
// TRANS: Ntofication given when a user marks a notice as favorite.
// TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
$act->content = sprintf(_("%1$s marked notice %2$s as a favorite."),
$act->content = sprintf(_('%1$s marked notice %2$s as a favorite.'),
$profile->getBestName(),
$notice->uri);
......
......@@ -1117,7 +1117,7 @@ class Notice extends Memcached_DataObject
common_log_db_error($reply, 'INSERT', __FILE__);
// TRANS: Server exception thrown when a reply cannot be saved.
// TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
throw new ServerException(sprintf(_("Could not save reply for %1$d, %2$d."), $this->id, $mentioned->id));
throw new ServerException(sprintf(_('Could not save reply for %1$d, %2$d.'), $this->id, $mentioned->id));
} else {
$replied[$mentioned->id] = 1;
self::blow('reply:stream:%d', $mentioned->id);
......
......@@ -255,7 +255,7 @@ class Subscription extends Memcached_DataObject
$act->title = _("Follow");
// TRANS: Notification given when one person starts following another.
// TRANS: %1$s is the subscriber, %2$s is the subscribed.
$act->content = sprintf(_("%1$s is now following %2$s."),
$act->content = sprintf(_('%1$s is now following %2$s.'),
$subscriber->getBestName(),
$subscribed->getBestName());
......
......@@ -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,
......
......@@ -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);
......
......@@ -150,7 +150,7 @@ class FacebookhomeAction extends FacebookAction
// over and over..
// TRANS: Page title.
// TRANS: %1$s is a user nickname, %2$s is a page number.
return sprintf(_m("%1$s and friends, page %2$d"), $this->user->nickname, $this->page);
return sprintf(_m('%1$s and friends, page %2$d'), $this->user->nickname, $this->page);
} else {
// TRANS: Page title.
// TRANS: %s is a user nickname
......
......@@ -77,7 +77,7 @@ class AllmapAction extends MapAction
// @todo CHECKME: does this even happen? May not be needed.
// TRANS: Page title.
// TRANS: %1$s is a user nickname, %2$d is a page number.
return sprintf(_m("%1$s friends map, page %2$d"),
return sprintf(_m('%1$s friends map, page %2$d'),
$base,
$this->page);
}
......
......@@ -655,7 +655,7 @@ class OStatusPlugin extends Plugin
$act->title = _m("Join");
// TRANS: Success message for subscribe to group attempt through OStatus.
// TRANS: %1$s is the member name, %2$s is the subscribed group's name.
$act->content = sprintf(_m("%1$s has joined group %2$s."),
$act->content = sprintf(_m('%1$s has joined group %2$s.'),
$member->getBestName(),
$oprofile->getBestName());
......@@ -707,7 +707,7 @@ class OStatusPlugin extends Plugin
$act->title = _m("Leave");
// TRANS: Success message for unsubscribe from group attempt through OStatus.
// TRANS: %1$s is the member name, %2$s is the unsubscribed group's name.
$act->content = sprintf(_m("%1$s has left group %2$s."),
$act->content = sprintf(_m('%1$s has left group %2$s.'),
$member->getBestName(),
$oprofile->getBestName());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment