diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-05 11:40:49 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-05 11:40:49 -0700 |
| commit | 8ff45823bad2d2464be69c0f25162c3238f8f518 (patch) | |
| tree | c6267a63793e11219740ea4654e5b6c7f7a54622 /classes | |
| parent | 5c4723919fa757b3e14a59350415cfe53e0900d1 (diff) | |
| parent | c62d212bd0497bdfb5736673d54c296d4628f40a (diff) | |
Merge branch '0.9.x' into 1.0.x
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/Fave.php | 2 | ||||
| -rw-r--r-- | classes/Notice.php | 2 | ||||
| -rw-r--r-- | classes/Subscription.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/classes/Fave.php b/classes/Fave.php index 059b339cd..9922ae45c 100644 --- a/classes/Fave.php +++ b/classes/Fave.php @@ -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); diff --git a/classes/Notice.php b/classes/Notice.php index a8ec0529f..2f8c7d5d5 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -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); diff --git a/classes/Subscription.php b/classes/Subscription.php index b4dbd84c9..e9ad2a5a2 100644 --- a/classes/Subscription.php +++ b/classes/Subscription.php @@ -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()); |