diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-07-30 13:45:50 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-07-30 13:45:50 +0200 |
| commit | 2bac84c51f8bbe88215c6c1bb2b23f954addc022 (patch) | |
| tree | b7a46a0085bc7147f25a9ee1b9d2d05504b539aa | |
| parent | 04899d1efd261493111e309600531d363b73bc46 (diff) | |
| parent | 0e4a38956afd420627466b705068ccc6d1ff63ea (diff) | |
| download | forums-2bac84c51f8bbe88215c6c1bb2b23f954addc022.tar forums-2bac84c51f8bbe88215c6c1bb2b23f954addc022.tar.gz forums-2bac84c51f8bbe88215c6c1bb2b23f954addc022.tar.bz2 forums-2bac84c51f8bbe88215c6c1bb2b23f954addc022.tar.xz forums-2bac84c51f8bbe88215c6c1bb2b23f954addc022.zip | |
Merge branch 'prep-release-3.2.3' into 3.2.x
| -rw-r--r-- | phpBB/includes/acp/acp_search.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/search.php | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index 8cad7c927c..538a28a926 100644 --- a/phpBB/includes/acp/acp_search.php +++ b/phpBB/includes/acp/acp_search.php @@ -349,7 +349,7 @@ class acp_search $totaltime = microtime(true) - $starttime; $rows_per_second = $row_count / $totaltime; meta_refresh(1, append_sid($this->u_action . '&action=delete&skip_rows=' . $post_counter . '&hash=' . generate_link_hash('acp_search'))); - trigger_error($user->lang('SEARCH_INDEX_DELETE_REDIRECT', (int) $row_count, $post_counter, $rows_per_second)); + trigger_error($user->lang('SEARCH_INDEX_DELETE_REDIRECT', (int) $row_count, $post_counter) . $user->lang('SEARCH_INDEX_DELETE_REDIRECT_RATE', $rows_per_second)); } } diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php index c52b71c121..443dbb7fb7 100644 --- a/phpBB/language/en/acp/search.php +++ b/phpBB/language/en/acp/search.php @@ -116,7 +116,10 @@ $lang = array_merge($lang, array( 2 => 'The current rate of indexing is approximately %1$.1f posts per second.<br />Indexing in progress…', ), 'SEARCH_INDEX_DELETE_REDIRECT' => array( - 2 => 'All posts up to post id %2$d have been removed from the search index.<br />Deleting in progress…', + 2 => 'All posts up to post id %2$d have been removed from the search index, of which %1$d posts were within this step.<br />', + ), + 'SEARCH_INDEX_DELETE_REDIRECT_RATE' => array( + 2 => 'The current rate of deleting is approximately %1$.1f posts per second.<br />Deleting in progress…', ), 'SEARCH_INDEX_CREATED' => 'Successfully indexed all posts in the board database.', 'SEARCH_INDEX_REMOVED' => 'Successfully deleted the search index for this backend.', |