summaryrefslogtreecommitdiffstats
path: root/etc/inc/xmlrpc_client.inc
diff options
context:
space:
mode:
authorVinicius Coque <vinicius.coque@bluepex.com>2011-07-18 15:33:28 -0300
committerVinicius Coque <vinicius.coque@bluepex.com>2011-07-18 15:33:28 -0300
commitb1e4005f9fd3c3e4e7ef86cdf756cfc84c3f6efc (patch)
treecb1cb173d468581e832a78849e7084457a2a9533 /etc/inc/xmlrpc_client.inc
parent3f48162fdea51aa7a9ff64e4ebf4cc777dc9f029 (diff)
downloadpfsense-b1e4005f9fd3c3e4e7ef86cdf756cfc84c3f6efc.zip
pfsense-b1e4005f9fd3c3e4e7ef86cdf756cfc84c3f6efc.tar.gz
removes variables concatenation on gettext strings
Diffstat (limited to 'etc/inc/xmlrpc_client.inc')
-rw-r--r--etc/inc/xmlrpc_client.inc14
1 files changed, 7 insertions, 7 deletions
diff --git a/etc/inc/xmlrpc_client.inc b/etc/inc/xmlrpc_client.inc
index a192815..3318f2a 100644
--- a/etc/inc/xmlrpc_client.inc
+++ b/etc/inc/xmlrpc_client.inc
@@ -946,15 +946,15 @@ class XML_RPC_Client extends XML_RPC_Base {
* but keep it here for backwards compatibility.
*/
if (!$fp && $this->proxy) {
- $this->raiseError(gettext('Connection to proxy server ')
- . $this->proxy . ':' . $this->proxy_port
- . gettext(' failed. ') . $this->errstr,
+ $this->raiseError(sprintf(gettext('Connection to proxy server
+ %1$s:%2$s failed. %3$s')
+ ,$this->proxy,$this->proxy_port,$this->errstr),
XML_RPC_ERROR_CONNECTION_FAILED);
return 0;
} elseif (!$fp) {
- $this->raiseError(gettext('Connection to RPC server ')
- . $server . ':' . $port
- . gettext(' failed. ') . $this->errstr,
+ $this->raiseError(sprintf(gettext('Connection to RPC server
+ %1$s:%2$s failed. %3$s')
+ ,$server,$port,$this->errstr),
XML_RPC_ERROR_CONNECTION_FAILED);
return 0;
}
@@ -1465,7 +1465,7 @@ class XML_RPC_Message extends XML_RPC_Base
!preg_match('@^HTTP/[0-9\.]+ 10[0-9]([A-Z ]+)?[\r\n]+HTTP/[0-9\.]+ 200@', $data))
{
$errstr = substr($data, 0, strpos($data, "\n") - 1);
- error_log(gettext("HTTP error, got response: ") . $errstr);
+ error_log(sprintf(gettext("HTTP error, got response: %s"),$errstr));
$r = new XML_RPC_Response(0, $XML_RPC_err['http_error'],
$XML_RPC_str['http_error'] . ' (' .
$errstr . ')');
OpenPOWER on IntegriCloud