mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-22 10:57:56 +01:00
Code Issues Releases Wiki Activity

[feature/soft-delete] Use correct language when restoring topics in MCP

Browse Source 
PHPBB3-9567
This commit is contained in:
Joas Schilling 2012-10-21 22:30:20 +02:00
parent 0822d2bb61
commit e7a137820b
4 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
phpBB/includes/mcp/mcp_queue.php
View File

@ -67,11 +67,11 @@ class mcp_queue
{
if ($action != 'disapprove')
{
$this->approve_topics($action, $post_id_list, 'queue', $mode);
$this->approve_topics($action, $topic_id_list, 'queue', $mode);
}
else
{
$this->disapprove_posts($post_id_list, 'queue', $mode);
//@todo: $this->disapprove_posts($post_id_list, 'queue', $mode);
}
}
else
@ -434,6 +434,7 @@ class mcp_queue
'U_POST_AUTHOR' => get_username_string('profile', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']),
'POST_ID' => $row['post_id'],
'TOPIC_ID' => $row['topic_id'],
'FORUM_NAME' => $forum_names[$row['forum_id']],
'POST_SUBJECT' => ($row['post_subject'] != '') ? $row['post_subject'] : $user->lang['NO_SUBJECT'],
'TOPIC_TITLE' => $row['topic_title'],
@ -700,7 +701,7 @@ class mcp_queue
foreach ($topic_info as $topic_id => $topic_data)
{
phpbb_content_visibility::set_post_visibility(ITEM_APPROVED, $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '');
phpbb_content_visibility::set_topic_visibility(ITEM_APPROVED, $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '');
$topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f={$topic_data['forum_id']}&t={$topic_id}");
@ -711,11 +712,6 @@ class mcp_queue
);
}
foreach ($topic_info as $topic_id => $topic_data)
{
phpbb_content_visibility::set_topic_visibility(ITEM_APPROVED, $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '');
}
if (sizeof($topic_info) >= 1)
{
$success_msg = (sizeof($topic_info) == 1) ? 'TOPIC_' . strtoupper($action) . 'D_SUCCESS' : 'TOPICS_' . strtoupper($action) . 'D_SUCCESS';
@ -792,7 +788,7 @@ class mcp_queue
'S_' . strtoupper($action) => true,
));
confirm_box(false, strtoupper($action) . '_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
confirm_box(false, strtoupper($action) . '_TOPIC' . ((sizeof($topic_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
}
$redirect = request_var('redirect', "index.$phpEx");

16
phpBB/language/en/mcp.php
View File

@ -310,11 +310,15 @@ $lang = array_merge($lang, array(
'REPORT_POST_EXPLAIN' => 'Use this form to report the selected post to the forum moderators and board administrators. Reporting should generally be used only if the post breaks forum rules.',
'REPORT_REASON' => 'Report reason',
'REPORT_TIME' => 'Report time',
'RESTORE' => 'Restore',
'RESTORE_POST' => 'Restore post',
'RESTORE_POST_CONFIRM' => 'Are you sure you want to restore this post?',
'RESTORE_POSTS' => 'Restore posts',
'RESTORE_POSTS_CONFIRM' => 'Are you sure you want to restore the selected posts?',
'RESTORE' => 'Restore',
'RESTORE_POST' => 'Restore post',
'RESTORE_POST_CONFIRM' => 'Are you sure you want to restore this post?',
'RESTORE_POSTS' => 'Restore posts',
'RESTORE_POSTS_CONFIRM' => 'Are you sure you want to restore the selected posts?',
'RESTORE_TOPIC' => 'Restore topic',
'RESTORE_TOPIC_CONFIRM' => 'Are you sure you want to restore this topic?',
'RESTORE_TOPICS' => 'Restore topics',
'RESTORE_TOPICS_CONFIRM' => 'Are you sure you want to restore the selected topics?',
'RESYNC' => 'Resync',
'RETURN_MESSAGE' => '%sReturn to the message%s',
'RETURN_NEW_FORUM' => '%sGo to the new forum%s',
@ -355,6 +359,7 @@ $lang = array_merge($lang, array(
'TOPICS_FORKED_SUCCESS' => 'The selected topics have been copied successfully.',
'TOPICS_LOCKED_SUCCESS' => 'The selected topics have been locked.',
'TOPICS_MOVED_SUCCESS' => 'The selected topics have been moved successfully.',
'TOPICS_RESTORED_SUCCESS' => 'The selected topics have been restored successfully.',
'TOPICS_RESYNC_SUCCESS' => 'The selected topics have been resynchronised.',
'TOPICS_TYPE_CHANGED' => 'Topic types changed successfully.',
'TOPICS_UNLOCKED_SUCCESS' => 'The selected topics have been unlocked.',
@ -365,6 +370,7 @@ $lang = array_merge($lang, array(
'TOPIC_LOCKED_SUCCESS' => 'The selected topic has been locked.',
'TOPIC_MOVED_SUCCESS' => 'The selected topic has been moved successfully.',
'TOPIC_NOT_EXIST' => 'The topic you selected does not exist.',
'TOPIC_RESTORED_SUCCESS' => 'This topic has been restored successfully.',
'TOPIC_RESYNC_SUCCESS' => 'The selected topic has been resynchronised.',
'TOPIC_SPLIT_SUCCESS' => 'The selected topic has been split successfully.',
'TOPIC_TIME' => 'Topic time',

2
phpBB/styles/prosilver/template/mcp_approve.html
View File

@ -18,7 +18,7 @@
</dl>
<!-- ENDIF -->
<!-- IF not S_APPROVE -->
<!-- IF not S_APPROVE and not S_RESTORE -->
<dl class="fields2 nobg">
<dt><label>{L_DISAPPROVE_REASON}:</label></dt>
<dd><select name="reason_id">

8
phpBB/styles/prosilver/template/mcp_queue.html
View File

@ -57,7 +57,13 @@
</dd>
<dd class="mark"><input type="checkbox" name="post_id_list[]" value="{postrow.POST_ID}" /></dd>
<dd class="mark">
<!-- IF S_TOPICS -->
<input type="checkbox" name="topic_id_list[]" value="{postrow.TOPIC_ID}" />
<!-- ELSE -->
<input type="checkbox" name="post_id_list[]" value="{postrow.POST_ID}" />
<!-- ENDIF -->
</dd>
</dl>
</li>
<!-- ENDIF -->