diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2004-07-19 20:13:18 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2004-07-19 20:13:18 +0000 |
| commit | bfec4fb8fca43dc46302d44fcfa8c6c4377d4750 (patch) | |
| tree | 74de3d4bce8af8db061cd0e7262e378a2bb31014 /phpBB/language | |
| parent | 9dcd7b45cb3b3d82474c0bdf955a1fd753eaa87a (diff) | |
| download | forums-bfec4fb8fca43dc46302d44fcfa8c6c4377d4750.tar forums-bfec4fb8fca43dc46302d44fcfa8c6c4377d4750.tar.gz forums-bfec4fb8fca43dc46302d44fcfa8c6c4377d4750.tar.bz2 forums-bfec4fb8fca43dc46302d44fcfa8c6c4377d4750.tar.xz forums-bfec4fb8fca43dc46302d44fcfa8c6c4377d4750.zip | |
- approve/disapprove posts/topics
- changed mcp_front to be more moderator friendly
- able to change the forum in mcp_queue (for moderators moderating more than one forum)
git-svn-id: file:///svn/phpbb/trunk@4937 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/common.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/email/post_approved.txt | 15 | ||||
| -rw-r--r-- | phpBB/language/en/email/post_disapproved.txt | 13 | ||||
| -rw-r--r-- | phpBB/language/en/email/topic_approved.txt | 12 | ||||
| -rw-r--r-- | phpBB/language/en/email/topic_disapproved.txt | 13 | ||||
| -rw-r--r-- | phpBB/language/en/mcp.php | 5 |
6 files changed, 59 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 5d5519a7c9..cda58dc804 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -212,6 +212,7 @@ $lang += array( 'MESSAGE' => 'Message', 'MESSAGE_BODY' => 'Message body', 'MINUTES' => 'Minutes', + 'MODERATE' => 'Moderate', 'MODERATOR' => 'Moderator', 'MODERATORS' => 'Moderators', 'MONTH' => 'Month', diff --git a/phpBB/language/en/email/post_approved.txt b/phpBB/language/en/email/post_approved.txt new file mode 100644 index 0000000000..3d7c4902c5 --- /dev/null +++ b/phpBB/language/en/email/post_approved.txt @@ -0,0 +1,15 @@ +Subject: Post Approved - {POST_SUBJECT} +Charset: iso-8859-1 + +Hello {USERNAME}, + +You are receiving this email because your post "{POST_SUBJECT}" at {SITENAME} was approved by a moderator or admin. + +If you want to view the post click the following link: +{U_VIEW_POST} + +If you want to view the topic, click the following link: +{U_VIEW_TOPIC} + + +{EMAIL_SIG}
\ No newline at end of file diff --git a/phpBB/language/en/email/post_disapproved.txt b/phpBB/language/en/email/post_disapproved.txt new file mode 100644 index 0000000000..c6055cb28e --- /dev/null +++ b/phpBB/language/en/email/post_disapproved.txt @@ -0,0 +1,13 @@ +Subject: Post Disapproved - {POST_SUBJECT} +Charset: iso-8859-1 + +Hello {USERNAME}, + +You are receiving this email because your post "{POST_SUBJECT}" at {SITENAME} was disapproved by a moderator or admin. + +The following reason was given for the disapproval: + +{REASON} + + +{EMAIL_SIG}
\ No newline at end of file diff --git a/phpBB/language/en/email/topic_approved.txt b/phpBB/language/en/email/topic_approved.txt new file mode 100644 index 0000000000..28927b5a29 --- /dev/null +++ b/phpBB/language/en/email/topic_approved.txt @@ -0,0 +1,12 @@ +Subject: Topic Approved - {TOPIC_TITLE} +Charset: iso-8859-1 + +Hello {USERNAME}, + +You are receiving this email because your topic "{TOPIC_TITLE}" at {SITENAME} was approved by a moderator or admin. + +If you want to view the topic, click the following link: +{U_VIEW_TOPIC} + + +{EMAIL_SIG}
\ No newline at end of file diff --git a/phpBB/language/en/email/topic_disapproved.txt b/phpBB/language/en/email/topic_disapproved.txt new file mode 100644 index 0000000000..52c1578861 --- /dev/null +++ b/phpBB/language/en/email/topic_disapproved.txt @@ -0,0 +1,13 @@ +Subject: Topic Disapproved - {TOPIC_TITLE} +Charset: iso-8859-1 + +Hello {USERNAME}, + +You are receiving this email because your topic "{TOPIC_TITLE}" at {SITENAME} was disapproved by a moderator or admin. + +The following reason was given for the disapproval: + +{REASON} + + +{EMAIL_SIG}
\ No newline at end of file diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index 16e35a9cc8..49deed20c3 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -32,7 +32,10 @@ $lang += array( 'ALL_ENTRIES' => 'All entries', 'ALREADY_REPORTED' => 'This post has already been reported', 'APPROVE' => 'Approve', + 'APPROVE_POST' => 'Approve Post', + 'APPROVE_POST_CONFIRM' => 'Are you sure you want to approve this post?', 'APPROVE_POSTS' => 'Approve Posts', + 'APPROVE_POSTS_CONFIRM' => 'Are you sure you want to approve the selected posts?', 'CANNOT_MOVE_SAME_FORUM'=> 'You cannot move a topic to the forum it\'s already in', 'CAN_LEAVE_BLANK' => 'This can be left blank.', @@ -138,6 +141,8 @@ $lang += array( 'MOVE_TOPICS' => 'Move selected topics', 'MOVE_TOPICS_CONFIRM' => 'Are you sure you want to move the selected topics into a new forum?', + 'NOTIFY_POSTER_APPROVAL'=> 'Notify poster about approval?', + 'NOTIFY_POSTER_DISAPPROVAL' => 'Notify poster about disapproval?', 'NOT_MODERATOR' => 'You are not a moderator of this forum', 'NO_DESTINATION_FORUM' => 'Please select a forum for destination', 'NO_ENTRIES' => 'No log entries for this period', |