diff options
| author | Phil Davis <phil.davis@inf.org> | 2016-12-16 08:57:12 +0545 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-16 08:57:12 +0545 |
| commit | bb9747b2443902d12c894dfa390089b184d244d6 (patch) | |
| tree | 9c5c0523347e674f75ab9f79b981d043283e8392 /src/etc/inc/util.inc | |
| parent | c393f1d1c3c2981dcf41f002b6edcc08aa6d5a65 (diff) | |
| download | pfsense-bb9747b2443902d12c894dfa390089b184d244d6.zip pfsense-bb9747b2443902d12c894dfa390089b184d244d6.tar.gz | |
validateipaddr enhance flexibility for translation
By using sprintf() we can allow for some language where the label text does not fit at the start of the sentence.
Diffstat (limited to 'src/etc/inc/util.inc')
| -rw-r--r-- | src/etc/inc/util.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc index 4213bc5..62aa652 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; |
