From 59ee7e0f5b7118fac1da51f4c71e289a2881f00a Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Fri, 17 Jun 2011 15:41:45 +0200 Subject: [PATCH] Translator documentation updated. Whitespace updates. --- plugins/Xmpp/Queued_XMPP.php | 20 ++++++++++++-------- plugins/Xmpp/XmppPlugin.php | 13 +++++++++---- plugins/Xmpp/xmppmanager.php | 2 +- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/plugins/Xmpp/Queued_XMPP.php b/plugins/Xmpp/Queued_XMPP.php index 24f542805b..aeb758421f 100644 --- a/plugins/Xmpp/Queued_XMPP.php +++ b/plugins/Xmpp/Queued_XMPP.php @@ -88,34 +88,38 @@ class Queued_XMPP extends XMPPHP_XMPP */ public function connect($timeout = 30, $persistent = false, $sendinit = true) { - throw new Exception("Can't connect to server from fake XMPP."); + // No i18n needed. Test message. + throw new Exception('Cannot connect to server from fake XMPP.'); } public function disconnect() { - throw new Exception("Can't connect to server from fake XMPP."); + // No i18n needed. Test message. + throw new Exception('Cannot connect to server from fake XMPP.'); } public function process() { - throw new Exception("Can't read stream from fake XMPP."); + // No i18n needed. Test message. + throw new Exception('Cannot read stream from fake XMPP.'); } public function processUntil($event, $timeout=-1) { - throw new Exception("Can't read stream from fake XMPP."); + // No i18n needed. Test message. + throw new Exception('Cannot read stream from fake XMPP.'); } public function read() { - throw new Exception("Can't read stream from fake XMPP."); + // No i18n needed. Test message. + throw new Exception('Cannot read stream from fake XMPP.'); } public function readyToProcess() { - throw new Exception("Can't read stream from fake XMPP."); + // No i18n needed. Test message. + throw new Exception('Cannot read stream from fake XMPP.'); } //@} - } - diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php index ece4acac37..50950d8570 100644 --- a/plugins/Xmpp/XmppPlugin.php +++ b/plugins/Xmpp/XmppPlugin.php @@ -402,16 +402,20 @@ class XmppPlugin extends ImPlugin */ function queuedConnection(){ if(!isset($this->server)){ - throw new Exception("must specify a server"); + // TRANS: Exception thrown when the plugin configuration is incorrect. + throw new Exception(_m('You must specify a server in the configuration.')); } if(!isset($this->port)){ - throw new Exception("must specify a port"); + // TRANS: Exception thrown when the plugin configuration is incorrect. + throw new Exception(_m('You must specify a port in the configuration.')); } if(!isset($this->user)){ - throw new Exception("must specify a user"); + // TRANS: Exception thrown when the plugin configuration is incorrect. + throw new Exception(_m('You must specify a user in the configuration.')); } if(!isset($this->password)){ - throw new Exception("must specify a password"); + // TRANS: Exception thrown when the plugin configuration is incorrect. + throw new Exception(_m('You must specify a password in the configuration.')); } return new Queued_XMPP($this, $this->host ? @@ -436,6 +440,7 @@ class XmppPlugin extends ImPlugin 'author' => 'Craig Andrews, Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:XMPP', 'rawdescription' => + // TRANS: Plugin description. _m('The XMPP plugin allows users to send and receive notices over the XMPP/Jabber network.')); return true; } diff --git a/plugins/Xmpp/xmppmanager.php b/plugins/Xmpp/xmppmanager.php index f6a9b40a1d..c7d4c15dd6 100644 --- a/plugins/Xmpp/xmppmanager.php +++ b/plugins/Xmpp/xmppmanager.php @@ -245,7 +245,7 @@ class XmppManager extends ImManager function special_presence($type, $to=null, $show=null, $status=null) { - // FIXME: why use this instead of send_presence()? + // @todo FIXME: why use this instead of send_presence()? $this->connect(); if (!$this->conn || $this->conn->isDisconnected()) { return false; -- 2.39.5