diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-16 16:11:38 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-16 16:11:38 +0200 |
| commit | d79d093d11d4efd6fb0d8b9af1f6c67644bcd74e (patch) | |
| tree | 3c8fa67d5726524588f85d866c3543162d393b9b | |
| parent | 29fb28b3ac0fa6534968c767b3952f94b49ea207 (diff) | |
| parent | bd6e27d9c5ad686fa8ca9a5e355e08b76fb0e8d1 (diff) | |
| download | forums-d79d093d11d4efd6fb0d8b9af1f6c67644bcd74e.tar forums-d79d093d11d4efd6fb0d8b9af1f6c67644bcd74e.tar.gz forums-d79d093d11d4efd6fb0d8b9af1f6c67644bcd74e.tar.bz2 forums-d79d093d11d4efd6fb0d8b9af1f6c67644bcd74e.tar.xz forums-d79d093d11d4efd6fb0d8b9af1f6c67644bcd74e.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10221] Append unit (seconds) after input field, remove from explanation
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/board.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index efc0fdc639..f27a133eb5 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -390,7 +390,7 @@ class acp_board 'chg_passforce' => array('lang' => 'FORCE_PASS_CHANGE', 'validate' => 'int:0', 'type' => 'text:3:3', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']), 'max_login_attempts' => array('lang' => 'MAX_LOGIN_ATTEMPTS', 'validate' => 'int:0', 'type' => 'text:3:3', 'explain' => true), 'ip_login_limit_max' => array('lang' => 'IP_LOGIN_LIMIT_MAX', 'validate' => 'int:0', 'type' => 'text:3:3', 'explain' => true), - 'ip_login_limit_time' => array('lang' => 'IP_LOGIN_LIMIT_TIME', 'validate' => 'int:0', 'type' => 'text:5:5', 'explain' => true), + 'ip_login_limit_time' => array('lang' => 'IP_LOGIN_LIMIT_TIME', 'validate' => 'int:0', 'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']), 'ip_login_limit_use_forwarded' => array('lang' => 'IP_LOGIN_LIMIT_USE_FORWARDED', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'tpl_allow_php' => array('lang' => 'TPL_ALLOW_PHP', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'form_token_lifetime' => array('lang' => 'FORM_TIME_MAX', 'validate' => 'int:-1', 'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']), diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index a23baab1f4..ede66fd9bd 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -468,7 +468,7 @@ $lang = array_merge($lang, array( 'IP_LOGIN_LIMIT_MAX' => 'Maximum number of login attempts per IP address', 'IP_LOGIN_LIMIT_MAX_EXPLAIN' => 'The threshold of login attempts allowed from a single IP address before an anti-spambot task is triggered. Enter 0 to prevent the anti-spambot task from being triggered by IP addresses.', 'IP_LOGIN_LIMIT_TIME' => 'IP address login attempt expiration time', - 'IP_LOGIN_LIMIT_TIME_EXPLAIN' => 'Login attempts expire after this period, in seconds.', + 'IP_LOGIN_LIMIT_TIME_EXPLAIN' => 'Login attempts expire after this period.', 'IP_LOGIN_LIMIT_USE_FORWARDED' => 'Limit login attempts by <var>X_FORWARDED_FOR</var> header', 'IP_LOGIN_LIMIT_USE_FORWARDED_EXPLAIN' => 'Instead of limiting login attempts by IP address they are limited by <var>X_FORWARDED_FOR</var> values. <br /><em><strong>Warning:</strong> Only enable this if you are operating a proxy server that sets <var>X_FORWARDED_FOR</var> to trustworthy values.</em>', 'MAX_LOGIN_ATTEMPTS' => 'Maximum number of login attempts per username', |