makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge PR #954 branch 'dhruvgoel92/ticket/11032' into develop

Browse source 
* dhruvgoel92/ticket/11032:
  [ticket/11032] fix language of error displayed
This commit is contained in:
Oleg Pudeyev 2012-08-18 22:26:58 -04:00
commit 89d334ee6a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/search/fulltext_sphinx.php
View file

@ -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'));
}
}

4
phpBB/language/en/search.php
View file

@ -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.',