diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2016-01-22 12:46:24 -0500 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2016-01-22 12:46:46 -0500 |
commit | 55cbefffb13de26c0e47fb396962b66bc8cd70ff (patch) | |
tree | fe3d2483e168c74fba85b8e467caef26b58c6dfd | |
parent | 7a2490e19246689b8c658f2bdef2899412deb182 (diff) | |
download | pfsense-55cbefffb13de26c0e47fb396962b66bc8cd70ff.zip pfsense-55cbefffb13de26c0e47fb396962b66bc8cd70ff.tar.gz |
Restore code from bad merge
-rw-r--r-- | src/usr/local/www/guiconfig.inc | 6 | ||||
-rw-r--r-- | src/usr/local/www/vpn_ipsec_mobile.php | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc index af97879..9978f6f 100644 --- a/src/usr/local/www/guiconfig.inc +++ b/src/usr/local/www/guiconfig.inc @@ -91,6 +91,12 @@ $navlevelsep = ": "; /* navigation level separator string */ $mandfldhtml = ""; /* display this before mandatory input fields */ $mandfldhtmlspc = ""; /* same as above, but with spacing */ +if (!function_exists('set_language')) { + require_once("pfsense-utils.inc"); +} + +set_language(); + /* Some ajax scripts still need access to GUI */ if (!$ignorefirmwarelock) { if (is_subsystem_dirty('firmwarelock')) { diff --git a/src/usr/local/www/vpn_ipsec_mobile.php b/src/usr/local/www/vpn_ipsec_mobile.php index bb3af4b..f77db44 100644 --- a/src/usr/local/www/vpn_ipsec_mobile.php +++ b/src/usr/local/www/vpn_ipsec_mobile.php @@ -445,8 +445,9 @@ foreach ($a_phase1 as $ph1ent) { } } if ($pconfig['enable'] && !$ph1found) { - print_info_box_np(gettext("Support for IPsec Mobile clients is enabled but a Phase1 definition was not found") . ".<br />" . gettext("Please click Create to define one."), gettext("create"), gettext("Create Phase1")); + print_info_box_np(gettext("Support for IPsec Mobile clients is enabled but a Phase1 definition was not found") . ".<br />" . gettext("Please click Create to define one."), gettext("create"), gettext("Create Phase1"), true); } + if ($input_errors) { print_input_errors($input_errors); } |