diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-09-15 14:33:15 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-09-15 14:33:15 -0500 |
| commit | 7454d5c2d526f237bf24825b80edf6c9f1750fc6 (patch) | |
| tree | 59ff36bf8d0ee581a1172a537ebb079dd058e3b1 /phpBB/language/en | |
| parent | 05b573ebf76c737f89deaefd22ce963aa910e5d1 (diff) | |
| download | forums-7454d5c2d526f237bf24825b80edf6c9f1750fc6.tar forums-7454d5c2d526f237bf24825b80edf6c9f1750fc6.tar.gz forums-7454d5c2d526f237bf24825b80edf6c9f1750fc6.tar.bz2 forums-7454d5c2d526f237bf24825b80edf6c9f1750fc6.tar.xz forums-7454d5c2d526f237bf24825b80edf6c9f1750fc6.zip | |
[ticket/11103] Topic/Post in queue notification
Also, bug fixes and cleanup
PHPBB3-11103
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/common.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/email/notifications/post_in_queue.txt | 17 | ||||
| -rw-r--r-- | phpBB/language/en/email/notifications/quote.txt | 2 | ||||
| -rw-r--r-- | phpBB/language/en/email/notifications/topic_in_queue.txt | 17 |
4 files changed, 37 insertions, 1 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 4229b41fb8..90acd0854b 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -391,10 +391,12 @@ $lang = array_merge($lang, array( 'NOTIFICATION_POST' => '%1$s replied to the topic "%2$s".', 'NOTIFICATION_POST_APPROVED' => 'Your post was approved "%2$s".', 'NOTIFICATION_POST_DISAPPROVED' => 'Your post "%1$s" was disapproved because "%2$s".', + 'NOTIFICATION_POST_IN_QUEUE' => 'A new post titled "%2$s" was posted by "%1$s" and needs approval.', 'NOTIFICATION_QUOTE' => '%1$s quoted you in the post "%2$s".', 'NOTIFICATION_TOPIC' => '%1$s posted a new topic "%2$s" in the forum "%3$s".', 'NOTIFICATION_TOPIC_APPROVED' => 'Your topic "%2$s" in the forum "%3$s" was approved.', 'NOTIFICATION_TOPIC_DISAPPROVED' => 'Your topic "%1$s" was disapproved because "%2$s".', + 'NOTIFICATION_TOPIC_IN_QUEUE' => 'A new topic titled "%2$s" was posted by "%1$s" and needs approval.', 'NOTIFY_ADMIN' => 'Please notify the board administrator or webmaster.', 'NOTIFY_ADMIN_EMAIL' => 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>', 'NO_ACCESS_ATTACHMENT' => 'You are not allowed to access this file.', diff --git a/phpBB/language/en/email/notifications/post_in_queue.txt b/phpBB/language/en/email/notifications/post_in_queue.txt new file mode 100644 index 0000000000..5ce2b8fe09 --- /dev/null +++ b/phpBB/language/en/email/notifications/post_in_queue.txt @@ -0,0 +1,17 @@ +Subject: Topic reply notification - "{TOPIC_TITLE}" + +Hello {USERNAME}, + +You are receiving this notification because the post, "{POST_SUBJECT}" at "{SITENAME}" needs approval. + +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_TOPIC} + +If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here: + +{U_NOTIFICATION_SETTINGS} + +{EMAIL_SIG}
\ No newline at end of file diff --git a/phpBB/language/en/email/notifications/quote.txt b/phpBB/language/en/email/notifications/quote.txt index 96fd527c8f..8b8584a794 100644 --- a/phpBB/language/en/email/notifications/quote.txt +++ b/phpBB/language/en/email/notifications/quote.txt @@ -5,7 +5,7 @@ Hello {USERNAME}, You are receiving this notification because "{AUTHOR_NAME}" quoted you in the topic, "{TOPIC_TITLE}" at "{SITENAME}". You can use the following link to view the reply made. If you want to view the quoted post, click the following link: -{U_QUOTED_POST} +{U_VIEW_POST} If you want to view the topic, click the following link: {U_TOPIC} diff --git a/phpBB/language/en/email/notifications/topic_in_queue.txt b/phpBB/language/en/email/notifications/topic_in_queue.txt new file mode 100644 index 0000000000..17c8b15880 --- /dev/null +++ b/phpBB/language/en/email/notifications/topic_in_queue.txt @@ -0,0 +1,17 @@ +Subject: Topic reply notification - "{TOPIC_TITLE}" + +Hello {USERNAME}, + +You are receiving this notification because the topic , "{TOPIC_TITLE}" at "{SITENAME}" needs approval. + +If you want to view the topic, click the following link: +{U_VIEW_TOPIC} + +If you want to view the forum, click the following link: +{U_FORUM} + +If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here: + +{U_NOTIFICATION_SETTINGS} + +{EMAIL_SIG}
\ No newline at end of file |