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

Merge pull request #2113 from nickvergessen/ticket/8041

Browse source 
[ticket/8041] Merge item name into "Return to" string for better translations

* nickvergessen/ticket/8041:
  [ticket/8041] Add space/tabs after => in array list
  [ticket/8041] Wrap forum name, topic title and pm folder name with quotes
  [ticket/8041] Merge item name into "Return to" string for better translations
This commit is contained in:
Andreas Fischer 2014-03-13 11:02:29 +01:00
commit 4ecfc07e03
8 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/includes/ucp/ucp_pm.php
View file

@ -353,8 +353,9 @@ class ucp_pm
{ {
$template->assign_vars(array( $template->assign_vars(array(
'S_VIEW_MESSAGE' => true, 'S_VIEW_MESSAGE' => true,
'MSG_ID' => $msg_id) 'L_RETURN_TO_FOLDER' => $user->lang('RETURN_TO', $folder_status['folder_name']),
); 'MSG_ID' => $msg_id,
));
if (!$msg_id) if (!$msg_id)
{ {

1
phpBB/language/en/acp/common.php
View file

@ -288,7 +288,6 @@ $lang = array_merge($lang, array(
'RESYNC' => 'Resynchronise', 'RESYNC' => 'Resynchronise',
'RESYNC_FILES_STATS' => 'Resynchronise files statistics', 'RESYNC_FILES_STATS' => 'Resynchronise files statistics',
'RESYNC_FILES_STATS_EXPLAIN' => 'Recalculates the total number and size of files attached to posts and private messages.', 'RESYNC_FILES_STATS_EXPLAIN' => 'Recalculates the total number and size of files attached to posts and private messages.',
'RETURN_TO' => 'Return to…',
'SELECT_ANONYMOUS' => 'Select anonymous user', 'SELECT_ANONYMOUS' => 'Select anonymous user',
'SELECT_OPTION' => 'Select option', 'SELECT_OPTION' => 'Select option',

3
phpBB/language/en/common.php
View file

@ -600,7 +600,8 @@ $lang = array_merge($lang, array(
'RETURN_FORUM' => '%sReturn to the forum last visited%s', 'RETURN_FORUM' => '%sReturn to the forum last visited%s',
'RETURN_PAGE' => '%sReturn to the previous page%s', 'RETURN_PAGE' => '%sReturn to the previous page%s',
'RETURN_TOPIC' => '%sReturn to the topic last visited%s', 'RETURN_TOPIC' => '%sReturn to the topic last visited%s',
'RETURN_TO' => 'Return to', 'RETURN_TO' => 'Return to “%s”',
'RETURN_TO_INDEX' => 'Return to Board Index',
'FEED' => 'Feed', 'FEED' => 'Feed',
'FEED_NEWS' => 'News', 'FEED_NEWS' => 'News',
'FEED_TOPICS_ACTIVE' => 'Active Topics', 'FEED_TOPICS_ACTIVE' => 'Active Topics',

1
phpBB/search.php
View file

@ -1020,6 +1020,7 @@ if ($keywords || $author || $author_id || $search_id || $submit)
{ {
$template->assign_vars(array( $template->assign_vars(array(
'SEARCH_TOPIC' => $topic_title, 'SEARCH_TOPIC' => $topic_title,
'L_RETURN_TO_TOPIC' => $user->lang('RETURN_TO', $topic_title),
'U_SEARCH_TOPIC' => $view_topic_url 'U_SEARCH_TOPIC' => $view_topic_url
)); ));
} }

6
phpBB/styles/prosilver/template/jumpbox.html
View file

@ -1,10 +1,10 @@
<!-- IF S_VIEWTOPIC --> <!-- IF S_VIEWTOPIC -->
<p class="jumpbox-return"><a href="{U_VIEW_FORUM}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO} {FORUM_NAME}</a></p> <p class="jumpbox-return"><a href="{U_VIEW_FORUM}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO_FORUM}</a></p>
<!-- ELSEIF S_VIEWFORUM --> <!-- ELSEIF S_VIEWFORUM -->
<p class="jumpbox-return"><a href="{U_INDEX}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO} {L_INDEX}</a></p> <p class="jumpbox-return"><a href="{U_INDEX}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO_INDEX}</a></p>
<!-- ELSEIF SEARCH_TOPIC --> <!-- 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}{L_COLON} {SEARCH_TOPIC}</a></p> <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 --> <!-- 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_RETURN_TO_SEARCH_ADV}</a></p>
<!-- ENDIF --> <!-- ENDIF -->

2
phpBB/styles/prosilver/template/search_results.html
View file

@ -6,7 +6,7 @@
<!-- IF PHRASE_SEARCH_DISABLED --> <p><strong>{L_PHRASE_SEARCH_DISABLED}</strong></p><!-- ENDIF --> <!-- IF PHRASE_SEARCH_DISABLED --> <p><strong>{L_PHRASE_SEARCH_DISABLED}</strong></p><!-- ENDIF -->
<!-- IF SEARCH_TOPIC --> <!-- IF SEARCH_TOPIC -->
<p><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}">{L_RETURN_TO}{L_COLON} {SEARCH_TOPIC}</a></p> <p><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}">{L_RETURN_TO_TOPIC}</a></p>
<!-- ELSE --> <!-- ELSE -->
<p><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}">{L_RETURN_TO_SEARCH_ADV}</a></p> <p><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}">{L_RETURN_TO_SEARCH_ADV}</a></p>
<!-- ENDIF --> <!-- ENDIF -->

2
phpBB/styles/prosilver/template/ucp_pm_message_header.html
View file

@ -18,7 +18,7 @@
<!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE --> <!-- IF TOTAL_MESSAGES or S_VIEW_MESSAGE -->
<ul class="linklist"> <ul class="linklist">
<li class="rightside pagination"> <li class="rightside pagination">
<!-- IF S_VIEW_MESSAGE --><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO} {CUR_FOLDER_NAME}</a><!-- ENDIF --> <!-- IF S_VIEW_MESSAGE --><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">{L_RETURN_TO_FOLDER}</a><!-- ENDIF -->
<!-- IF FOLDER_CUR_MESSAGES neq 0 --> <!-- IF FOLDER_CUR_MESSAGES neq 0 -->
<!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES} &bull; <!-- ENDIF --> <!-- IF TOTAL_MESSAGES -->{TOTAL_MESSAGES} &bull; <!-- ENDIF -->
<!-- IF .pagination --> <!-- IF .pagination -->

