* L10n updates: consistent puctuation

* i18n updates: number parameters if more than one are being used

diff --git a/actions/all.php b/actions/all.php
index 452803d8aee1516ad9eae009482c6834a4989032..efa4521e21a9170bf53c41522270caffa68ff72e 100644 (file)
--- a/actions/all.php
+++ b/actions/all.php
@@ -81,7 +81,7 @@ class AllAction extends ProfileAction
     function title()
     {
         if ($this->page > 1) {
-            return sprintf(_("%s and friends, page %d"), $this->user->nickname, $this->page);
+            return sprintf(_("%1$s and friends, page %2$d"), $this->user->nickname, $this->page);
         } else {
             return sprintf(_("%s and friends"), $this->user->nickname);
         }
@@ -131,7 +131,7 @@ class AllAction extends ProfileAction
             if ($this->user->id === $current_user->id) {
                 $message .= _('Try subscribing to more people, [join a group](%%action.groups%%) or post something yourself.');
             } else {
-                $message .= sprintf(_('You can try to [nudge %s](../%s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
+                $message .= sprintf(_('You can try to [nudge %1$s](../%2$s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
             }
         } else {
             $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to his or her attention.'), $this->user->nickname);

diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php
index b531d95015a8fd19af7cdb02303da407f75c1e23..4b718bce67b5f0b2e68937f558ed3836ef42bda0 100644 (file)
--- a/actions/apigroupjoin.php
+++ b/actions/apigroupjoin.php
@@ -135,7 +135,7 @@ class ApiGroupJoinAction extends ApiAuthAction
             common_log_db_error($member, 'INSERT', __FILE__);
             $this->serverError(
                 sprintf(
-                    _('Could not join user %s to group %s.'),
+                    _('Could not join user %1$s to group %2$s.'),
                     $this->user->nickname,
                     $this->group->nickname
                 )

diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php
index 5627bfc14643a5bb2ae6f78a5d9528c6d9008fac..7321ff5d26b8ab95ff112eca87053b99492f090d 100644 (file)
--- a/actions/apigroupleave.php
+++ b/actions/apigroupleave.php
@@ -121,7 +121,7 @@ class ApiGroupLeaveAction extends ApiAuthAction
             common_log_db_error($member, 'DELETE', __FILE__);
             $this->serverError(
                 sprintf(
-                    _('Could not remove user %s from group %s.'),
+                    _('Could not remove user %1$s from group %2$s.'),
                     $this->user->nickname,
                     $this->group->nickname
                 )

diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php
index 7b05f8a96cbdd70ee10272f0e987ff40f7336648..4cf657579d6e7dcbff85d99c8ec71ecd7dbd391a 100644 (file)
--- a/actions/apigrouplist.php
+++ b/actions/apigrouplist.php
@@ -100,7 +100,7 @@ class ApiGroupListAction extends ApiBareAuthAction
             array('nickname' => $this->user->nickname)
         );
         $subtitle   = sprintf(
-            _("Groups %s is a member of on %s."),
+            _("Groups %1$s is a member of on %2$s."),
             $this->user->nickname,
             $sitename
         );

diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php
index 008e042126472e89fbdfa6725b679dea91dca882..700f6e0fdcd3051e7cda4b520f0eaa6952d9bac1 100644 (file)
--- a/actions/apitimelinefavorites.php
+++ b/actions/apitimelinefavorites.php
@@ -105,7 +105,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
 
         $sitename   = common_config('site', 'name');
         $title      = sprintf(
-            _('%s / Favorites from %s'),
+            _('%1$s / Favorites from %2$s'),
             $sitename,
             $this->user->nickname
         );
@@ -117,7 +117,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
             array('nickname' => $this->user->nickname)
         );
         $subtitle   = sprintf(
-            _('%s updates favorited by %s / %s.'),
+            _('%1$s updates favorited by %2$s / %2$s.'),
             $sitename,
             $profile->getBestName(),
             $this->user->nickname

diff --git a/actions/blockedfromgroup.php b/actions/blockedfromgroup.php
index ca4a711cb7dcc0b845e7a54fffe3a705589a2023..934f14ec45250aedeb2787fc3e2e0387049a41a8 100644 (file)
--- a/actions/blockedfromgroup.php
+++ b/actions/blockedfromgroup.php
@@ -90,7 +90,7 @@ class BlockedfromgroupAction extends GroupDesignAction
             return sprintf(_('%s blocked profiles'),
                            $this->group->nickname);
         } else {
-            return sprintf(_('%s blocked profiles, page %d'),
+            return sprintf(_('%1$s blocked profiles, page %2$d'),
                            $this->group->nickname,
                            $this->page);
         }

diff --git a/actions/groupblock.php b/actions/groupblock.php
index faf18c6adb71a94fbdddaf263292bd9751062fee..ec673358e66cea107c30fbb5f8fae1b4ea4e7c63 100644 (file)
--- a/actions/groupblock.php
+++ b/actions/groupblock.php
@@ -159,7 +159,7 @@ class GroupblockAction extends Action
         $this->hidden('token', common_session_token());
         $this->element('legend', _('Block user'));
         $this->element('p', null,
-                       sprintf(_('Are you sure you want to block user "%s" from the group "%s"? '.
+                       sprintf(_('Are you sure you want to block user "%1$s" from the group "%2$s"? '.
                                  'They will be removed from the group, unable to post, and '.
                                  'unable to subscribe to the group in the future.'),
                                $this->profile->getBestName(),

diff --git a/actions/groupmembers.php b/actions/groupmembers.php
index b326a0df75f2b8f80b05f24c039789be96791bbd..5c59594c56b20bdad0f243cb5a816fb6b6e2a2c4 100644 (file)
--- a/actions/groupmembers.php
+++ b/actions/groupmembers.php
@@ -93,7 +93,7 @@ class GroupmembersAction extends GroupDesignAction
             return sprintf(_('%s group members'),
                            $this->group->nickname);
         } else {
-            return sprintf(_('%s group members, page %d'),
+            return sprintf(_('%1$s group members, page %2$d'),
                            $this->group->nickname,
                            $this->page);
         }

diff --git a/actions/inbox.php b/actions/inbox.php
index 6cb7f9e157df07a5d5862546dc3a1924051dd208..f605cc9e8b3edf6d246c0febc68f716bf3e49384 100644 (file)
--- a/actions/inbox.php
+++ b/actions/inbox.php
@@ -56,7 +56,7 @@ class InboxAction extends MailboxAction
     function title()
     {
         if ($this->page > 1) {
-            return sprintf(_("Inbox for %s - page %d"), $this->user->nickname,
+            return sprintf(_("Inbox for %1$s - page %2$d"), $this->user->nickname,
                 $this->page);
         } else {
             return sprintf(_("Inbox for %s"), $this->user->nickname);

diff --git a/actions/invite.php b/actions/invite.php
index 3015202e9e69b39fcc59563bd16f42c34d0a727f..d0ed64ec9079449ec3d9013973aab5e912257a6b 100644 (file)
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -128,7 +128,7 @@ class InviteAction extends CurrentUserDesignAction
             $this->element('p', null, _('You are already subscribed to these users:'));
             $this->elementStart('ul');
             foreach ($this->already as $other) {
-                $this->element('li', null, sprintf(_('%s (%s)'), $other->nickname, $other->email));
+                $this->element('li', null, sprintf(_('%1$s (%2$s)'), $other->nickname, $other->email));
             }
             $this->elementEnd('ul');
         }
@@ -136,7 +136,7 @@ class InviteAction extends CurrentUserDesignAction
             $this->element('p', null, _('These people are already users and you were automatically subscribed to them:'));
             $this->elementStart('ul');
             foreach ($this->subbed as $other) {
-                $this->element('li', null, sprintf(_('%s (%s)'), $other->nickname, $other->email));
+                $this->element('li', null, sprintf(_('%1$s (%2$s)'), $other->nickname, $other->email));
             }
             $this->elementEnd('ul');
         }

diff --git a/actions/joingroup.php b/actions/joingroup.php
index bf69b2ad1e40769df3b7c5c5278b3cd77303528b..5ca34bd9ccb99dfc0b68c7521358863969d64c01 100644 (file)
--- a/actions/joingroup.php
+++ b/actions/joingroup.php
@@ -125,14 +125,14 @@ class JoingroupAction extends Action
 
         if (!$result) {
             common_log_db_error($member, 'INSERT', __FILE__);
-            $this->serverError(sprintf(_('Could not join user %s to group %s'),
+            $this->serverError(sprintf(_('Could not join user %1$s to group %2$s'),
                                        $cur->nickname, $this->group->nickname));
         }
 
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
-            $this->element('title', null, sprintf(_('%s joined group %s'),
+            $this->element('title', null, sprintf(_('%1$s joined group %2$s'),
                                                   $cur->nickname,
                                                   $this->group->nickname));
             $this->elementEnd('head');

diff --git a/actions/leavegroup.php b/actions/leavegroup.php
index 90c85e1a4e6e602eed57d7b552745564f8c41ae2..b0f973e1acf5867b8aa246858943f0d12a49b4e3 100644 (file)
--- a/actions/leavegroup.php
+++ b/actions/leavegroup.php
@@ -124,14 +124,14 @@ class LeavegroupAction extends Action
 
         if (!$result) {
             common_log_db_error($member, 'DELETE', __FILE__);
-            $this->serverError(sprintf(_('Could not remove user %s from group %s'),
+            $this->serverError(sprintf(_('Could not remove user %1$s from group %2$s.'),
                                        $cur->nickname, $this->group->nickname));
         }
 
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
-            $this->element('title', null, sprintf(_('%s left group %s'),
+            $this->element('title', null, sprintf(_('%1$s left group %2$s'),
                                                   $cur->nickname,
                                                   $this->group->nickname));
             $this->elementEnd('head');

diff --git a/actions/makeadmin.php b/actions/makeadmin.php
index 2dfddebc27dd21cc3eba8110cb5926e8535aceec..250ade221eff031920a6b8a739de20552e4f2cf4 100644 (file)
--- a/actions/makeadmin.php
+++ b/actions/makeadmin.php
@@ -92,7 +92,7 @@ class MakeadminAction extends Action
             return false;
         }
         if ($this->profile->isAdmin($this->group)) {
-            $this->clientError(sprintf(_('%s is already an admin for group "%s".'),
+            $this->clientError(sprintf(_('%1$s is already an admin for group "%2$s".'),
                                        $this->profile->getBestName(),
                                        $this->group->getBestName()),
                                401);
@@ -129,7 +129,7 @@ class MakeadminAction extends Action
                                               'profile_id' => $this->profile->id));
 
         if (empty($member)) {
-            $this->serverError(_('Can\'t get membership record for %s in group %s'),
+            $this->serverError(_('Can\'t get membership record for %1$s in group %2$s'),
                                $this->profile->getBestName(),
                                $this->group->getBestName());
         }
@@ -142,7 +142,7 @@ class MakeadminAction extends Action
 
         if (!$result) {
             common_log_db_error($member, 'UPDATE', __FILE__);
-            $this->serverError(_('Can\'t make %s an admin for group %s'),
+            $this->serverError(_('Can\'t make %1$s an admin for group %2$s'),
                                $this->profile->getBestName(),
                                $this->group->getBestName());
         }

diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index 76c877ff2f656283bbd7c9c211544847bc181f26..d0673420d61c2dfc715b429828914cd30ffa20cf 100644 (file)
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -88,7 +88,7 @@ class NoticesearchAction extends SearchAction
 
         return array(new Feed(Feed::RSS1, common_local_url('noticesearchrss',
                                                            array('q' => $q)),
-                              sprintf(_('Search results for "%s" on %s'),
+                              sprintf(_('Search results for "%1$s" on %2$s'),
                                       $q, common_config('site', 'name'))));
     }
 

diff --git a/actions/outbox.php b/actions/outbox.php
index 537fad3ef4560bdcada86358536d89fb16443695..de30de018354ff5e599cb1a20f5d5126120c9872 100644 (file)
--- a/actions/outbox.php
+++ b/actions/outbox.php
@@ -55,7 +55,7 @@ class OutboxAction extends MailboxAction
     function title()
     {
         if ($this->page > 1) {
-            return sprintf(_("Outbox for %s - page %d"),
+            return sprintf(_("Outbox for %1$s - page %2$d"),
                 $this->user->nickname, $page);
         } else {
             return sprintf(_("Outbox for %s"), $this->user->nickname);

diff --git a/actions/peopletag.php b/actions/peopletag.php
index 6dbbc926161c87b9c31b5b9d9d51d2764965fc9f..4ba1dc0f1f71327aba61394b74f4192a3f8171be 100644 (file)
--- a/actions/peopletag.php
+++ b/actions/peopletag.php
@@ -141,7 +141,7 @@ class PeopletagAction extends Action
      */
     function title()
     {
-        return sprintf(_('Users self-tagged with %s - page %d'),
+        return sprintf(_('Users self-tagged with %1$s - page %2$d'),
             $this->tag, $this->page);
     }
 

diff --git a/actions/postnotice.php b/actions/postnotice.php
index c2e1c44cae0b4a84099663aee85d954befa4edaf..fb0670376651ed145b0ea8ea7673eb3f7e07d30a 100644 (file)
--- a/actions/postnotice.php
+++ b/actions/postnotice.php
@@ -87,8 +87,8 @@ class PostnoticeAction extends Action
         $license      = $_POST['omb_notice_license'];
         $site_license = common_config('license', 'url');
         if ($license && !common_compatible_license($license, $site_license)) {
-            throw new Exception(sprintf(_('Notice license ‘%s’ is not ' .
-                                          'compatible with site license ‘%s’.'),
+            throw new Exception(sprintf(_('Notice license ‘%1$s’ is not ' .
+                                          'compatible with site license ‘%2$s’.'),
                                         $license, $site_license));
         }
     }

diff --git a/actions/register.php b/actions/register.php
index 57f8e7bdf0394f450ad1cabd79e7fc166cd67429..96015c21901d70287d2e3ac5d4f96c46fb3b774a 100644 (file)
--- a/actions/register.php
+++ b/actions/register.php
@@ -534,9 +534,9 @@ class RegisterAction extends Action
                                        array('nickname' => $nickname));
 
         $this->elementStart('div', 'success');
-        $instr = sprintf(_('Congratulations, %s! And welcome to %%%%site.name%%%%. '.
+        $instr = sprintf(_('Congratulations, %1$s! And welcome to %%%%site.name%%%%. '.
                            'From here, you may want to...'. "\n\n" .
-                           '* Go to [your profile](%s) '.
+                           '* Go to [your profile](%2$s) '.
                            'and post your first message.' .  "\n" .
                            '* Add a [Jabber/GTalk address]'.
                            '(%%%%action.imsettings%%%%) '.

diff --git a/actions/replies.php b/actions/replies.php
index a13b5a22734934408c069ca26a4c8c00b1da5bf6..2e50f1c3c4ce04f7379e8058073e5105c8da835e 100644 (file)
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -124,7 +124,7 @@ class RepliesAction extends OwnerDesignAction
         if ($this->page == 1) {
             return sprintf(_("Replies to %s"), $this->user->nickname);
         } else {
-            return sprintf(_("Replies to %s, page %d"),
+            return sprintf(_("Replies to %1$s, page %2$d"),
                            $this->user->nickname,
                            $this->page);
         }
@@ -195,14 +195,14 @@ class RepliesAction extends OwnerDesignAction
 
     function showEmptyListMessage()
     {
-        $message = sprintf(_('This is the timeline showing replies to %s but %s hasn\'t received a notice to his attention yet.'), $this->user->nickname, $this->user->nickname) . ' ';
+        $message = sprintf(_('This is the timeline showing replies to %1$s but %2$s hasn\'t received a notice to his attention yet.'), $this->user->nickname, $this->user->nickname) . ' ';
 
         if (common_logged_in()) {
             $current_user = common_current_user();
             if ($this->user->id === $current_user->id) {
                 $message .= _('You can engage other users in a conversation, subscribe to more people or [join groups](%%action.groups%%).');
             } else {
-                $message .= sprintf(_('You can try to [nudge %s](../%s) or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
+                $message .= sprintf(_('You can try to [nudge %1$s](../%2$s) or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
             }
         }
         else {

diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index b12fcdd9a0c5e31e29da6db692ae99974d0fdc8a..6023f015678185bfe18c680d5a5b1458840a6912 100644 (file)
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -76,7 +76,7 @@ class ShowfavoritesAction extends OwnerDesignAction
         if ($this->page == 1) {
             return sprintf(_("%s's favorite notices"), $this->user->nickname);
         } else {
-            return sprintf(_("%s's favorite notices, page %d"),
+            return sprintf(_("%1$s's favorite notices, page %2$d"),
                            $this->user->nickname,
                            $this->page);
         }

diff --git a/actions/showgroup.php b/actions/showgroup.php
index a4af29391d0f7a7a7c38f2d673c9b4b6fc1afb0e..c0de4c653bd55d7170057f8269d79b14f30d42eb 100644 (file)
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -81,7 +81,7 @@ class ShowgroupAction extends GroupDesignAction
         if ($this->page == 1) {
             return sprintf(_("%s group"), $base);
         } else {
-            return sprintf(_("%s group, page %d"),
+            return sprintf(_("%1$s group, page %2$d"),
                            $base,
                            $this->page);
         }

diff --git a/actions/showstream.php b/actions/showstream.php
index 74b46cc95b527eafec6108e67e567fa8ba58e2f8..75e10858d08ad2f917074c56a5ed0861bec29346 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -76,7 +76,7 @@ class ShowstreamAction extends ProfileAction
         if ($this->page == 1) {
             return $base;
         } else {
-            return sprintf(_("%s, page %d"),
+            return sprintf(_("%1$s, page %2$d"),
                            $base,
                            $this->page);
         }
@@ -119,7 +119,7 @@ class ShowstreamAction extends ProfileAction
                                   common_local_url('userrss',
                                                    array('nickname' => $this->user->nickname,
                                                          'tag' => $this->tag)),
-                                  sprintf(_('Notice feed for %s tagged %s (RSS 1.0)'),
+                                  sprintf(_('Notice feed for %1$s tagged %2$s (RSS 1.0)'),
                                           $this->user->nickname, $this->tag)));
         }
 
@@ -188,14 +188,14 @@ class ShowstreamAction extends ProfileAction
 
     function showEmptyListMessage()
     {
-        $message = sprintf(_('This is the timeline for %s but %s hasn\'t posted anything yet.'), $this->user->nickname, $this->user->nickname) . ' ';
+        $message = sprintf(_('This is the timeline for %1$s but %2$s hasn\'t posted anything yet.'), $this->user->nickname, $this->user->nickname) . ' ';
 
         if (common_logged_in()) {
             $current_user = common_current_user();
             if ($this->user->id === $current_user->id) {
                 $message .= _('Seen anything interesting recently? You haven\'t posted any notices yet, now would be a good time to start :)');
             } else {
-                $message .= sprintf(_('You can try to nudge %s or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, '@' . $this->user->nickname);
+                $message .= sprintf(_('You can try to nudge %1$s or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%2$s).'), $this->user->nickname, '@' . $this->user->nickname);
             }
         }
         else {

diff --git a/actions/subscribers.php b/actions/subscribers.php
index cc9452820b2a55c491f9ee935f654c451a1aa0d4..cd3e2ee5bedd136190ddea88971c526345c98b73 100644 (file)
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -49,7 +49,7 @@ class SubscribersAction extends GalleryAction
         if ($this->page == 1) {
             return sprintf(_('%s subscribers'), $this->user->nickname);
         } else {
-            return sprintf(_('%s subscribers, page %d'),
+            return sprintf(_('%1$s subscribers, page %2$d'),
                            $this->user->nickname,
                            $this->page);
         }

diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 0dc5ee76249a7904c58a0f468152547117e1af08..0ef31aa9f1d7124b24017f60398ed1e926381db7 100644 (file)
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -51,7 +51,7 @@ class SubscriptionsAction extends GalleryAction
         if ($this->page == 1) {
             return sprintf(_('%s subscriptions'), $this->user->nickname);
         } else {
-            return sprintf(_('%s subscriptions, page %d'),
+            return sprintf(_('%1$s subscriptions, page %2$d'),
                            $this->user->nickname,
                            $this->page);
         }

diff --git a/actions/tag.php b/actions/tag.php
index 3a88c1229dd217857bb386a787f66d89b14d436b..12857236eff733e03c22a4eec98942578492555d 100644 (file)
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -65,7 +65,7 @@ class TagAction extends Action
         if ($this->page == 1) {
             return sprintf(_("Notices tagged with %s"), $this->tag);
         } else {
-            return sprintf(_("Notices tagged with %s, page %d"),
+            return sprintf(_("Notices tagged with %1$s, page %2$d"),
                            $this->tag,
                            $this->page);
         }

diff --git a/actions/updateprofile.php b/actions/updateprofile.php
index 3cec9523cdff1fd3c1376592121e8cf21f52dacb..e416a6fa93dbd881ab152249d1abed50dfd2ff52 100644 (file)
--- a/actions/updateprofile.php
+++ b/actions/updateprofile.php
@@ -59,8 +59,8 @@ class UpdateprofileAction extends Action
         $license      = $_POST['omb_listenee_license'];
         $site_license = common_config('license', 'url');
         if (!common_compatible_license($license, $site_license)) {
-            $this->clientError(sprintf(_('Listenee stream license ‘%s’ is not '.
-                                         'compatible with site license ‘%s’.'),
+            $this->clientError(sprintf(_('Listenee stream license ‘%1$s’ is not '.
+                                         'compatible with site license ‘%2$s’.'),
                                        $license, $site_license));
             return false;
         }

diff --git a/actions/userauthorization.php b/actions/userauthorization.php
index dc59e6c94112ccec04d926c11647ce3c9b7a3e5b..4321f1302e0ca6735c8307128fe083a00e616946 100644 (file)
--- a/actions/userauthorization.php
+++ b/actions/userauthorization.php
@@ -293,7 +293,7 @@ class UserauthorizationAction extends Action
 
         $user = User::staticGet('uri', $listener);
         if (!$user) {
-            throw new Exception(sprintf(_('Listener URI ‘%s’ not found here'),
+            throw new Exception(sprintf(_('Listener URI ‘%s’ not found here.'),
                                         $listener));
         }
 
@@ -327,8 +327,8 @@ class UserauthorizationAction extends Action
         $license      = $_GET['omb_listenee_license'];
         $site_license = common_config('license', 'url');
         if (!common_compatible_license($license, $site_license)) {
-            throw new Exception(sprintf(_('Listenee stream license ‘%s’ is not ' .
-                                          'compatible with site license ‘%s’.'),
+            throw new Exception(sprintf(_('Listenee stream license ‘%1$s’ is not ' .
+                                          'compatible with site license ‘%2$s’.'),
                                         $license, $site_license));
         }
 

diff --git a/actions/usergroups.php b/actions/usergroups.php
index 84e105153de8b19cdc3429c1cd349d2b3479aa1f..504226143280bfff9f11e03b9cf2a5e3ca96632c 100644 (file)
--- a/actions/usergroups.php
+++ b/actions/usergroups.php
@@ -61,7 +61,7 @@ class UsergroupsAction extends OwnerDesignAction
         if ($this->page == 1) {
             return sprintf(_("%s groups"), $this->user->nickname);
         } else {
-            return sprintf(_("%s groups, page %d"),
+            return sprintf(_("%1$s groups, page %2$d"),
                            $this->user->nickname,
                            $this->page);
         }

diff --git a/actions/version.php b/actions/version.php
index 2cf914296382507efdb844fb9e1eecee76d7abe3..c1f673c45c04844db093dccb2c7c9304c4bad3a2 100644 (file)
--- a/actions/version.php
+++ b/actions/version.php
@@ -150,7 +150,7 @@ class VersionAction extends Action
     {
         $this->elementStart('p');
 
-        $this->raw(sprintf(_('This site is powered by %s version %s, '.
+        $this->raw(sprintf(_('This site is powered by %1$s version %2$s, '.
                              'Copyright 2008-2010 StatusNet, Inc. '.
                              'and contributors.'),
                            XMLStringer::estring('a', array('href' => 'http://status.net/'),

diff --git a/lib/action.php b/lib/action.php
index 1b4cb5cecb660b3b0d9886ea24130dd0d08492f0..6efa9163dc65550239db89c52d439f00e7af194b 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -141,7 +141,7 @@ class Action extends HTMLOutputter // lawsuit
     function showTitle()
     {
         $this->element('title', null,
-                       sprintf(_("%s - %s"),
+                       sprintf(_("%1$s - %2$s"),
                                $this->title(),
                                common_config('site', 'name')));
     }

diff --git a/lib/api.php b/lib/api.php
index 4ed49e45293197f790d167f9a8da24e882ce4b98..a6aea5d6d68df8998152107399683ced599f34ca 100644 (file)
--- a/lib/api.php
+++ b/lib/api.php
@@ -787,7 +787,7 @@ class ApiAction extends Action
 
         $from = $message->getFrom();
 
-        $entry['title'] = sprintf('Message from %s to %s',
+        $entry['title'] = sprintf('Message from %1$s to %2$s',
             $from->nickname, $message->getTo()->nickname);
 
         $entry['content'] = common_xml_safe_str($message->rendered);

diff --git a/lib/command.php b/lib/command.php
index 67140c3485f7cd56770d0feea56932865dfda03e..080d83959f137c038776c778ae9b361160e9ba84 100644 (file)
--- a/lib/command.php
+++ b/lib/command.php
@@ -85,7 +85,7 @@ class NudgeCommand extends Command
     {
         $recipient = User::staticGet('nickname', $this->other);
         if(! $recipient){
-            $channel->error($this->user, sprintf(_('Could not find a user with nickname %s'),
+            $channel->error($this->user, sprintf(_('Could not find a user with nickname %s.'),
                                $this->other));
         }else{
             if ($recipient->id == $this->user->id) {
@@ -96,7 +96,7 @@ class NudgeCommand extends Command
                 }
                 // XXX: notify by IM
                 // XXX: notify by SMS
-                $channel->output($this->user, sprintf(_('Nudge sent to %s'),
+                $channel->output($this->user, sprintf(_('Nudge sent to %s.'),
                                $recipient->nickname));
             }
         }
@@ -149,7 +149,7 @@ class FavCommand extends Command
 
             $notice = Notice::staticGet(substr($this->other,1));
             if (!$notice) {
-                $channel->error($this->user, _('Notice with that id does not exist'));
+                $channel->error($this->user, _('Notice with that id does not exist.'));
                 return;
             }
             $recipient = $notice->getProfile();
@@ -165,7 +165,7 @@ class FavCommand extends Command
             }
             $notice = $recipient->getCurrentNotice();
             if (!$notice) {
-                $channel->error($this->user, _('User has no last notice'));
+                $channel->error($this->user, _('User has no last notice.'));
                 return;
             }
         }
@@ -214,7 +214,7 @@ class JoinCommand extends Command
         }
 
         if ($cur->isMember($group)) {
-            $channel->error($cur, _('You are already a member of that group'));
+            $channel->error($cur, _('You are already a member of that group.'));
             return;
         }
         if (Group_block::isBlocked($group, $cur->getProfile())) {
@@ -231,12 +231,12 @@ class JoinCommand extends Command
         $result = $member->insert();
         if (!$result) {
           common_log_db_error($member, 'INSERT', __FILE__);
-          $channel->error($cur, sprintf(_('Could not join user %s to group %s'),
+          $channel->error($cur, sprintf(_('Could not join user %1$s to group %2$s.'),
                                        $cur->nickname, $group->nickname));
           return;
         }
 
-        $channel->output($cur, sprintf(_('%s joined group %s'),
+        $channel->output($cur, sprintf(_('%1$s joined group %2$s'),
                                               $cur->nickname,
                                               $group->nickname));
     }
@@ -281,12 +281,12 @@ class DropCommand extends Command
         $result = $member->delete();
         if (!$result) {
           common_log_db_error($member, 'INSERT', __FILE__);
-          $channel->error($cur, sprintf(_('Could not remove user %s to group %s'),
+          $channel->error($cur, sprintf(_('Could not remove user %1$s to group %2$s.'),
                                        $cur->nickname, $group->nickname));
           return;
         }
 
-        $channel->output($cur, sprintf(_('%s left group %s'),
+        $channel->output($cur, sprintf(_('%1$s left group %2$s'),
                                               $cur->nickname,
                                               $group->nickname));
     }
@@ -355,7 +355,7 @@ class MessageCommand extends Command
         $this->text = common_shorten_links($this->text);
 
         if (Message::contentTooLong($this->text)) {
-            $channel->error($this->user, sprintf(_('Message too long - maximum is %d characters, you sent %d'),
+            $channel->error($this->user, sprintf(_('Message too long - maximum is %1$d characters, you sent %2$d.'),
                                                  Message::maxContent(), mb_strlen($this->text)));
             return;
         }
@@ -373,7 +373,7 @@ class MessageCommand extends Command
         $message = Message::saveNew($this->user->id, $other->id, $this->text, $channel->source());
         if ($message) {
             $message->notify();
-            $channel->output($this->user, sprintf(_('Direct message to %s sent'), $this->other));
+            $channel->output($this->user, sprintf(_('Direct message to %s sent.'), $this->other));
         } else {
             $channel->error($this->user, _('Error sending direct message.'));
         }
@@ -396,7 +396,7 @@ class RepeatCommand extends Command
 
             $notice = Notice::staticGet(substr($this->other,1));
             if (!$notice) {
-                $channel->error($this->user, _('Notice with that id does not exist'));
+                $channel->error($this->user, _('Notice with that id does not exist.'));
                 return;
             }
             $recipient = $notice->getProfile();
@@ -412,19 +412,19 @@ class RepeatCommand extends Command
             }
             $notice = $recipient->getCurrentNotice();
             if (!$notice) {
-                $channel->error($this->user, _('User has no last notice'));
+                $channel->error($this->user, _('User has no last notice.'));
                 return;
             }
         }
 
         if($this->user->id == $notice->profile_id)
         {
-            $channel->error($this->user, _('Cannot repeat your own notice'));
+            $channel->error($this->user, _('Cannot repeat your own notice.'));
             return;
         }
 
         if ($recipient->hasRepeated($notice->id)) {
-            $channel->error($this->user, _('Already repeated that notice'));
+            $channel->error($this->user, _('Already repeated that notice.'));
             return;
         }
 
@@ -432,7 +432,7 @@ class RepeatCommand extends Command
 
         if ($repeat) {
             common_broadcast_notice($repeat);
-            $channel->output($this->user, sprintf(_('Notice from %s repeated'), $recipient->nickname));
+            $channel->output($this->user, sprintf(_('Notice from %s repeated.'), $recipient->nickname));
         } else {
             $channel->error($this->user, _('Error repeating notice.'));
         }
@@ -457,7 +457,7 @@ class ReplyCommand extends Command
 
             $notice = Notice::staticGet(substr($this->other,1));
             if (!$notice) {
-                $channel->error($this->user, _('Notice with that id does not exist'));
+                $channel->error($this->user, _('Notice with that id does not exist.'));
                 return;
             }
             $recipient = $notice->getProfile();
@@ -473,7 +473,7 @@ class ReplyCommand extends Command
             }
             $notice = $recipient->getCurrentNotice();
             if (!$notice) {
-                $channel->error($this->user, _('User has no last notice'));
+                $channel->error($this->user, _('User has no last notice.'));
                 return;
             }
         }
@@ -488,7 +488,7 @@ class ReplyCommand extends Command
         $this->text = common_shorten_links($this->text);
 
         if (Notice::contentTooLong($this->text)) {
-            $channel->error($this->user, sprintf(_('Notice too long - maximum is %d characters, you sent %d'),
+            $channel->error($this->user, sprintf(_('Notice too long - maximum is %1$d characters, you sent %2$d.'),
                                                  Notice::maxContent(), mb_strlen($this->text)));
             return;
         }
@@ -497,7 +497,7 @@ class ReplyCommand extends Command
                                   array('reply_to' => $notice->id));
 
         if ($notice) {
-            $channel->output($this->user, sprintf(_('Reply to %s sent'), $recipient->nickname));
+            $channel->output($this->user, sprintf(_('Reply to %s sent.'), $recipient->nickname));
         } else {
             $channel->error($this->user, _('Error saving notice.'));
         }
@@ -529,7 +529,7 @@ class GetCommand extends Command
         }
         $notice = $target->getCurrentNotice();
         if (!$notice) {
-            $channel->error($this->user, _('User has no last notice'));
+            $channel->error($this->user, _('User has no last notice.'));
             return;
         }
         $notice_content = $notice->content;
@@ -553,7 +553,7 @@ class SubCommand extends Command
     {
 
         if (!$this->other) {
-            $channel->error($this->user, _('Specify the name of the user to subscribe to'));
+            $channel->error($this->user, _('Specify the name of the user to subscribe to.'));
             return;
         }
 
@@ -581,7 +581,7 @@ class UnsubCommand extends Command
     function execute($channel)
     {
         if(!$this->other) {
-            $channel->error($this->user, _('Specify the name of the user to unsubscribe from'));
+            $channel->error($this->user, _('Specify the name of the user to unsubscribe from.'));
             return;
         }
 
@@ -647,7 +647,7 @@ class LoginCommand extends Command
         $disabled = common_config('logincommand','disabled');
         $disabled = isset($disabled) && $disabled;
         if($disabled) {
-            $channel->error($this->user, _('Login command is disabled'));
+            $channel->error($this->user, _('Login command is disabled.'));
             return;
         }
         $login_token = Login_token::staticGet('user_id',$this->user->id);
@@ -661,12 +661,12 @@ class LoginCommand extends Command
         $result = $login_token->insert();
         if (!$result) {
           common_log_db_error($login_token, 'INSERT', __FILE__);
-          $channel->error($this->user, sprintf(_('Could not create login token for %s'),
+          $channel->error($this->user, sprintf(_('Could not create login token for %s.'),
                                        $this->user->nickname));
           return;
         }
         $channel->output($this->user,
-            sprintf(_('This link is useable only once, and is good for only 2 minutes: %s'),
+            sprintf(_('This link is useable only once, and is good for only 2 minutes: %s.'),
                     common_local_url('login',
                         array('user_id'=>$login_token->user_id, 'token'=>$login_token->token))));
     }

diff --git a/lib/noticeform.php b/lib/noticeform.php
index f0b704e876747e751f17a0a0fc5e00c35299766a..5545d03ae98e5355daa2740e1e74850715f1fd6a 100644 (file)
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -209,7 +209,7 @@ class NoticeForm extends Form
 
                 $this->out->elementStart('div', array('id' => 'notice_data-geo_wrap',
                                                       'title' => common_local_url('geocode')));
-                $this->out->checkbox('notice_data-geo', _('Share my location'), true);
+                $this->out->checkbox('notice_data-geo', _('Share my location.'), true);
                 $this->out->elementEnd('div');
                 $this->out->inlineScript(' var NoticeDataGeoShareDisable_text = "'._('Do not share my location.').'";'.
                 ' var NoticeDataGeoInfoMinimize_text = "'._('Hide this info').'";');