diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-08-18 22:26:58 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-08-18 22:26:58 -0400 |
| commit | 89d334ee6af75d0f30f6e5d5cbca1e1a3980ad91 (patch) | |
| tree | ca2824fe9a4edbcb7b2a7de6289782b01008672d | |
| parent | d07cb6d778c264cbd1441438f2ea77ae6cc76126 (diff) | |
| parent | d4f1e71d5eca1204880de3199245e0167ac7f3f6 (diff) | |
| download | forums-89d334ee6af75d0f30f6e5d5cbca1e1a3980ad91.tar forums-89d334ee6af75d0f30f6e5d5cbca1e1a3980ad91.tar.gz forums-89d334ee6af75d0f30f6e5d5cbca1e1a3980ad91.tar.bz2 forums-89d334ee6af75d0f30f6e5d5cbca1e1a3980ad91.tar.xz forums-89d334ee6af75d0f30f6e5d5cbca1e1a3980ad91.zip | |
Merge PR #954 branch 'dhruvgoel92/ticket/11032' into develop
* dhruvgoel92/ticket/11032:
[ticket/11032] fix language of error displayed
| -rw-r--r-- | phpBB/includes/search/fulltext_sphinx.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/search.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php index 1a3bbe23db..288c0b5940 100644 --- a/phpBB/includes/search/fulltext_sphinx.php +++ b/phpBB/includes/search/fulltext_sphinx.php @@ -500,7 +500,7 @@ class phpbb_search_fulltext_sphinx } else { - trigger_error($this->user->lang('SPHINX_SEARCH_FAILED', $this->user->lang('SPHINX_SEARCH_ERROR_LOG'))); + trigger_error($this->user->lang('SPHINX_SEARCH_FAILED_LOG')); } } diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php index 5eea6044bc..71cbec4b41 100644 --- a/phpBB/language/en/search.php +++ b/phpBB/language/en/search.php @@ -105,8 +105,8 @@ $lang = array_merge($lang, array( 'SORT_FORUM' => 'Forum', 'SORT_POST_SUBJECT' => 'Post subject', 'SORT_TIME' => 'Post time', - 'SPHINX_SEARCH_FAILED' => 'Search failed. %s', - 'SPHINX_SEARCH_ERROR_LOG' => 'The error information has been logged.', + 'SPHINX_SEARCH_FAILED' => 'Search failed: %s', + 'SPHINX_SEARCH_FAILED_LOG' => 'Sorry, search could not be performed. More information about this failure has been logged in the error log.', 'TOO_FEW_AUTHOR_CHARS' => array( 1 => 'You must specify at least %d character of the authors name.', |