diff options
| author | Stephen Beaver <sbeaver@netgate.com> | 2015-12-16 11:25:37 -0500 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2015-12-16 11:25:37 -0500 |
| commit | e84865c8c5d72b44000aee8c1c3cf97c22686f9d (patch) | |
| tree | f4297caea6dd8b0facfc6e7cb89f4ce695abf5cd | |
| parent | 8937d77d583bf6e19b316f075ed4e09c4ab2544c (diff) | |
| parent | ca28fdd1a649c3b51ceb8b3c361c291e8c8524be (diff) | |
| download | pfsense-e84865c8c5d72b44000aee8c1c3cf97c22686f9d.zip pfsense-e84865c8c5d72b44000aee8c1c3cf97c22686f9d.tar.gz | |
Merge pull request #2249 from phil-davis/patch-2
| -rw-r--r-- | src/etc/inc/pfsense-utils.inc | 1 | ||||
| -rw-r--r-- | src/usr/local/www/services_captiveportal.php | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc index 41b5c7d..3a042a9 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -2737,7 +2737,6 @@ function pfSense_handle_custom_code($src_dir) { } function set_language($lang = 'en_US', $encoding = "UTF-8") { - putenv("LANG={$lang}.{$encoding}"); setlocale(LC_ALL, "{$lang}.{$encoding}"); textdomain("pfSense"); bindtextdomain("pfSense", "/usr/local/share/locale"); diff --git a/src/usr/local/www/services_captiveportal.php b/src/usr/local/www/services_captiveportal.php index ab5cddf..640e6bd 100644 --- a/src/usr/local/www/services_captiveportal.php +++ b/src/usr/local/www/services_captiveportal.php @@ -703,7 +703,7 @@ $section->addInput(new Form_Input( $section->addInput(new Form_Input( 'bwdefaultup', - 'Default download (Kbit/s)', + 'Default upload (Kbit/s)', 'number', $pconfig['bwdefaultup'] ))->setHelp('If this option is set, the captive portal will restrict each user who logs in to the specified default bandwidth. ' . @@ -1118,7 +1118,7 @@ if ($pconfig['page']['errtext']) { $section->addInput(new Form_Button( 'btndownload', - 'Restore default portal page', + 'Restore default error page', '?zone=' . $cpzone . '&act=delerrhtml' ))->removeClass('btn-primary')->addClass('btn btn-danger btn-xs'); } @@ -1145,7 +1145,7 @@ if ($pconfig['page']['logouttext']) { $section->addInput(new Form_Button( 'btndownload', - 'Restore default portal page', + 'Restore default logout page', '?zone=' . $cpzone . '&act=dellogouthtml' ))->removeClass('btn-primary')->addClass('btn btn-danger btn-xs'); } |
