Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / Directory / DirectoryPlugin.php

diff --git a/plugins/Directory/DirectoryPlugin.php b/plugins/Directory/DirectoryPlugin.php
index cae94e3427f668c33d46ed534ad67a53c3df485f..d940b813db2f4ae6f02922e3ea9b542e8b3e49c0 100644 (file)
--- a/plugins/Directory/DirectoryPlugin.php
+++ b/plugins/Directory/DirectoryPlugin.php
@@ -82,37 +82,36 @@ class DirectoryPlugin extends Plugin
         $m->connect(
             'directory/users/:filter/sort_by/:sort/reverse/:reverse',
             array('action' => 'userdirectory'),
-            array('filter' => '[0-9a-zA-Z]|(0-9)'),            
+            array('filter' => '[0-9a-zA-Z]|(0-9)'),
             array('sort' => '[a-z]+'),
-            array('reverse' => '[0-9]')                        
+            array('reverse' => '[0-9]')
         );
 
         $m->connect(
             'directory/users/:filter/sort_by/:sort',
             array('action' => 'userdirectory'),
-            array('filter' => '[0-9a-zA-Z]|(0-9)'),            
-            array('sort' => '[a-z]+')            
-        );  
-
+            array('filter' => '[0-9a-zA-Z]|(0-9)'),
+            array('sort' => '[a-z]+')
+        );
 
         $m->connect(
             'directory/users/:filter',
             array('action' => 'userdirectory'),
             array('filter' => '[0-9a-zA-Z]|(0-9)')
         );
-        
+
         $m->connect(
             'directory/users/sort_by/:sort/reverse/:reverse',
             array('action' => 'userdirectory'),
             array('sort' => '[a-z]+'),
-            array('reverse' => '[0-9]')                        
+            array('reverse' => '[0-9]')
         );
 
         $m->connect(
             'directory/users/sort_by/:sort',
             array('action' => 'userdirectory'),
-            array('sort' => '[a-z]+')            
-        );        
+            array('sort' => '[a-z]+')
+        );
 
         $m->connect(
             'directory/users',
@@ -135,7 +134,6 @@ class DirectoryPlugin extends Plugin
             array('action' => 'groupdirectory')
         );
 
-
         return true;
     }
 
@@ -238,9 +236,9 @@ class DirectoryPlugin extends Plugin
         $nav->out->menuItem(
             common_local_url('userdirectory'),
             // TRANS: Menu item text for user directory.
-            _m('MENU','Directory'),
+            _m('MENU','People'),
             // TRANS: Menu item title for user directory.
-            _m('User Directory.'),
+            _m('People.'),
             $actionName == 'userdirectory',
             'nav_directory'
         );