diff options
author | Nils Adermann <naderman@naderman.de> | 2006-03-18 10:54:14 +0000 |
---|---|---|
committer | Nils Adermann <naderman@naderman.de> | 2006-03-18 10:54:14 +0000 |
commit | 9cd89343a297ff594d1a74459d1c9059e24c501f (patch) | |
tree | 7d2e05f26cb6643e8facb566dc0c21e884237a2d /phpBB/language | |
parent | ca1e11dc2a165542098819b6d722afd8eb05ab90 (diff) | |
download | forums-9cd89343a297ff594d1a74459d1c9059e24c501f.tar forums-9cd89343a297ff594d1a74459d1c9059e24c501f.tar.gz forums-9cd89343a297ff594d1a74459d1c9059e24c501f.tar.bz2 forums-9cd89343a297ff594d1a74459d1c9059e24c501f.tar.xz forums-9cd89343a297ff594d1a74459d1c9059e24c501f.zip |
- replaced mcp reports system with a simplified version
- fixed links to mcp_reports
git-svn-id: file:///svn/phpbb/trunk@5649 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r-- | phpBB/language/en/acp/permissions_phpbb.php | 1 | ||||
-rw-r--r-- | phpBB/language/en/common.php | 2 | ||||
-rw-r--r-- | phpBB/language/en/email/report_closed.txt | 9 | ||||
-rw-r--r-- | phpBB/language/en/email/report_deleted.txt | 9 | ||||
-rw-r--r-- | phpBB/language/en/mcp.php | 39 |
5 files changed, 52 insertions, 8 deletions
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index 8ee45f0a74..0a5a3a5994 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -158,6 +158,7 @@ $lang = array_merge($lang, array( 'acl_m_edit' => array('lang' => 'Can edit posts', 'cat' => 'post_actions'), 'acl_m_delete' => array('lang' => 'Can delete posts', 'cat' => 'post_actions'), 'acl_m_approve' => array('lang' => 'Can approve posts', 'cat' => 'post_actions'), + 'acl_m_report' => array('lang' => 'Can close and delete reports', 'cat' => 'post_actions'), 'acl_m_chgposter' => array('lang' => 'Can change post author', 'cat' => 'post_actions'), 'acl_m_move' => array('lang' => 'Can move topics', 'cat' => 'topic_actions'), diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index f9964558b7..846cbe9625 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -322,7 +322,7 @@ $lang = array_merge($lang, array( 'POST_DETAILS' => 'Post Details', 'POST_NEW_TOPIC' => 'Post new topic', 'POST_PCT' => '%.2f%% of all posts', - 'POST_REPORTED' => 'Click to view reports', + 'POST_REPORTED' => 'Click to view report', 'POST_SUBJECT' => 'Post Subject', 'POST_TIME' => 'Post time', 'POST_UNAPPROVED' => 'Click to approve post', diff --git a/phpBB/language/en/email/report_closed.txt b/phpBB/language/en/email/report_closed.txt new file mode 100644 index 0000000000..7da2026fb3 --- /dev/null +++ b/phpBB/language/en/email/report_closed.txt @@ -0,0 +1,9 @@ +Subject: Report Closed - {POST_SUBJECT} +Charset: iso-8859-1 + +Hello {USERNAME}, + +You are receiving this email because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at {SITENAME} was handled by a moderator or by an admin. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a personal message. + + +{EMAIL_SIG}
\ No newline at end of file diff --git a/phpBB/language/en/email/report_deleted.txt b/phpBB/language/en/email/report_deleted.txt new file mode 100644 index 0000000000..9fed2a590f --- /dev/null +++ b/phpBB/language/en/email/report_deleted.txt @@ -0,0 +1,9 @@ +Subject: Report Closed - {POST_SUBJECT} +Charset: iso-8859-1 + +Hello {USERNAME}, + +You are receiving this email because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at {SITENAME} was deleted by a moderator or by an admin. + + +{EMAIL_SIG}
\ No newline at end of file diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index 0a7816ca5f..caa455fdb7 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -35,6 +35,7 @@ $lang = array_merge($lang, array( 'ADD_WARNING' => 'Add warning', 'ADD_WARNING_EXPLAIN' => 'To send a warning to this user please fill out the following form. Only use plain text; HTML, BBCode, etc. are not permitted.', 'ALL_ENTRIES' => 'All entries', + 'ALL_REPORTS' => 'All reports', 'ALREADY_REPORTED' => 'This post has already been reported', 'ALREADY_WARNED' => 'A warning has already been issued for this post', 'APPROVE' => 'Approve', @@ -47,10 +48,18 @@ $lang = array_merge($lang, array( 'CANNOT_WARN_ANONYMOUS' => 'You cannot warn an guest user', 'CAN_LEAVE_BLANK' => 'This can be left blank.', 'CHANGE_POSTER' => 'Change poster', + 'CLOSE_REPORT' => 'Close report', + 'CLOSE_REPORT_CONFIRM' => 'Are you sure you want to close the selected report?', + 'CLOSE_REPORTS' => 'Close reports', + 'CLOSE_REPORTS_CONFIRM' => 'Are you sure you want to close the selected reports?', 'DELETE_POSTS' => 'Delete posts', 'DELETE_POSTS_CONFIRM' => 'Are you sure you want to delete these posts?', 'DELETE_POST_CONFIRM' => 'Are you sure you want to delete this post?', + 'DELETE_REPORT' => 'Delete report', + 'DELETE_REPORT_CONFIRM' => 'Are you sure you want to delete the selected report?', + 'DELETE_REPORTS' => 'Delete reports', + 'DELETE_REPORTS_CONFIRM' => 'Are you sure you want to delete the selected reports?', 'DELETE_TOPICS' => 'Delete selected topics', 'DELETE_TOPICS_CONFIRM' => 'Are you sure you want to delete these topics?', 'DELETE_TOPIC_CONFIRM' => 'Are you sure you want to delete this topic?', @@ -164,20 +173,26 @@ $lang = array_merge($lang, array( 'MCP_NOTES_FRONT' => 'Front Page', 'MCP_NOTES_USER' => 'User Details', - 'MCP_QUEUE' => 'Moderation Queue', - 'MCP_QUEUE_REPORTS' => 'Reports', - 'MCP_QUEUE_APPROVE_DETAILS' => 'Approve details', - 'MCP_QUEUE_UNAPPROVED_POSTS' => 'Posts awaiting for approval', - 'MCP_QUEUE_UNAPPROVED_TOPICS' => 'Topics awaiting for approval', + 'MCP_REPORTS' => 'Open Reports', + 'MCP_REPORT_DETAILS' => 'Report Details', + 'MCP_REPORTS_CLOSED' => 'Closed Reports', + + 'MCP_QUEUE' => 'Moderation Queue', + 'MCP_QUEUE_APPROVE_DETAILS' => 'Approve Details', + 'MCP_QUEUE_UNAPPROVED_POSTS' => 'Posts awaiting approval', + 'MCP_QUEUE_UNAPPROVED_TOPICS' => 'Topics awaiting approval', + 'MCP_VIEW_ALL' => 'View all (%s)', 'MCP_VIEW_LOGS' => 'View logs', 'MCP_VIEW_RECENT' => 'View recent (%s)', 'MCP_VIEW_USER' => 'View warnings for a specific user', + 'MCP_WARN' => 'Warnings', 'MCP_WARN_FRONT' => 'Front Page', 'MCP_WARN_LIST' => 'List warnings', 'MCP_WARN_POST' => 'Warn for specific post', 'MCP_WARN_USER' => 'Warn User', + 'MERGE_POSTS' => 'Merge posts', 'MERGE_POSTS_CONFIRM' => 'Are you sure you want to merge the selected posts?', 'MERGE_TOPIC_EXPLAIN' => 'Using the form below you can merge selected posts into another topic. These posts will not be reordered and will appear as if the users posted them to the new topic.<br />Please enter the destination topic id or click on the "Select" button to search for one', @@ -197,6 +212,7 @@ $lang = array_merge($lang, array( 'NO_FEEDBACK' => 'No feedback exists for this user', 'NO_FINAL_TOPIC_SELECTED' => 'You have to select a destination topic for merging posts', 'NO_MATCHES_FOUND' => 'No matches found', + 'NO_POST_REPORT' => 'This post was not reported.', 'NO_POST_SELECTED' => 'You must select at least one post to perform this action', 'NO_TOPIC_SELECTED' => 'You must select at least one topic to perform this action', @@ -225,21 +241,30 @@ $lang = array_merge($lang, array( 'READ_USERNOTES' => 'User notes', 'READ_WARNINGS' => 'User warnings', 'REPORTER' => 'Reporter', - 'REPORT_ALREADY_DEALT_WITH' => 'This post has already been reported previously and successfully dealt with', - 'REPORT_TIME' => 'Report time', + 'REPORTED' => 'Reported', + 'REPORTS_CLOSED_SUCCESS' => 'The selected reports have been closed successfully.', + 'REPORTS_DELETED_SUCCESS' => 'The selected reports have been deleted successfully.', 'REPORTS_TOTAL' => 'In total there are <b>%d</b> reports to review', 'REPORTS_ZERO_TOTAL' => 'There are no reports to review', + 'REPORT_ALREADY_DEALT_WITH' => 'This post has already been reported previously and successfully dealt with', + 'REPORT_CLOSED' => 'This report has previously been closed.', + 'REPORT_CLOSED_SUCCESS' => 'The selected report has been closed successfully.', + 'REPORT_DELETED_SUCCESS' => 'The selected report has been deleted successfully.', + 'REPORT_DETAILS' => 'Report details', 'REPORT_MESSAGE' => 'Report this message', 'REPORT_MESSAGE_EXPLAIN'=> 'Use this form to report the selected message to the board administrators. Reporting should generally be used only if the message breaks forum rules.', 'REPORT_NOTIFY' => 'Notify me', 'REPORT_NOTIFY_EXPLAIN' => 'Informs you when your report is dealt with', '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', 'REPORT_TOTAL' => 'In total there is <b>1</b> report to review', 'RESYNC' => 'Resync', 'RETURN_MESSAGE' => 'Click %sHere%s to return to the message', 'RETURN_NEW_FORUM' => 'Click %sHere%s to return to the new forum', 'RETURN_NEW_TOPIC' => 'Click %sHere%s to return to the new topic', 'RETURN_QUEUE' => 'Click %sHere%s to return to the queue', + 'RETURN_REPORTS' => 'Click %sHere%s to return to the reports', 'SELECT_ACTION' => 'Select desired action', 'SELECT_TOPIC' => 'Select topic', |