GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

* fix typo in parameter notation

Browse Source 
* add FIXME for unused message
* remove superfluous whitespace
This commit is contained in:
Siebrand Mazeland 2010-12-02 12:42:58 +01:00
parent 086d6c9f36
commit c4f67f7647
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/FacebookBridge/actions/facebooksettings.php
View File

@ -42,7 +42,6 @@ if (!defined('STATUSNET')) {
* @see SettingsAction * @see SettingsAction
*/ */
class FacebooksettingsAction extends ConnectSettingsAction { class FacebooksettingsAction extends ConnectSettingsAction {
private $facebook; // Facebook PHP-SDK client obj private $facebook; // Facebook PHP-SDK client obj
private $flink; private $flink;
private $user; private $user;
@ -121,7 +120,6 @@ class FacebooksettingsAction extends ConnectSettingsAction {
* @return void * @return void
*/ */
function showContent() { function showContent() {
if (!empty($this->flink)) { if (!empty($this->flink)) {
$this->elementStart( $this->elementStart(
@ -194,7 +192,6 @@ class FacebooksettingsAction extends ConnectSettingsAction {
$this->element('legend', null, _m('Disconnect my account from Facebook')); $this->element('legend', null, _m('Disconnect my account from Facebook'));
if (empty($this->user->password)) { if (empty($this->user->password)) {
$this->elementStart('p', array('class' => 'form_guide')); $this->elementStart('p', array('class' => 'form_guide'));
$msg = sprintf( $msg = sprintf(
@ -207,13 +204,14 @@ class FacebooksettingsAction extends ConnectSettingsAction {
$this->raw(common_markup_to_html($msg)); $this->raw(common_markup_to_html($msg));
$this->elementEnd('p'); $this->elementEnd('p');
} else { } else {
// @todo FIXME: i18n: This message is not being used.
$msg = sprintf( $msg = sprintf(
// TRANS: Message displayed when initiating disconnect of a StatusNet user
// TRANS: from a Facebook account. %1$s is the StatusNet site name.
_m( _m(
'Keep your %1$s account but disconnect from Facebook. ' . 'Keep your %1$s account but disconnect from Facebook. ' .
'You\'ll use your 1%$s password to log in.' 'You\'ll use your %1$s password to log in.'
), ),
common_config('site', 'name') common_config('site', 'name')
); );
@ -234,7 +232,6 @@ class FacebooksettingsAction extends ConnectSettingsAction {
* @return void * @return void
*/ */
function saveSettings() { function saveSettings() {
$noticesync = $this->boolean('noticesync'); $noticesync = $this->boolean('noticesync');
$replysync = $this->boolean('replysync'); $replysync = $this->boolean('replysync');
@ -255,7 +252,6 @@ class FacebooksettingsAction extends ConnectSettingsAction {
* and shows the user a success message if all goes well. * and shows the user a success message if all goes well.
*/ */
function disconnect() { function disconnect() {
$result = $this->flink->delete(); $result = $this->flink->delete();
$this->flink = null; $this->flink = null;
@ -267,5 +263,4 @@ class FacebooksettingsAction extends ConnectSettingsAction {
$this->showForm(_m('You have disconnected from Facebook.'), true); $this->showForm(_m('You have disconnected from Facebook.'), true);
} }
} }