X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2FIrc%2Fircmanager.php;h=3c0a504eb06c80a384e5c39ae271c017c1a312f0;hb=c97048d01bea468e0cf8865b60c3c250b4515c39;hp=292c98b2b0502a73a5828c4300d35d9fb59873ac;hpb=6a848bcc8ac37066f7c4941132195d2d67d3b376;p=quix0rs-gnu-social.git

diff --git a/plugins/Irc/ircmanager.php b/plugins/Irc/ircmanager.php
index 292c98b2b0..3c0a504eb0 100644
--- 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;
@@ -209,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;
     }
 
@@ -229,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->sendMessage($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();
 
@@ -243,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;
                     }
                 }
@@ -285,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;