summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-09-11 16:22:03 -0400
committerEvan Prodromou <evan@status.net>2010-09-11 16:22:03 -0400
commit76c0e3169b317137704ae094dec7bf955fe96a13 (patch)
tree46313c575299a68bb712e56673cc88b1285ec9f7
parentfca7ea664ba4d860dd3a3c798873b4638cd0138d (diff)
move othersettings to urlsettings
-rw-r--r--actions/urlsettings.php (renamed from actions/othersettings.php)6
-rw-r--r--lib/accountsettingsaction.php8
-rw-r--r--lib/router.php2
3 files changed, 8 insertions, 8 deletions
diff --git a/actions/othersettings.php b/actions/urlsettings.php
index 3f2d8df6b..dd191a807 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 57740f8b8..819f749f7 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 86dd116c8..30f6c8cdc 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'));
}