diff options
author | Evan Prodromou <evan@status.net> | 2010-09-23 09:50:46 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-09-23 09:50:46 -0400 |
commit | 0f1fc36a05c8d858827718255bef20e8d0c0d3f6 (patch) | |
tree | 7be7f3fabe27e9780c37de7483807d28ef3dfcf4 /plugins/TwitterBridge/twittersettings.php | |
parent | 77609e0c4a1b76748ab320027b0696aced92b52c (diff) | |
parent | 5f409a0d7caa3b075657eef947deb7b62452b82d (diff) |
Merge branch '0.9.x'
Diffstat (limited to 'plugins/TwitterBridge/twittersettings.php')
-rw-r--r-- | plugins/TwitterBridge/twittersettings.php | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/plugins/TwitterBridge/twittersettings.php b/plugins/TwitterBridge/twittersettings.php index 631b29f52..dab8ab34f 100644 --- a/plugins/TwitterBridge/twittersettings.php +++ b/plugins/TwitterBridge/twittersettings.php @@ -45,7 +45,6 @@ require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php'; * * @see SettingsAction */ - class TwittersettingsAction extends ConnectSettingsAction { /** @@ -79,7 +78,6 @@ class TwittersettingsAction extends ConnectSettingsAction * * @return void */ - function showContent() { @@ -130,6 +128,7 @@ class TwittersettingsAction extends ConnectSettingsAction if (!$user->password) { $this->elementStart('p', array('class' => 'form_guide')); + // @todo FIXME: Bad i18n (patchwork in three parts). $this->text(_m('Disconnecting your Twitter ' . 'could make it impossible to log in! Please ')); $this->element('a', @@ -139,7 +138,7 @@ class TwittersettingsAction extends ConnectSettingsAction $this->text(_m(' first.')); $this->elementEnd('p'); } else { - + // TRANS: %1$s is the current website name. $note = _m('Keep your %1$s account but disconnect from Twitter. ' . 'You can use your %1$s password to log in.'); @@ -182,7 +181,7 @@ class TwittersettingsAction extends ConnectSettingsAction if (common_config('twitterimport','enabled')) { $this->elementStart('li'); $this->checkbox('noticerecv', - _m('Import my Friends Timeline.'), + _m('Import my friends timeline.'), ($flink) ? ($flink->noticesync & FOREIGN_NOTICE_RECV) : false); @@ -219,7 +218,6 @@ class TwittersettingsAction extends ConnectSettingsAction * * @return void */ - function handlePost() { // CSRF protection @@ -244,7 +242,6 @@ class TwittersettingsAction extends ConnectSettingsAction * * @return void */ - function removeTwitterAccount() { $user = common_current_user(); @@ -266,7 +263,6 @@ class TwittersettingsAction extends ConnectSettingsAction * * @return void */ - function savePreferences() { $noticesend = $this->boolean('noticesend'); @@ -295,5 +291,4 @@ class TwittersettingsAction extends ConnectSettingsAction $this->showForm(_m('Twitter preferences saved.'), true); } - } |