diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-07-07 16:19:53 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-07-07 16:19:53 -0400 |
| commit | 1526886e3ec2b475bb7f578767f6430dbfa58097 (patch) | |
| tree | e21dfc5b9eac9fd26b075bee1851efc47272d5e4 /phpBB/language | |
| parent | d9fd0cce0a5b323bff785af401e90370a3d73972 (diff) | |
| parent | 70a0caee28559bd1bd52b4ecf9d7d33acd732fe2 (diff) | |
| download | forums-1526886e3ec2b475bb7f578767f6430dbfa58097.tar forums-1526886e3ec2b475bb7f578767f6430dbfa58097.tar.gz forums-1526886e3ec2b475bb7f578767f6430dbfa58097.tar.bz2 forums-1526886e3ec2b475bb7f578767f6430dbfa58097.tar.xz forums-1526886e3ec2b475bb7f578767f6430dbfa58097.zip | |
Merge PR #832 branch 'dhruvgoel92/feature/postgresql-fulltext-search' into develop
* dhruvgoel92/feature/postgresql-fulltext-search: (28 commits)
[feature/postgresql-fulltext-search] supports_phrase_search function
[feature/postgresql-fulltext-search] use proper variable name
[feature/postgresql-fulltext-search] each config is checked if it is set
[feature/postgresql-fulltext-search] fix formatting
[feature/postgresql-fulltext-search] add docblocks to functions
[feature/postgresql-fulltext-search] remove phrase search code
[feature/postgresql-fulltext-search] define access control specifiers
[feature/postgresql-fulltext-search] use version_compare
[feature/postgresql-fulltext-search] fix language key
[feature/postgresql-fulltext-search] remove Readme
[feature/postgresql-fulltext-search] removes pcre check
[feature/postgresql-fulltext-search] fix language tsearch2 to text search
[feature/postgresql-fulltext-search] remove mbstring support
[feature/postgresql-fulltext-search] change language for pgsql < 8.3
[feature/postgresql-fulltext-search] use phpbb_pcre_utf8_support()
[feature/postgresql-fulltext-search] fix variable name
[feature/postgresql-fulltext-search] Fix version comparison for 9.0+.
[feature/postgresql-fulltext-search] fixing license
[feature/postgresql-fulltext-search] assign empty stats
[feature/postgresql-fulltext-search] remove backward compatibility
...
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/search.php | 12 | ||||
| -rw-r--r-- | phpBB/language/en/search.php | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php index 2f46856557..cd319c66a9 100644 --- a/phpBB/language/en/acp/search.php +++ b/phpBB/language/en/acp/search.php @@ -57,6 +57,18 @@ $lang = array_merge($lang, array( 'FULLTEXT_MYSQL_MIN_SEARCH_CHARS_EXPLAIN' => 'Words with at least this many characters will be indexed for searching. You or your host can only change this setting by changing the mysql configuration.', 'FULLTEXT_MYSQL_MAX_SEARCH_CHARS_EXPLAIN' => 'Words with no more than this many characters will be indexed for searching. You or your host can only change this setting by changing the mysql configuration.', + 'FULLTEXT_POSTGRES_INCOMPATIBLE_DATABASE' => 'The PostgreSQL fulltext backend can only be used with PostgreSQL.', + 'FULLTEXT_POSTGRES_TS_NOT_USABLE' => 'The PostgreSQL fulltext backend can only be used with PostgreSQL 8.3 and above.', + 'FULLTEXT_POSTGRES_TOTAL_POSTS' => 'Total number of indexed posts', + 'FULLTEXT_POSTGRES_VERSION_CHECK' => 'PostgreSQL version', + 'FULLTEXT_POSTGRES_TS_NAME' => 'Text search Configuration Profile:', + 'FULLTEXT_POSTGRES_MIN_WORD_LEN' => 'Minimum word length for keywords', + 'FULLTEXT_POSTGRES_MAX_WORD_LEN' => 'Maximum word length for keywords', + 'FULLTEXT_POSTGRES_VERSION_CHECK_EXPLAIN' => 'This search backend requires PostgreSQL version 8.3 and above.', + 'FULLTEXT_POSTGRES_TS_NAME_EXPLAIN' => 'The Text search configuration profile used to determine the parser and dictionary.', + 'FULLTEXT_POSTGRES_MIN_WORD_LEN_EXPLAIN' => 'Words with at least this many characters will be included in the query to the database.', + 'FULLTEXT_POSTGRES_MAX_WORD_LEN_EXPLAIN' => 'Words with no more than this many characters will be included in the query to the database.', + 'GENERAL_SEARCH_SETTINGS' => 'General search settings', 'GO_TO_SEARCH_INDEX' => 'Go to search index page', diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php index 5b6fdce0e7..2fbb5122ad 100644 --- a/phpBB/language/en/search.php +++ b/phpBB/language/en/search.php @@ -72,6 +72,7 @@ $lang = array_merge($lang, array( 'WORDS_IN_NO_POST' => 'No posts were found because the words <strong>%s</strong> are not contained in any post.', 'POST_CHARACTERS' => 'characters of posts', + 'PHRASE_SEARCH_DISABLED' => 'Searching by exact phrase is not supported on this board.', 'RECENT_SEARCHES' => 'Recent searches', 'RESULT_DAYS' => 'Limit results to previous', |