Update translator documentation.

[quix0rs-gnu-social.git] / plugins / Irc / ircmanager.php

diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 5f55e6b34dd7a7310c27014a69ee22148342a766..3c0a504eb06c80a384e5c39ae271c017c1a312f0 100644 (file)
--- a/plugins/Irc/ircmanager.php
+++ b/plugins/Irc/ircmanager.php
@@ -28,7 +28,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
  * In a multi-site queuedaemon.php run, one connection will be instantiated
  * for each site being handled by the current process that has IRC enabled.
  */
-
 class IrcManager extends ImManager {
     protected $conn = null;
     protected $lastPing = null;
@@ -78,7 +77,7 @@ class IrcManager extends ImManager {
         if ($this->messageWaiting) {
             return 1;
         } else {
-            return 120;
+            return $this->plugin->pinginterval;
         }
     }
 
@@ -89,7 +88,7 @@ class IrcManager extends ImManager {
      */
     public function idle() {
         // Send a ping if necessary
-        if (empty($this->lastPing) || time() - $this->lastPing > 120) {
+        if (empty($this->lastPing) || time() - $this->lastPing > $this->plugin->pinginterval) {
             $this->sendPing();
         }
 
@@ -177,7 +176,8 @@ class IrcManager extends ImManager {
 
                     'plugins.autoload' => true,
 
-                    'ui.enabled' => true,
+                    // Uncomment to enable debugging output
+                    //'ui.enabled' => true,
 
                     'nickserv.password' => $this->plugin->nickservpassword,
                     'nickserv.identify_message' => $this->plugin->nickservidentifyregexp,
@@ -208,7 +208,7 @@ class IrcManager extends ImManager {
     * @return boolean
     */
     public function handle_irc_message($data) {
-        $this->plugin->enqueue_incoming_raw($data);
+        $this->plugin->enqueueIncomingRaw($data);
         return true;
     }
 
@@ -228,9 +228,10 @@ class IrcManager extends ImManager {
         if (isset($this->regChecksLookup[$usernick])) {
             if ($data['registered']) {
                 // Send message
-                $this->plugin->send_confirmation_code($screenname, $nickdata['code'], $nickdata['user'], true);
+                $this->plugin->sendConfirmationCode($screenname, $nickdata['code'], $nickdata['user'], true);
             } else {
-                $this->plugin->send_message($screenname, _m('Your nickname is not registered so IRC connectivity cannot be enabled'));
+                // TRANS: Message given when using an unregistered IRC nickname.
+                $this->plugin->sendMessage($screenname, _m('Your nickname is not registered so IRC connectivity cannot be enabled.'));
 
                 $confirm = new Confirm_address();
 
@@ -242,8 +243,8 @@ class IrcManager extends ImManager {
 
                     if (!$result) {
                         common_log_db_error($confirm, 'DELETE', __FILE__);
-                        // TRANS: Server error thrown on database error canceling IM address confirmation.
-                        $this->serverError(_('Couldn\'t delete confirmation.'));
+                        // TRANS: Server error thrown on database error when deleting IRC nickname confirmation.
+                        $this->serverError(_m('Could not delete confirmation.'));
                         return;
                     }
                 }
@@ -284,7 +285,8 @@ class IrcManager extends ImManager {
 
         if (!$result) {
             common_log_db_error($wm, 'INSERT', __FILE__);
-            throw new ServerException('DB error inserting IRC waiting queue item');
+            // TRANS: Server exception thrown when an IRC waiting queue item could not be added to the database.
+            throw new ServerException(_m('Database error inserting IRC waiting queue item.'));
         }
 
         return true;