summaryrefslogtreecommitdiffstats
path: root/src/etc/inc/util.inc
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-12-16 16:33:17 -0200
committerRenato Botelho <renato@netgate.com>2016-12-16 16:33:17 -0200
commit2a3d27a6a5e843cccf2599e6c0ea9cfd5d709d9b (patch)
tree70770b4ff018f3303c69fdd6dd92dcb4be700f7d /src/etc/inc/util.inc
parent4a725adc6eb9bb73db282f33c51455b603a7806a (diff)
parentbb9747b2443902d12c894dfa390089b184d244d6 (diff)
downloadpfsense-2a3d27a6a5e843cccf2599e6c0ea9cfd5d709d9b.zip
pfsense-2a3d27a6a5e843cccf2599e6c0ea9cfd5d709d9b.tar.gz
Merge pull request #3281 from phil-davis/patch-7
Diffstat (limited to 'src/etc/inc/util.inc')
-rw-r--r--src/etc/inc/util.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc
index a309ce4..66b4a43 100644
--- a/src/etc/inc/util.inc
+++ b/src/etc/inc/util.inc
@@ -2490,11 +2490,11 @@ function validateipaddr(&$addr, $type, $label, &$err_msg, $alias=false) {
if (is_alias($addr)) {
return true;
} else {
- $err_msg[] = $label . gettext(" must be a valid IPv4 address or alias.");
+ $err_msg[] = sprintf(gettext("%s must be a valid IPv4 address or alias."), $label);
return false;
}
} else {
- $err_msg[] = $label . gettext(" must be a valid IPv4 address.");
+ $err_msg[] = sprintf(gettext("%s must be a valid IPv4 address."), $label);
return false;
}
break;
@@ -2506,11 +2506,11 @@ function validateipaddr(&$addr, $type, $label, &$err_msg, $alias=false) {
if (is_alias($addr)) {
return true;
} else {
- $err_msg[] = $label . gettext(" must be a valid IPv6 address or alias.");
+ $err_msg[] = sprintf(gettext("%s must be a valid IPv6 address or alias."), $label);
return false;
}
} else {
- $err_msg[] = $label . gettext(" must be a valid IPv6 address.");
+ $err_msg[] = sprintf(gettext("%s must be a valid IPv6 address."), $label);
return false;
}
break;
@@ -2524,11 +2524,11 @@ function validateipaddr(&$addr, $type, $label, &$err_msg, $alias=false) {
if (is_alias($addr)) {
return true;
} else {
- $err_msg[] = $label . gettext(" must be a valid IPv4 or IPv6 address or alias.");
+ $err_msg[] = sprintf(gettext("%s must be a valid IPv4 or IPv6 address or alias."), $label);
return false;
}
} else {
- $err_msg[] = $label . gettext(" must be a valid IPv4 or IPv6 address.");
+ $err_msg[] = sprintf(gettext("%s must be a valid IPv4 or IPv6 address."), $label);
return false;
}
break;
OpenPOWER on IntegriCloud