mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2819 from NOYB/Services_/_Load_Balancer_-_Remove_Personalizations

Browse Source 
(cherry picked from commit 6d105e8d5d)
This commit is contained in:
Stephen Beaver 2016-04-04 09:29:51 -04:00
parent 152d81c244
commit 718694129c
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/usr/local/www/load_balancer_monitor.php
View File

@ -118,7 +118,7 @@ if ($savemsg) {
}
if (is_subsystem_dirty('loadbalancer')) {
print_apply_box(gettext("The load balancer configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));
print_apply_box(gettext("The load balancer configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect."));
}
/* active tabs */

2
src/usr/local/www/load_balancer_monitor_edit.php
View File

@ -127,7 +127,7 @@ if ($_POST) {
}
if (preg_match('/[ \/]/', $_POST['name'])) {
$input_errors[] = gettext("You cannot use spaces or slashes in the 'name' field.");
$input_errors[] = gettext("Spaces or slashes cannot be used in the 'name' field.");
}
if (strlen($_POST['name']) > 16) {

2
src/usr/local/www/load_balancer_pool.php
View File

@ -132,7 +132,7 @@ if ($savemsg) {
}
if (is_subsystem_dirty('loadbalancer')) {
print_apply_box(gettext("The load balancer configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));
print_apply_box(gettext("The load balancer configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect."));
}
/* active tabs */

6
src/usr/local/www/load_balancer_pool_edit.php
View File

@ -116,7 +116,7 @@ if ($_POST) {
}
if (preg_match('/[ \/]/', $_POST['name'])) {
$input_errors[] = gettext("You cannot use spaces or slashes in the 'name' field.");
$input_errors[] = gettext("Spaces or slashes cannot be used in the 'name' field.");
}
if (strlen($_POST['name']) > 16) {
@ -361,7 +361,7 @@ $section->addInput(new Form_Input(
'Port',
'text',
$pconfig['port']
))->setHelp('This is the port your servers are listening on. You may also specify a port alias listed in Firewall -> Aliases here.');
))->setHelp('This is the port the servers are listening on. A port alias listed in Firewall -> Aliases may also be specified here.');
$section->addInput(new Form_Input(
'retry',
@ -391,7 +391,7 @@ if (count($config['load_balancer']['monitor_type'])) {
} else {
$section->addInput(new Form_StaticText(
'Monitor',
'Please add a monitor IP address on the monitors tab if you wish to use this feature."'
'Please add a monitor IP address on the monitors tab to use this feature."'
));
}

2
src/usr/local/www/load_balancer_setting.php
View File

@ -131,7 +131,7 @@ if ($savemsg) {
}
if (is_subsystem_dirty('loadbalancer')) {
print_apply_box(gettext("The load balancer configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));
print_apply_box(gettext("The load balancer configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect."));
}
/* active tabs */

2
src/usr/local/www/load_balancer_virtual_server.php
View File

@ -132,7 +132,7 @@ if ($savemsg) {
}
if (is_subsystem_dirty('loadbalancer')) {
print_apply_box(gettext("The virtual server configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));
print_apply_box(gettext("The virtual server configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect."));
}
/* active tabs */

12
src/usr/local/www/load_balancer_virtual_server_edit.php
View File

@ -120,7 +120,7 @@ if ($_POST) {
}
if (preg_match('/[ \/]/', $_POST['name'])) {
$input_errors[] = gettext("You cannot use spaces or slashes in the 'name' field.");
$input_errors[] = gettext("Spaces or slashes cannot be used in the 'name' field.");
}
if (strlen($_POST['name']) > 32) {
@ -142,7 +142,7 @@ if ($_POST) {
}
if ((strtolower($_POST['relay_protocol']) == "dns") && !empty($_POST['sitedown'])) {
$input_errors[] = gettext("You cannot select a Fall Back Pool when using the DNS relay protocol.");
$input_errors[] = gettext("A Fall Back Pool cannot be selected when using the DNS relay protocol.");
}
if (!$input_errors) {
@ -222,9 +222,9 @@ $section->addInput(new Form_IpAddress(
'ipaddr',
'IP Address',
$pconfig['ipaddr']
))->setHelp('This is normally the WAN IP address that you would like the server to listen on. ' .
))->setHelp('This is normally the WAN IP address for the server to listen on. ' .
'All connections to this IP and port will be forwarded to the pool cluster. ' .
'You may also specify a host alias listed in Firewall -&gt; Aliases here.');
'A host alias listed in Firewall -&gt; Aliases may also be specified here.');
$section->addInput(new Form_Input(
'port',
@ -233,7 +233,7 @@ $section->addInput(new Form_Input(
$pconfig['port']
))->setHelp('Port that the clients will connect to. All connections to this port will be forwarded to the pool cluster. ' .
'If left blank listening ports from the pool will be used.' .
'You may also specify a port alias listed in Firewall -&gt; Aliases here.');
'A port alias listed in Firewall -&gt; Aliases may also be specified here.');
if (count($config['load_balancer']['lbpool']) == 0) {
$section->addInput(new Form_StaticText(
@ -301,7 +301,7 @@ if (isset($id) && $a_vs[$id] && $_GET['act'] != 'dup') {
$form->add($section);
print($form);
print_info_box(gettext('Don\'t forget to add a firewall rule for the virtual server/pool after you have finished setting it up.'));
print_info_box(gettext('Don\'t forget to add a firewall rule for the virtual server/pool after finished setting it up.'));
?>
<script type="text/javascript">
//<![CDATA[