More info for a proper, fancy-url lighttpd setup

[quix0rs-gnu-social.git] / plugins / TwitterBridge / twitteradminpanel.php

diff --git a/plugins/TwitterBridge/twitteradminpanel.php b/plugins/TwitterBridge/twitteradminpanel.php
index a78a92c66732ad6ed790e11d96a0a970c5374c83..9ace4e4a97dca62ab2bcfcf5b0b35ecdd3bdc6b1 100644 (file)
--- a/plugins/TwitterBridge/twitteradminpanel.php
+++ b/plugins/TwitterBridge/twitteradminpanel.php
@@ -40,7 +40,6 @@ if (!defined('STATUSNET')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class TwitteradminpanelAction extends AdminPanelAction
 {
     /**
@@ -48,10 +47,10 @@ class TwitteradminpanelAction extends AdminPanelAction
      *
      * @return string page title
      */
-
     function title()
     {
-        return _m('Twitter');
+        // TRANS: Page title for Twitter administration panel.
+        return _m('TITLE','Twitter');
     }
 
     /**
@@ -59,9 +58,9 @@ class TwitteradminpanelAction extends AdminPanelAction
      *
      * @return string instructions
      */
-
     function getInstructions()
     {
+        // TRANS: Instructions for Twitter bridge administration page.
         return _m('Twitter bridge settings');
     }
 
@@ -70,7 +69,6 @@ class TwitteradminpanelAction extends AdminPanelAction
      *
      * @return void
      */
-
     function showForm()
     {
         $form = new TwitterAdminPanelForm($this);
@@ -83,7 +81,6 @@ class TwitteradminpanelAction extends AdminPanelAction
      *
      * @return void
      */
-
     function saveSettings()
     {
         static $settings = array(
@@ -92,9 +89,11 @@ class TwitteradminpanelAction extends AdminPanelAction
         );
 
         static $booleans = array(
-            'twitter'       => array('signin'),
-            'twitterimport' => array('enabled')
+            'twitter'       => array('signin')
         );
+        if (Event::handle('TwitterBridgeAdminImportControl')) {
+            $booleans['twitterimport'] = array('enabled');
+        }
 
         $values = array();
 
@@ -136,6 +135,11 @@ class TwitteradminpanelAction extends AdminPanelAction
 
         $config->query('COMMIT');
 
+        // Flush the router cache: we may have enabled/disabled bridging,
+        // which will add or remove some actions.
+        $cache = Cache::instance();
+        $cache->delete(Router::cacheKey());
+
         return;
     }
 
@@ -145,16 +149,25 @@ class TwitteradminpanelAction extends AdminPanelAction
 
         if (mb_strlen($values['twitter']['consumer_key']) > 255) {
             $this->clientError(
-                _m("Invalid consumer key. Max length is 255 characters.")
+                // TRANS: Client error displayed when a consumer key is invalid because it is too long.
+                _m('Invalid consumer key. Maximum length is 255 characters.')
             );
         }
 
         if (mb_strlen($values['twitter']['consumer_secret']) > 255) {
             $this->clientError(
-                _m("Invalid consumer secret. Max length is 255 characters.")
+                // TRANS: Client error displayed when a consumer secret is invalid because it is too long.
+                _m('Invalid consumer secret. Maximum length is 255 characters.')
             );
         }
     }
+
+    function isImportEnabled()
+    {
+        // Since daemon setup isn't automated yet...
+        // @todo: if merged into main queues, detect presence of daemon config
+        return true;
+    }
 }
 
 class TwitterAdminPanelForm extends AdminForm
@@ -164,7 +177,6 @@ class TwitterAdminPanelForm extends AdminForm
      *
      * @return int ID of the form
      */
-
     function id()
     {
         return 'twitteradminpanel';
@@ -175,7 +187,6 @@ class TwitterAdminPanelForm extends AdminForm
      *
      * @return string class of the form
      */
-
     function formClass()
     {
         return 'form_settings';
@@ -186,7 +197,6 @@ class TwitterAdminPanelForm extends AdminForm
      *
      * @return string URL of the action
      */
-
     function action()
     {
         return common_local_url('twitteradminpanel');
@@ -197,21 +207,23 @@ class TwitterAdminPanelForm extends AdminForm
      *
      * @return void
      */
-
     function formData()
     {
         $this->out->elementStart(
             'fieldset',
             array('id' => 'settings_twitter-application')
         );
+        // TRANS: Fieldset legend for Twitter application settings.
         $this->out->element('legend', null, _m('Twitter application settings'));
         $this->out->elementStart('ul', 'form_data');
 
         $this->li();
         $this->input(
             'consumer_key',
+            // TRANS: Field label for Twitter assigned consumer key.
             _m('Consumer key'),
-            _m('Consumer key assigned by Twitter'),
+            // TRANS: Field title for Twitter assigned consumer key.
+            _m('The consumer key assigned by Twitter.'),
             'twitter'
         );
         $this->unli();
@@ -219,8 +231,10 @@ class TwitterAdminPanelForm extends AdminForm
         $this->li();
         $this->input(
             'consumer_secret',
-             _m('Consumer secret'),
-            _m('Consumer secret assigned by Twitter'),
+            // TRANS: Field label for Twitter assigned consumer secret.
+            _m('Consumer secret'),
+            // TRANS: Field title for Twitter assigned consumer secret.
+            _m('The consumer secret assigned by Twitter.'),
             'twitter'
         );
         $this->unli();
@@ -230,15 +244,18 @@ class TwitterAdminPanelForm extends AdminForm
 
         if (!empty($globalConsumerKey) && !empty($globalConsumerSec)) {
             $this->li();
-            $this->out->element('p', 'form_guide', _('Note: a global consumer key and secret are set.'));
+            // TRANS: Form guide displayed when two required fields have already been provided.
+            $this->out->element('p', 'form_guide', _m('Note: A global consumer key and secret are set.'));
             $this->unli();
         }
 
         $this->li();
         $this->input(
             'source',
-             _m('Integration source'),
-            _m('Name of your Twitter application'),
+            // TRANS: Field label for Twitter application name.
+            _m('Integration source'),
+            // TRANS: Field title for Twitter application name.
+            _m('The name of your Twitter application.'),
             'integration'
         );
         $this->unli();
@@ -250,6 +267,7 @@ class TwitterAdminPanelForm extends AdminForm
             'fieldset',
             array('id' => 'settings_twitter-options')
         );
+        // TRANS: Fieldset legend for Twitter integration options.
         $this->out->element('legend', null, _m('Options'));
 
         $this->out->elementStart('ul', 'form_data');
@@ -257,19 +275,25 @@ class TwitterAdminPanelForm extends AdminForm
         $this->li();
 
         $this->out->checkbox(
+            // TRANS: Checkbox label for global setting.
             'signin', _m('Enable "Sign-in with Twitter"'),
             (bool) $this->value('signin', 'twitter'),
-            _m('Allow users to login with their Twitter credentials')
+            // TRANS: Checkbox title.
+            _m('This allow users to login with their Twitter credentials.')
         );
         $this->unli();
 
-        $this->li();
-        $this->out->checkbox(
-            'enabled', _m('Enable Twitter import'),
-            (bool) $this->value('enabled', 'twitterimport'),
-            _m('Allow users to import their Twitter friends\' timelines')
-        );
-        $this->unli();
+        if (Event::handle('TwitterBridgeAdminImportControl')) {
+            $this->li();
+            $this->out->checkbox(
+                // TRANS: Checkbox label for global setting.
+                'enabled', _m('Enable Twitter import'),
+                (bool) $this->value('enabled', 'twitterimport'),
+                // TRANS: Checkbox title for global setting.
+                _m('Allow users to import their Twitter friends\' timelines. Requires daemons to be manually configured.')
+            );
+            $this->unli();
+        }
 
         $this->out->elementEnd('ul');
 
@@ -281,9 +305,11 @@ class TwitterAdminPanelForm extends AdminForm
      *
      * @return void
      */
-
     function formActions()
     {
-        $this->out->submit('submit', _('Save'), 'submit', null, _('Save Twitter settings'));
+        // TRANS: Button text for saving the administrative Twitter bridge settings.
+        $this->out->submit('submit', _m('BUTTON','Save'), 'submit', null,
+        // TRANS: Button title for saving the administrative Twitter bridge settings.
+        _m('Save the Twitter bridge settings.'));
     }
 }