1
phpBB/viewtopic.php
View file

@ -634,6 +634,7 @@ $template->assign_vars(array(
'S_TOPIC_ACTION' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;t=$topic_id" . (($start == 0) ? '' : "&amp;start=$start")), 'S_TOPIC_ACTION' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;t=$topic_id" . (($start == 0) ? '' : "&amp;start=$start")),
'S_MOD_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "f=$forum_id&amp;t=$topic_id" . (($start == 0) ? '' : "&amp;start=$start") . "&amp;quickmod=1&amp;redirect=" . urlencode(str_replace('&amp;', '&', $viewtopic_url)), true, $user->session_id), 'S_MOD_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "f=$forum_id&amp;t=$topic_id" . (($start == 0) ? '' : "&amp;start=$start") . "&amp;quickmod=1&amp;redirect=" . urlencode(str_replace('&amp;', '&', $viewtopic_url)), true, $user->session_id),
'L_RETURN_TO_FORUM' => $user->lang('RETURN_TO', $topic_data['forum_name']),
'S_VIEWTOPIC' => true, 'S_VIEWTOPIC' => true,
'S_DISPLAY_SEARCHBOX' => ($auth->acl_get('u_search') && $auth->acl_get('f_search', $forum_id) && $config['load_search']) ? true : false, 'S_DISPLAY_SEARCHBOX' => ($auth->acl_get('u_search') && $auth->acl_get('f_search', $forum_id) && $config['load_search']) ? true : false,
'S_SEARCHBOX_ACTION' => append_sid("{$phpbb_root_path}search.$phpEx"), 'S_SEARCHBOX_ACTION' => append_sid("{$phpbb_root_path}search.$phpEx"),