diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-10-01 10:29:29 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-10-01 10:29:29 -0300 |
| commit | 8e1fd4fea9d0d6f16f3119b36bd8323e9b76d5ef (patch) | |
| tree | 8a8cc8ca451b173a02542a21172d14647a9df382 | |
| parent | addc0439931fb28c626c7024b1e9857adfe29f29 (diff) | |
| download | pfsense-8e1fd4fea9d0d6f16f3119b36bd8323e9b76d5ef.zip pfsense-8e1fd4fea9d0d6f16f3119b36bd8323e9b76d5ef.tar.gz | |
More gettext fixes
| -rw-r--r-- | etc/inc/PEAR.inc | 4 | ||||
| -rw-r--r-- | etc/inc/auth.inc | 4 | ||||
| -rw-r--r-- | etc/inc/config.console.inc | 2 | ||||
| -rw-r--r-- | etc/inc/meta.inc | 4 | ||||
| -rw-r--r-- | etc/inc/system.inc | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/etc/inc/PEAR.inc b/etc/inc/PEAR.inc index ac5cc12..961a548 100644 --- a/etc/inc/PEAR.inc +++ b/etc/inc/PEAR.inc @@ -158,7 +158,7 @@ class PEAR { $classname = strtolower(get_class($this)); if ($this->_debug) { - printf(gettext("PEAR constructor called, class=%s%s"), $classname, "\n"); + printf(gettext("PEAR constructor called, class=%s\n"), $classname); } if ($error_class !== null) { $this->_error_class = $error_class; @@ -195,7 +195,7 @@ class PEAR */ function _PEAR() { if ($this->_debug) { - printf(gettext("PEAR destructor called, class=%s%s"), strtolower(get_class($this)), "\n"); + printf(gettext("PEAR destructor called, class=%s\n"), strtolower(get_class($this))); } } diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc index f48a9bc..0d01e50 100644 --- a/etc/inc/auth.inc +++ b/etc/inc/auth.inc @@ -999,7 +999,7 @@ function radius_backed($username, $passwd, $authcfg){ $retvalue['auth_val'] = 1; $retvalue['error'] = $rauth->getError(); if ($debug) - printf(gettext("Radius start: %s%s"), $retvalue['error'], "<br>\n"); + printf(gettext("Radius start: %s<br>\n"), $retvalue['error']); } // XXX - billm - somewhere in here we need to handle securid challenge/response @@ -1010,7 +1010,7 @@ function radius_backed($username, $passwd, $authcfg){ $retvalue['auth_val'] = 1; $retvalue['error'] = $result->getMessage(); if ($debug) - printf(gettext("Radius send failed: %s%s"), $retvalue['error'], "<br>\n"); + printf(gettext("Radius send failed: %s<br>\n"), $retvalue['error']); } else if ($result === true) { $retvalue['auth_val'] = 2; if ($debug) diff --git a/etc/inc/config.console.inc b/etc/inc/config.console.inc index 3c783b2..934f0d1 100644 --- a/etc/inc/config.console.inc +++ b/etc/inc/config.console.inc @@ -301,7 +301,7 @@ EOD; } } - printf(gettext("%sThe interfaces will be assigned as follows: %s%s"), "\n", "\n", "\n"); + echo "\n" . gettext("The interfaces will be assigned as follows:") . "\n\n"; if ($lanif != "") echo "LAN -> " . $lanif . "\n"; diff --git a/etc/inc/meta.inc b/etc/inc/meta.inc index cad7942..11295f5 100644 --- a/etc/inc/meta.inc +++ b/etc/inc/meta.inc @@ -65,7 +65,7 @@ function list_phpfiles($path, & $found) { $dir = opendir($path); if (!$dir) { - printf(gettext("list_phpfiles: unable to examine path %s%s"), $path, "\n"); + printf(gettext("list_phpfiles: unable to examine path %s\n"), $path); return; } @@ -96,7 +96,7 @@ function read_file_metadata($fpath, & $metadata, $taglist = false) { $fdata = @file_get_contents($fpath); if (!$fdata) { - printf(gettext("unable to read %s%s"), $fpath, "\n"); + printf(gettext("unable to read %s\n"), $fpath); continue; } diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 69fb427..4318446 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -1142,7 +1142,7 @@ function system_ntp_configure() { /* foreach through servers and write out to ntpd.conf */ foreach (explode(' ', $syscfg['timeservers']) as $ts) - fwrite($fd, sprintf(gettext("servers %s%s"), $ts, "\n")); + fwrite($fd, sprintf(gettext("servers %s\n"), $ts)); /* Setup listener(s) if the user has configured one */ if ($config['installedpackages']['openntpd']) { |
