From 464358b439be13af8850cb0935a4b062a16df4f8 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Wed, 27 Jan 2016 10:17:17 +0545 Subject: Standardize print_apply_box usage 1) For the translators, it should be better to do it consistently. Then they only need to have 1 translation of "You must apply the changes in order for them to take effect" and can translate each of the other custom sentences individually. 2) The full-stop should always go at the end of the sentence, inside the gettext(). There are some languages where the full-stop is not the same as European. e.g. In Nepal we use the vertical bar for end of sentence. --- src/usr/local/www/firewall_shaper.php | 2 +- src/usr/local/www/firewall_shaper_queues.php | 2 +- src/usr/local/www/firewall_shaper_vinterface.php | 2 +- src/usr/local/www/interfaces_assign.php | 2 +- src/usr/local/www/load_balancer_monitor.php | 2 +- src/usr/local/www/load_balancer_pool.php | 2 +- src/usr/local/www/load_balancer_setting.php | 2 +- src/usr/local/www/load_balancer_virtual_server.php | 2 +- src/usr/local/www/services_captiveportal_mac.php | 2 +- src/usr/local/www/services_captiveportal_zones.php | 2 +- src/usr/local/www/services_dhcp.php | 2 +- src/usr/local/www/services_dhcpv6.php | 2 +- src/usr/local/www/services_dnsmasq.php | 2 +- src/usr/local/www/services_igmpproxy.php | 2 +- src/usr/local/www/services_pppoe.php | 2 +- src/usr/local/www/services_unbound.php | 2 +- src/usr/local/www/services_unbound_acls.php | 2 +- src/usr/local/www/services_unbound_advanced.php | 2 +- src/usr/local/www/status_lb_pool.php | 2 +- src/usr/local/www/system_advanced_sysctl.php | 2 +- src/usr/local/www/system_gateway_groups.php | 2 +- src/usr/local/www/vpn_ipsec.php | 2 +- src/usr/local/www/vpn_ipsec_keys.php | 2 +- src/usr/local/www/vpn_ipsec_mobile.php | 2 +- src/usr/local/www/vpn_l2tp_users.php | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) (limited to 'src/usr') diff --git a/src/usr/local/www/firewall_shaper.php b/src/usr/local/www/firewall_shaper.php index 1ac8c2d..837d200 100644 --- a/src/usr/local/www/firewall_shaper.php +++ b/src/usr/local/www/firewall_shaper.php @@ -430,7 +430,7 @@ if ($savemsg) { } if (is_subsystem_dirty('shaper')) { - print_apply_box(gettext("The traffic shaper configuration has been changed. You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The traffic shaper configuration has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect.")); } $tab_array = array(); diff --git a/src/usr/local/www/firewall_shaper_queues.php b/src/usr/local/www/firewall_shaper_queues.php index 6586104..9e751c9 100644 --- a/src/usr/local/www/firewall_shaper_queues.php +++ b/src/usr/local/www/firewall_shaper_queues.php @@ -236,7 +236,7 @@ if ($savemsg) { } if (is_subsystem_dirty('shaper')) { - print_apply_box(gettext("The traffic shaper configuration has been changed. You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The traffic shaper configuration has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect.")); } $tab_array = array(); diff --git a/src/usr/local/www/firewall_shaper_vinterface.php b/src/usr/local/www/firewall_shaper_vinterface.php index 35a366f..ccea421 100644 --- a/src/usr/local/www/firewall_shaper_vinterface.php +++ b/src/usr/local/www/firewall_shaper_vinterface.php @@ -408,7 +408,7 @@ if ($savemsg) { } if (is_subsystem_dirty('shaper')) { - print_apply_box(gettext("The traffic shaper configuration has been changed. You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The traffic shaper configuration has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect.")); } $tab_array = array(); diff --git a/src/usr/local/www/interfaces_assign.php b/src/usr/local/www/interfaces_assign.php index 06e5b15..3c17dbe 100644 --- a/src/usr/local/www/interfaces_assign.php +++ b/src/usr/local/www/interfaces_assign.php @@ -502,7 +502,7 @@ if (file_exists("/var/run/interface_mismatch_reboot_needed")) { if (file_exists("/tmp/reload_interfaces")) { echo "

\n"; - print_apply_box(gettext("The interface configuration has been changed.
You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The interface configuration has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect.")); echo "

\n"; } elseif ($savemsg) { print_info_box($savemsg, $class); diff --git a/src/usr/local/www/load_balancer_monitor.php b/src/usr/local/www/load_balancer_monitor.php index 5f53839..bdcfac8 100644 --- a/src/usr/local/www/load_balancer_monitor.php +++ b/src/usr/local/www/load_balancer_monitor.php @@ -118,7 +118,7 @@ if ($savemsg) { } if (is_subsystem_dirty('loadbalancer')) { - print_apply_box(gettext("The load balancer configuration has been changed") . ".
" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The load balancer configuration has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect.")); } /* active tabs */ diff --git a/src/usr/local/www/load_balancer_pool.php b/src/usr/local/www/load_balancer_pool.php index be52079..183775a 100644 --- a/src/usr/local/www/load_balancer_pool.php +++ b/src/usr/local/www/load_balancer_pool.php @@ -132,7 +132,7 @@ if ($savemsg) { } if (is_subsystem_dirty('loadbalancer')) { - print_apply_box(sprintf(gettext("The load balancer configuration has been changed%sYou must apply the changes in order for them to take effect."), "
")); + print_apply_box(gettext("The load balancer configuration has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect.")); } /* active tabs */ diff --git a/src/usr/local/www/load_balancer_setting.php b/src/usr/local/www/load_balancer_setting.php index 9f4bdbf..fe63c7d 100644 --- a/src/usr/local/www/load_balancer_setting.php +++ b/src/usr/local/www/load_balancer_setting.php @@ -131,7 +131,7 @@ if ($savemsg) { } if (is_subsystem_dirty('loadbalancer')) { - print_apply_box(gettext("The load balancer configuration has been changed") . ' ' . + print_apply_box(gettext("The load balancer configuration has been changed.") . ' ' . gettext("You must apply the changes in order for them to take effect.")); } diff --git a/src/usr/local/www/load_balancer_virtual_server.php b/src/usr/local/www/load_balancer_virtual_server.php index ba47ea5..b361106 100644 --- a/src/usr/local/www/load_balancer_virtual_server.php +++ b/src/usr/local/www/load_balancer_virtual_server.php @@ -132,7 +132,7 @@ if ($savemsg) { } if (is_subsystem_dirty('loadbalancer')) { - print_apply_box(gettext("The virtual server configuration has been changed") . ".
" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The virtual server configuration has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect.")); } /* active tabs */ diff --git a/src/usr/local/www/services_captiveportal_mac.php b/src/usr/local/www/services_captiveportal_mac.php index 7335208..b143190 100644 --- a/src/usr/local/www/services_captiveportal_mac.php +++ b/src/usr/local/www/services_captiveportal_mac.php @@ -189,7 +189,7 @@ if ($savemsg) { } if (is_subsystem_dirty('passthrumac')) { - print_apply_box(gettext("The captive portal MAC address configuration has been changed.
You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The captive portal MAC address configuration has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect.")); } $tab_array = array(); diff --git a/src/usr/local/www/services_captiveportal_zones.php b/src/usr/local/www/services_captiveportal_zones.php index 362df39..53e7b4d 100644 --- a/src/usr/local/www/services_captiveportal_zones.php +++ b/src/usr/local/www/services_captiveportal_zones.php @@ -99,7 +99,7 @@ if ($savemsg) { } if (is_subsystem_dirty('captiveportal')) { - print_apply_box(gettext("The Captive Portal entry list has been changed") . ".
" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The Captive Portal entry list has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect.")); } ?>
diff --git a/src/usr/local/www/services_dhcp.php b/src/usr/local/www/services_dhcp.php index 8a84a84..682467d 100644 --- a/src/usr/local/www/services_dhcp.php +++ b/src/usr/local/www/services_dhcp.php @@ -715,7 +715,7 @@ if (isset($config['dhcrelay']['enable'])) { } if (is_subsystem_dirty('staticmaps')) { - print_apply_box(gettext("The static mapping configuration has been changed") . ".
" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The static mapping configuration has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect.")); } /* active tabs */ diff --git a/src/usr/local/www/services_dhcpv6.php b/src/usr/local/www/services_dhcpv6.php index 471ea4a..6d2a2c88 100644 --- a/src/usr/local/www/services_dhcpv6.php +++ b/src/usr/local/www/services_dhcpv6.php @@ -456,7 +456,7 @@ if ($dhcrelay_enabled) { } if (is_subsystem_dirty('staticmaps')) { - print_apply_box(gettext('The static mapping configuration has been changed') . '.
' . gettext('You must apply the changes in order for them to take effect.')); + print_apply_box(gettext('The static mapping configuration has been changed.') . '
' . gettext('You must apply the changes in order for them to take effect.')); } /* active tabs */ diff --git a/src/usr/local/www/services_dnsmasq.php b/src/usr/local/www/services_dnsmasq.php index dffc67f..9cdae22 100644 --- a/src/usr/local/www/services_dnsmasq.php +++ b/src/usr/local/www/services_dnsmasq.php @@ -225,7 +225,7 @@ if ($savemsg) { } if (is_subsystem_dirty('hosts')) { - print_apply_box(gettext("The DNS forwarder configuration has been changed") . ".
" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The DNS forwarder configuration has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect.")); } $form = new Form(); diff --git a/src/usr/local/www/services_igmpproxy.php b/src/usr/local/www/services_igmpproxy.php index 420d963..d4ecd60 100644 --- a/src/usr/local/www/services_igmpproxy.php +++ b/src/usr/local/www/services_igmpproxy.php @@ -106,7 +106,7 @@ if ($savemsg) { } if (is_subsystem_dirty('igmpproxy')) { - print_apply_box(gettext('The IGMP entry list has been changed.' . '
' . 'You must apply the changes in order for them to take effect.')); + print_apply_box(gettext('The IGMP entry list has been changed.') . '
' . gettext('You must apply the changes in order for them to take effect.'))); } ?> diff --git a/src/usr/local/www/services_pppoe.php b/src/usr/local/www/services_pppoe.php index ecf807a..bdd4be7 100644 --- a/src/usr/local/www/services_pppoe.php +++ b/src/usr/local/www/services_pppoe.php @@ -122,7 +122,7 @@ if ($savemsg) { } if (is_subsystem_dirty('vpnpppoe')) { - print_apply_box(gettext('The PPPoE entry list has been changed') . '.
' . gettext('You must apply the changes in order for them to take effect.')); + print_apply_box(gettext('The PPPoE entry list has been changed.') . '
' . gettext('You must apply the changes in order for them to take effect.')); } ?> diff --git a/src/usr/local/www/services_unbound.php b/src/usr/local/www/services_unbound.php index c352875..1f882fc 100644 --- a/src/usr/local/www/services_unbound.php +++ b/src/usr/local/www/services_unbound.php @@ -262,7 +262,7 @@ if ($savemsg) { } if (is_subsystem_dirty('unbound')) { - print_apply_box(gettext("The configuration of the DNS Resolver has been changed. You must apply changes for them to take effect.")); + print_apply_box(gettext("The DNS Resolver configuration has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect.")); } $tab_array = array(); diff --git a/src/usr/local/www/services_unbound_acls.php b/src/usr/local/www/services_unbound_acls.php index abb3471..1c94824 100644 --- a/src/usr/local/www/services_unbound_acls.php +++ b/src/usr/local/www/services_unbound_acls.php @@ -218,7 +218,7 @@ if ($savemsg) { } if (is_subsystem_dirty('unbound')) { - print_apply_box(gettext("The configuration of the DNS Resolver, has been changed") . ".
" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The DNS Resolver configuration has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect.")); } $tab_array = array(); diff --git a/src/usr/local/www/services_unbound_advanced.php b/src/usr/local/www/services_unbound_advanced.php index d0c5ea2..60c117f 100644 --- a/src/usr/local/www/services_unbound_advanced.php +++ b/src/usr/local/www/services_unbound_advanced.php @@ -231,7 +231,7 @@ if ($savemsg) { } if (is_subsystem_dirty('unbound')) { - print_apply_box(gettext("The configuration of the DNS Resolver has been changed. You must apply changes for them to take effect.")); + print_apply_box(gettext("The DNS Resolver configuration has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect.")); } $tab_array = array(); diff --git a/src/usr/local/www/status_lb_pool.php b/src/usr/local/www/status_lb_pool.php index 0b93843..57d320c 100644 --- a/src/usr/local/www/status_lb_pool.php +++ b/src/usr/local/www/status_lb_pool.php @@ -145,7 +145,7 @@ if ($_POST) { } if (is_subsystem_dirty('loadbalancer')) { - print_apply_box(gettext('The load balancer configuration has been changed. You must apply the changes in order for them to take effect.')); + print_apply_box(gettext("The load balancer configuration has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect.")); } /* active tabs */ diff --git a/src/usr/local/www/system_advanced_sysctl.php b/src/usr/local/www/system_advanced_sysctl.php index 28b7fc1..d1c38e0 100644 --- a/src/usr/local/www/system_advanced_sysctl.php +++ b/src/usr/local/www/system_advanced_sysctl.php @@ -175,7 +175,7 @@ if ($savemsg) { } if (is_subsystem_dirty('sysctl') && ($act != "edit" )) { - print_apply_box(gettext("The firewall tunables have changed. You must apply the configuration for them to take affect.")); + print_apply_box(gettext("The firewall tunables have changed.") . "
" . gettext("You must apply the changes in order for them to take effect.")); } $tab_array = array(); diff --git a/src/usr/local/www/system_gateway_groups.php b/src/usr/local/www/system_gateway_groups.php index b1b82a2..aa69a84 100644 --- a/src/usr/local/www/system_gateway_groups.php +++ b/src/usr/local/www/system_gateway_groups.php @@ -131,7 +131,7 @@ if ($savemsg) { } if (is_subsystem_dirty('staticroutes')) { - print_apply_box(sprintf(gettext("The gateway configuration has been changed.%sYou must apply the changes in order for them to take effect."), "
")); + print_apply_box(gettext("The gateway configuration has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect.")); } $tab_array = array(); diff --git a/src/usr/local/www/vpn_ipsec.php b/src/usr/local/www/vpn_ipsec.php index 0cc4620..d991896 100644 --- a/src/usr/local/www/vpn_ipsec.php +++ b/src/usr/local/www/vpn_ipsec.php @@ -268,7 +268,7 @@ display_top_tabs($tab_array); } if (is_subsystem_dirty('ipsec')) { - print_apply_box(gettext("The IPsec tunnel configuration has been changed") . ".
" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The IPsec tunnel configuration has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect.")); } ?> diff --git a/src/usr/local/www/vpn_ipsec_keys.php b/src/usr/local/www/vpn_ipsec_keys.php index 004f274..78dd1d0 100644 --- a/src/usr/local/www/vpn_ipsec_keys.php +++ b/src/usr/local/www/vpn_ipsec_keys.php @@ -115,7 +115,7 @@ if ($savemsg) { } if (is_subsystem_dirty('ipsec')) { - print_apply_box(gettext("The IPsec tunnel configuration has been changed") . ".
" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The IPsec tunnel configuration has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect.")); } ?> diff --git a/src/usr/local/www/vpn_ipsec_mobile.php b/src/usr/local/www/vpn_ipsec_mobile.php index 869cf6e..21e365a 100644 --- a/src/usr/local/www/vpn_ipsec_mobile.php +++ b/src/usr/local/www/vpn_ipsec_mobile.php @@ -437,7 +437,7 @@ if ($savemsg) { print_info_box($savemsg, 'success'); } if (is_subsystem_dirty('ipsec')) { - print_apply_box(gettext("The IPsec tunnel configuration has been changed") . ".
" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The IPsec tunnel configuration has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect.")); } foreach ($a_phase1 as $ph1ent) { if (isset($ph1ent['mobile'])) { diff --git a/src/usr/local/www/vpn_l2tp_users.php b/src/usr/local/www/vpn_l2tp_users.php index 5191e16..a5c5a0e 100644 --- a/src/usr/local/www/vpn_l2tp_users.php +++ b/src/usr/local/www/vpn_l2tp_users.php @@ -110,7 +110,7 @@ if (isset($config['l2tp']['radius']['enable'])) { } if (is_subsystem_dirty('l2tpusers')) { - print_apply_box(gettext("The l2tp user list has been modified") . ".
" . gettext("You must apply the changes in order for them to take effect") . ".
" . gettext("Warning: this will terminate all current l2tp sessions!") . ""); + print_apply_box(gettext("The l2tp user list has been modified.") . "
" . gettext("You must apply the changes in order for them to take effect") . ".
" . gettext("Warning: this will terminate all current l2tp sessions!") . ""); } -- cgit v1.1