diff options
| author | Jakub Senko <jakubsenko@gmail.com> | 2014-09-08 23:14:33 +0200 |
|---|---|---|
| committer | Jakub Senko <jakubsenko@gmail.com> | 2014-09-08 23:14:33 +0200 |
| commit | 4b4a673d98a6708f98b111ec8c30f66b1d8a0e41 (patch) | |
| tree | 9b7176611a1b27c9d4b2f93bb83391cbc53b9542 /phpBB | |
| parent | dfbc2adc089818fba1c08d87c7fb491e2a2a04b6 (diff) | |
| download | forums-4b4a673d98a6708f98b111ec8c30f66b1d8a0e41.tar forums-4b4a673d98a6708f98b111ec8c30f66b1d8a0e41.tar.gz forums-4b4a673d98a6708f98b111ec8c30f66b1d8a0e41.tar.bz2 forums-4b4a673d98a6708f98b111ec8c30f66b1d8a0e41.tar.xz forums-4b4a673d98a6708f98b111ec8c30f66b1d8a0e41.zip | |
[ticket/13022] Language adjustments
PHPBB3-13022
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/language/en/search.php | 2 | ||||
| -rw-r--r-- | phpBB/search.php | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/jumpbox.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/message_body.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/search_results.html | 4 |
5 files changed, 5 insertions, 6 deletions
diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php index 7d5b400f82..ec5dd99eb8 100644 --- a/phpBB/language/en/search.php +++ b/phpBB/language/en/search.php @@ -86,7 +86,7 @@ $lang = array_merge($lang, array( 'RESULT_DAYS' => 'Limit results to previous', 'RESULT_SORT' => 'Sort results by', 'RETURN_FIRST' => 'Return first', - 'RETURN_TO_SEARCH_ADV' => 'Return to advanced search', + 'GO_TO_SEARCH_ADV' => 'Go to advanced search', 'SEARCHED_FOR' => 'Search term used', 'SEARCHED_TOPIC' => 'Searched topic', diff --git a/phpBB/search.php b/phpBB/search.php index 13f20fb72d..67f6f4dbb5 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -602,7 +602,6 @@ if ($keywords || $author || $author_id || $search_id || $submit) 'PHRASE_SEARCH_DISABLED' => $phrase_search_disabled, - 'REFERER_IS_SEARCH' => strpos($user->referer, "search.$phpEx") !== false, 'TOTAL_MATCHES' => $total_match_count, 'SEARCH_IN_RESULTS' => ($search_id) ? false : true, diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html index 44b479ab3f..3096d08318 100644 --- a/phpBB/styles/prosilver/template/jumpbox.html +++ b/phpBB/styles/prosilver/template/jumpbox.html @@ -6,7 +6,7 @@ <!-- ELSEIF SEARCH_TOPIC --> <p class="jumpbox-return"><a class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}" accesskey="r">{L_RETURN_TO_TOPIC}</a></p> <!-- ELSEIF S_SEARCH_ACTION --> - <p class="jumpbox-return"><a class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}" accesskey="r">{L_RETURN_TO_SEARCH_ADV}</a></p> + <p class="jumpbox-return"><a class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}" accesskey="r">{L_GO_TO_SEARCH_ADV}</a></p> <!-- ENDIF --> <!-- IF S_DISPLAY_JUMPBOX --> diff --git a/phpBB/styles/prosilver/template/message_body.html b/phpBB/styles/prosilver/template/message_body.html index 8062fed9a0..71eca203bc 100644 --- a/phpBB/styles/prosilver/template/message_body.html +++ b/phpBB/styles/prosilver/template/message_body.html @@ -8,7 +8,7 @@ <div class="inner"> <h2 class="message-title">{MESSAGE_TITLE}</h2> <p>{MESSAGE_TEXT}</p> - <!-- IF SCRIPT_NAME == "search" and not S_BOARD_DISABLED and not S_NO_SEARCH and L_RETURN_TO_SEARCH_ADV --><p><a href="{U_SEARCH}" class="arrow-{S_CONTENT_FLOW_BEGIN}">{L_RETURN_TO_SEARCH_ADV}</a></p><!-- ENDIF --> + <!-- IF SCRIPT_NAME == "search" and not S_BOARD_DISABLED and not S_NO_SEARCH and L_RETURN_TO_SEARCH_ADV --><p><a href="{U_SEARCH}" class="arrow-{S_CONTENT_FLOW_BEGIN}">{L_GO_TO_SEARCH_ADV}</a></p><!-- ENDIF --> </div> </div> diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index 6ee5be3b8f..396b698e2d 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -7,8 +7,8 @@ <!-- IF SEARCH_TOPIC --> <p><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}">{L_RETURN_TO_TOPIC}</a></p> -<!-- ELSE IF REFERER_IS_SEARCH --> - <p><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}">{L_RETURN_TO_SEARCH_ADV}</a></p> +<!-- ELSE --> + <p><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}">{L_GO_TO_SEARCH_ADV}</a></p> <!-- ENDIF --> <!-- IF .pagination or SEARCH_MATCHES or PAGE_NUMBER --> |