From 76c0e3169b317137704ae094dec7bf955fe96a13 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 11 Sep 2010 16:22:03 -0400
Subject: [PATCH] move othersettings to urlsettings

---
 actions/{othersettings.php => urlsettings.php} | 6 +++---
 lib/accountsettingsaction.php                  | 8 ++++----
 lib/router.php                                 | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename actions/{othersettings.php => urlsettings.php} (97%)

diff --git a/actions/othersettings.php b/actions/urlsettings.php
similarity index 97%
rename from actions/othersettings.php
rename to actions/urlsettings.php
index 3f2d8df6b4..dd191a807b 100644
--- a/actions/othersettings.php
+++ b/actions/urlsettings.php
@@ -47,7 +47,7 @@ require_once INSTALLDIR.'/lib/accountsettingsaction.php';
  * @link     http://status.net/
  */
 
-class OthersettingsAction extends AccountSettingsAction
+class UrlsettingsAction extends AccountSettingsAction
 {
     /**
      * Title of the page
@@ -57,7 +57,7 @@ class OthersettingsAction extends AccountSettingsAction
 
     function title()
     {
-        return _('Other settings');
+        return _('URL settings');
     }
 
     /**
@@ -93,7 +93,7 @@ class OthersettingsAction extends AccountSettingsAction
                                           'id' => 'form_settings_other',
                                           'class' => 'form_settings',
                                           'action' =>
-                                          common_local_url('othersettings')));
+                                          common_local_url('urlsettings')));
         $this->elementStart('fieldset');
         $this->hidden('token', common_session_token());
         $this->elementStart('ul', 'form_data');
diff --git a/lib/accountsettingsaction.php b/lib/accountsettingsaction.php
index 57740f8b85..819f749f73 100644
--- a/lib/accountsettingsaction.php
+++ b/lib/accountsettingsaction.php
@@ -139,12 +139,12 @@ class AccountSettingsNav extends Widget
                 $this->showMenuItem('userdesignsettings',_('Design'),$title);
                 Event::handle('EndAccountSettingsDesignMenuItem', array($this, &$menu));
             }
-            if(Event::handle('StartAccountSettingsOtherMenuItem', array($this, &$menu))){
+            if(Event::handle('StartAccountSettingsUrlMenuItem', array($this, &$menu))){
                 // TRANS: Link title attribute in user account settings menu.
-                $title = _('Other options');
+                $title = _('URL shortener settings');
                 // TRANS: Link description in user account settings menu.
-                $this->showMenuItem('othersettings',_('Other'),$title);
-                Event::handle('EndAccountSettingsOtherMenuItem', array($this, &$menu));
+                $this->showMenuItem('urlsettings',_('URL'),$title);
+                Event::handle('EndAccountSettingsUrlMenuItem', array($this, &$menu));
             }
 
             Event::handle('EndAccountSettingsNav', array(&$this->action));
diff --git a/lib/router.php b/lib/router.php
index 86dd116c8d..30f6c8cdc9 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -172,7 +172,7 @@ class Router
             // settings
 
             foreach (array('profile', 'avatar', 'password', 'im', 'oauthconnections',
-                           'oauthapps', 'email', 'sms', 'userdesign', 'other') as $s) {
+                           'oauthapps', 'email', 'sms', 'userdesign', 'url') as $s) {
                 $m->connect('settings/'.$s, array('action' => $s.'settings'));
             }
 
-- 
2.39.5