diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-16 23:26:09 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-16 23:26:09 +0200 |
| commit | 659c2e14b8eff6a899c141bbd3793e8ca3aca02a (patch) | |
| tree | 74d7618bd794eec2087f77a1bf742b988413c7de /phpBB | |
| parent | 7f3aebd495ce940fe263484345fa00661cfadd15 (diff) | |
| parent | 1f44b4da18622c526e89858f7f89df9857f3a00e (diff) | |
| download | forums-659c2e14b8eff6a899c141bbd3793e8ca3aca02a.tar forums-659c2e14b8eff6a899c141bbd3793e8ca3aca02a.tar.gz forums-659c2e14b8eff6a899c141bbd3793e8ca3aca02a.tar.bz2 forums-659c2e14b8eff6a899c141bbd3793e8ca3aca02a.tar.xz forums-659c2e14b8eff6a899c141bbd3793e8ca3aca02a.zip | |
Merge pull request #2243 from n-aleha/ticket/12345
[ticket/12345] Improve search flood interval message for ascraeus
* n-aleha/ticket/12345:
[ticket/12345] Improve search flood interval message for ascraeus
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/language/en/search.php | 5 | ||||
| -rw-r--r-- | phpBB/search.php | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php index f65022fbcb..13aa66514c 100644 --- a/phpBB/language/en/search.php +++ b/phpBB/language/en/search.php @@ -69,7 +69,10 @@ $lang = array_merge($lang, array( 'NO_RECENT_SEARCHES' => 'No searches have been carried out recently.', 'NO_SEARCH' => 'Sorry but you are not permitted to use the search system.', 'NO_SEARCH_RESULTS' => 'No suitable matches were found.', - 'NO_SEARCH_TIME' => 'Sorry but you cannot use search at this time. Please try again in a few minutes.', + 'NO_SEARCH_TIME' => array( + 1 => 'Sorry but you cannot use search at this time. Please try again in %d second.', + 2 => 'Sorry but you cannot use search at this time. Please try again in %d seconds.', + ), 'NO_SEARCH_UNREADS' => 'Sorry but searching for unread posts has been disabled on this board.', 'WORD_IN_NO_POST' => 'No posts were found because the word <strong>%s</strong> is not contained in any post.', 'WORDS_IN_NO_POST' => 'No posts were found because the words <strong>%s</strong> are not contained in any post.', diff --git a/phpBB/search.php b/phpBB/search.php index 44335e2927..fbb4e93089 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -108,7 +108,7 @@ if ($interval && !in_array($search_id, array('unreadposts', 'unanswered', 'activ if ($user->data['user_last_search'] > time() - $interval) { $template->assign_var('S_NO_SEARCH', true); - trigger_error('NO_SEARCH_TIME'); + trigger_error($user->lang('NO_SEARCH_TIME', (int) ($user->data['user_last_search'] + $interval - time()))); } } |