aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRubén Calvo <rubencm@gmail.com>2018-07-25 14:04:24 +0200
committerMarc Alexander <admin@m-a-styles.de>2018-07-30 11:20:42 +0200
commita6a3899aead9641bc85fc4da7af92cc92fb914ae (patch)
tree97a49b2d622ea4df050471a1340cd52b7cce72d8
parentc72d4437382b5d01a51c157a64df49778a86e5b6 (diff)
downloadforums-a6a3899aead9641bc85fc4da7af92cc92fb914ae.tar
forums-a6a3899aead9641bc85fc4da7af92cc92fb914ae.tar.gz
forums-a6a3899aead9641bc85fc4da7af92cc92fb914ae.tar.bz2
forums-a6a3899aead9641bc85fc4da7af92cc92fb914ae.tar.xz
forums-a6a3899aead9641bc85fc4da7af92cc92fb914ae.zip
[ticket/15731] Fix language string parameters
PHPBB3-15731
-rw-r--r--phpBB/includes/acp/acp_search.php2
-rw-r--r--phpBB/language/en/acp/search.php5
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 . '&amp;action=delete&amp;skip_rows=' . $post_counter . '&amp;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.',