Merge branch 'testing'

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

diff --git a/actions/usergroups.php b/actions/usergroups.php
index 9543eb48011c6d8b28b2e66c4e2aea18f6dcb65e..97faabae65ad9cd7f02ab1c5cc0cba3d04a21fa1 100644 (file)
--- a/actions/usergroups.php
+++ b/actions/usergroups.php
@@ -21,14 +21,14 @@
  *
  * @category  Personal
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -41,7 +41,7 @@ require_once INSTALLDIR.'/lib/grouplist.php';
  *
  * @category Personal
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
@@ -59,9 +59,9 @@ class UsergroupsAction extends OwnerDesignAction
     function title()
     {
         if ($this->page == 1) {
-            return sprintf(_("%s groups"), $this->user->nickname);
+            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);
         }