Merge remote branch 'gitorious/0.9.x' into 0.9.x

[quix0rs-gnu-social.git] / actions / apigrouplist.php

diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php
index 42211a03ce46e16d9f190d46f131c378ad863ed2..319a1e424d3c15285df9921ddcdb74a7f1d71fc4 100644 (file)
--- a/actions/apigrouplist.php
+++ b/actions/apigrouplist.php
@@ -26,6 +26,7 @@
  * @author    Jeffery To <jeffery.to@gmail.com>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -93,6 +94,7 @@ class ApiGroupListAction extends ApiBareAuthAction
         parent::handle($args);
 
         $sitename   = common_config('site', 'name');
+        // TRANS: %s is a user name
         $title      = sprintf(_("%s's groups"), $this->user->nickname);
         $taguribase = TagURI::base();
         $id         = "tag:$taguribase:Groups";
@@ -101,8 +103,8 @@ class ApiGroupListAction extends ApiBareAuthAction
             array('nickname' => $this->user->nickname)
         );
 
-        // TRANS: Meant to convey the user is a member of each of the groups listed
         $subtitle   = sprintf(
+            // TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
             _("%1\$s groups %2\$s is a member of."),
             $sitename,
             $this->user->nickname
@@ -211,6 +213,7 @@ class ApiGroupListAction extends ApiBareAuthAction
             return '"' . implode(
                 ':',
                 array($this->arg('action'),
+                      common_user_cache_hash($this->auth_user),
                       common_language(),
                       $this->user->id,
                       strtotime($this->groups[0]->created),