Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

[quix0rs-gnu-social.git] / plugins / Facebook / facebooksettings.php

diff --git a/plugins/Facebook/facebooksettings.php b/plugins/Facebook/facebooksettings.php
index 2f182e36816d8db654c6ef1689bde07077d25b59..1379b9a9cca981f24479cd0d3b2979d3948ea6f2 100644 (file)
--- a/plugins/Facebook/facebooksettings.php
+++ b/plugins/Facebook/facebooksettings.php
@@ -25,7 +25,6 @@ require_once INSTALLDIR . '/plugins/Facebook/facebookaction.php';
 
 class FacebooksettingsAction extends FacebookAction
 {
-
     function handle($args)
     {
         parent::handle($args);
@@ -40,7 +39,6 @@ class FacebooksettingsAction extends FacebookAction
      *
      * @return void
      */
-
     function showContent()
     {
         if ($this->arg('save')) {
@@ -52,28 +50,18 @@ class FacebooksettingsAction extends FacebookAction
 
     function saveSettings() {
 
-        $noticesync = $this->arg('noticesync');
-        $replysync = $this->arg('replysync');
-        $prefix = $this->trimmed('prefix');
+        $noticesync = $this->boolean('noticesync');
+        $replysync  = $this->boolean('replysync');
 
         $original = clone($this->flink);
-        $this->flink->set_flags($noticesync, $replysync, false, false);
+        $this->flink->set_flags($noticesync, false, $replysync, false);
         $result = $this->flink->update($original);
 
-        if ($prefix == '' || $prefix == '0') {
-               // Facebook bug: saving empty strings to prefs now fails
-               // http://bugs.developers.facebook.com/show_bug.cgi?id=7110
-               $trimmed = $prefix . ' ';
-        } else {
-               $trimmed = substr($prefix, 0, 128);
-           }
-        $this->facebook->api_client->data_setUserPreference(FACEBOOK_NOTICE_PREFIX,
-            $trimmed);
-
         if ($result === false) {
-            $this->showForm(_('There was a problem saving your sync preferences!'));
+            $this->showForm(_m('There was a problem saving your sync preferences!'));
         } else {
-            $this->showForm(_('Sync preferences saved.'), true);
+            // TRANS: Confirmation that synchronisation settings have been saved into the system.
+            $this->showForm(_m('Sync preferences saved.'), true);
         }
     }
 
@@ -96,41 +84,31 @@ class FacebooksettingsAction extends FacebookAction
 
             $this->elementStart('li');
 
-            $this->checkbox('noticesync', _('Automatically update my Facebook status with my notices.'),
+            $this->checkbox('noticesync', _m('Automatically update my Facebook status with my notices.'),
                                 ($this->flink) ? ($this->flink->noticesync & FOREIGN_NOTICE_SEND) : true);
 
             $this->elementEnd('li');
 
             $this->elementStart('li');
 
-            $this->checkbox('replysync', _('Send "@" replies to Facebook.'),
+            $this->checkbox('replysync', _m('Send "@" replies to Facebook.'),
                              ($this->flink) ? ($this->flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) : true);
 
             $this->elementEnd('li');
 
             $this->elementStart('li');
 
-            $prefix = trim($this->facebook->api_client->data_getUserPreference(FACEBOOK_NOTICE_PREFIX));
-
-            $this->input('prefix', _('Prefix'),
-                         ($prefix) ? $prefix : null,
-                         _('A string to prefix notices with.'));
-
-            $this->elementEnd('li');
-
-            $this->elementStart('li');
-
-            $this->submit('save', _('Save'));
+            // TRANS: Submit button to save synchronisation settings.
+            $this->submit('save', _m('BUTTON','Save'));
 
             $this->elementEnd('li');
 
             $this->elementEnd('ul');
 
             $this->elementEnd('form');
-
         } else {
-
-            $instructions = sprintf(_('If you would like %s to automatically update ' .
+            // TRANS: %s is the application name.
+            $instructions = sprintf(_m('If you would like %s to automatically update ' .
                 'your Facebook status with your latest notice, you need ' .
                 'to give it permission.'), $this->app_name);
 
@@ -143,17 +121,16 @@ class FacebooksettingsAction extends FacebookAction
             $this->elementStart('fb:prompt-permission', array('perms' => 'publish_stream',
                 'next_fbjs' => 'document.setLocation(\'' . "$this->app_uri/settings.php" . '\')'));
             $this->element('span', array('class' => 'facebook-button'),
-                sprintf(_('Allow %s to update my Facebook status'), common_config('site', 'name')));
+                sprintf(_m('Allow %s to update my Facebook status'), common_config('site', 'name')));
             $this->elementEnd('fb:prompt-permission');
             $this->elementEnd('li');
             $this->elementEnd('ul');
         }
-
     }
 
     function title()
     {
-        return _('Sync preferences');
+        // TRANS: Page title for synchronisation settings.
+        return _m('Sync preferences');
     }
-
 }