From 985d234a29b22086a196dca427e6c474229e3d36 Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Sun, 11 Nov 2012 11:37:14 -0600 Subject: [ticket/11103] Move all email templates to the email/ directory & prep short Prepare short email templates (to be used in jabber) PHPBB3-11103 --- phpBB/language/en/email/bookmark.txt | 20 ++++++++++++++++++++ phpBB/language/en/email/notifications/bookmark.txt | 20 -------------------- .../en/email/notifications/post_in_queue.txt | 17 ----------------- phpBB/language/en/email/notifications/quote.txt | 20 -------------------- phpBB/language/en/email/notifications/report_pm.txt | 14 -------------- .../language/en/email/notifications/report_post.txt | 17 ----------------- .../en/email/notifications/topic_in_queue.txt | 17 ----------------- phpBB/language/en/email/post_in_queue.txt | 17 +++++++++++++++++ phpBB/language/en/email/quote.txt | 20 ++++++++++++++++++++ phpBB/language/en/email/report_pm.txt | 14 ++++++++++++++ phpBB/language/en/email/report_post.txt | 17 +++++++++++++++++ phpBB/language/en/email/short/bookmark.txt | 20 ++++++++++++++++++++ phpBB/language/en/email/short/newtopic_notify.txt | 13 +++++++++++++ phpBB/language/en/email/short/post_approved.txt | 14 ++++++++++++++ phpBB/language/en/email/short/post_disapproved.txt | 12 ++++++++++++ phpBB/language/en/email/short/post_in_queue.txt | 17 +++++++++++++++++ phpBB/language/en/email/short/privmsg_notify.txt | 15 +++++++++++++++ phpBB/language/en/email/short/quote.txt | 20 ++++++++++++++++++++ phpBB/language/en/email/short/report_pm.txt | 14 ++++++++++++++ phpBB/language/en/email/short/report_post.txt | 17 +++++++++++++++++ phpBB/language/en/email/short/topic_approved.txt | 11 +++++++++++ phpBB/language/en/email/short/topic_disapproved.txt | 12 ++++++++++++ phpBB/language/en/email/short/topic_in_queue.txt | 17 +++++++++++++++++ phpBB/language/en/email/short/topic_notify.txt | 20 ++++++++++++++++++++ phpBB/language/en/email/topic_in_queue.txt | 17 +++++++++++++++++ 25 files changed, 307 insertions(+), 105 deletions(-) create mode 100644 phpBB/language/en/email/bookmark.txt delete mode 100644 phpBB/language/en/email/notifications/bookmark.txt delete mode 100644 phpBB/language/en/email/notifications/post_in_queue.txt delete mode 100644 phpBB/language/en/email/notifications/quote.txt delete mode 100644 phpBB/language/en/email/notifications/report_pm.txt delete mode 100644 phpBB/language/en/email/notifications/report_post.txt delete mode 100644 phpBB/language/en/email/notifications/topic_in_queue.txt create mode 100644 phpBB/language/en/email/post_in_queue.txt create mode 100644 phpBB/language/en/email/quote.txt create mode 100644 phpBB/language/en/email/report_pm.txt create mode 100644 phpBB/language/en/email/report_post.txt create mode 100644 phpBB/language/en/email/short/bookmark.txt create mode 100644 phpBB/language/en/email/short/newtopic_notify.txt create mode 100644 phpBB/language/en/email/short/post_approved.txt create mode 100644 phpBB/language/en/email/short/post_disapproved.txt create mode 100644 phpBB/language/en/email/short/post_in_queue.txt create mode 100644 phpBB/language/en/email/short/privmsg_notify.txt create mode 100644 phpBB/language/en/email/short/quote.txt create mode 100644 phpBB/language/en/email/short/report_pm.txt create mode 100644 phpBB/language/en/email/short/report_post.txt create mode 100644 phpBB/language/en/email/short/topic_approved.txt create mode 100644 phpBB/language/en/email/short/topic_disapproved.txt create mode 100644 phpBB/language/en/email/short/topic_in_queue.txt create mode 100644 phpBB/language/en/email/short/topic_notify.txt create mode 100644 phpBB/language/en/email/topic_in_queue.txt (limited to 'phpBB/language/en/email') diff --git a/phpBB/language/en/email/bookmark.txt b/phpBB/language/en/email/bookmark.txt new file mode 100644 index 0000000000..95f17b5693 --- /dev/null +++ b/phpBB/language/en/email/bookmark.txt @@ -0,0 +1,20 @@ +Subject: Topic reply notification - "{TOPIC_TITLE}" + +Hello {USERNAME}, + +You are receiving this notification because a topic you bookmarked, "{TOPIC_TITLE}" at "{SITENAME}", has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic. + +If you want to view the newest post made since your last visit, click the following link: +{U_NEWEST_POST} + +If you want to view the topic, click the following link: +{U_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} diff --git a/phpBB/language/en/email/notifications/bookmark.txt b/phpBB/language/en/email/notifications/bookmark.txt deleted file mode 100644 index 95f17b5693..0000000000 --- a/phpBB/language/en/email/notifications/bookmark.txt +++ /dev/null @@ -1,20 +0,0 @@ -Subject: Topic reply notification - "{TOPIC_TITLE}" - -Hello {USERNAME}, - -You are receiving this notification because a topic you bookmarked, "{TOPIC_TITLE}" at "{SITENAME}", has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic. - -If you want to view the newest post made since your last visit, click the following link: -{U_NEWEST_POST} - -If you want to view the topic, click the following link: -{U_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} diff --git a/phpBB/language/en/email/notifications/post_in_queue.txt b/phpBB/language/en/email/notifications/post_in_queue.txt deleted file mode 100644 index 8d56ce6c4d..0000000000 --- a/phpBB/language/en/email/notifications/post_in_queue.txt +++ /dev/null @@ -1,17 +0,0 @@ -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} diff --git a/phpBB/language/en/email/notifications/quote.txt b/phpBB/language/en/email/notifications/quote.txt deleted file mode 100644 index 2b9525801f..0000000000 --- a/phpBB/language/en/email/notifications/quote.txt +++ /dev/null @@ -1,20 +0,0 @@ -Subject: Topic reply notification - "{TOPIC_TITLE}" - -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_VIEW_POST} - -If you want to view the topic, click the following link: -{U_TOPIC} - -If you want to view the forum, click the following link: -{U_FORUM} - -If you no longer wish to receive updates about replies quoting you, please update your notification settings here: - -{U_NOTIFICATION_SETTINGS} - -{EMAIL_SIG} diff --git a/phpBB/language/en/email/notifications/report_pm.txt b/phpBB/language/en/email/notifications/report_pm.txt deleted file mode 100644 index 66ae82d074..0000000000 --- a/phpBB/language/en/email/notifications/report_pm.txt +++ /dev/null @@ -1,14 +0,0 @@ -Subject: Topic reply notification - "{TOPIC_TITLE}" - -Hello {USERNAME}, - -You are receiving this notification because a Private Message titled "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was reported. - -If you want to view the report, click the following link: -{U_VIEW_REPORT} - -If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here: - -{U_NOTIFICATION_SETTINGS} - -{EMAIL_SIG} diff --git a/phpBB/language/en/email/notifications/report_post.txt b/phpBB/language/en/email/notifications/report_post.txt deleted file mode 100644 index 46983be1ed..0000000000 --- a/phpBB/language/en/email/notifications/report_post.txt +++ /dev/null @@ -1,17 +0,0 @@ -Subject: Topic reply notification - "{TOPIC_TITLE}" - -Hello {USERNAME}, - -You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" was reported. - -If you want to view the report, click the following link: -{U_VIEW_REPORT} - -If you want to view the post, click the following link: -{U_VIEW_POST} - -If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here: - -{U_NOTIFICATION_SETTINGS} - -{EMAIL_SIG} diff --git a/phpBB/language/en/email/notifications/topic_in_queue.txt b/phpBB/language/en/email/notifications/topic_in_queue.txt deleted file mode 100644 index ae8f9e2484..0000000000 --- a/phpBB/language/en/email/notifications/topic_in_queue.txt +++ /dev/null @@ -1,17 +0,0 @@ -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} diff --git a/phpBB/language/en/email/post_in_queue.txt b/phpBB/language/en/email/post_in_queue.txt new file mode 100644 index 0000000000..8d56ce6c4d --- /dev/null +++ b/phpBB/language/en/email/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} diff --git a/phpBB/language/en/email/quote.txt b/phpBB/language/en/email/quote.txt new file mode 100644 index 0000000000..2b9525801f --- /dev/null +++ b/phpBB/language/en/email/quote.txt @@ -0,0 +1,20 @@ +Subject: Topic reply notification - "{TOPIC_TITLE}" + +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_VIEW_POST} + +If you want to view the topic, click the following link: +{U_TOPIC} + +If you want to view the forum, click the following link: +{U_FORUM} + +If you no longer wish to receive updates about replies quoting you, please update your notification settings here: + +{U_NOTIFICATION_SETTINGS} + +{EMAIL_SIG} diff --git a/phpBB/language/en/email/report_pm.txt b/phpBB/language/en/email/report_pm.txt new file mode 100644 index 0000000000..66ae82d074 --- /dev/null +++ b/phpBB/language/en/email/report_pm.txt @@ -0,0 +1,14 @@ +Subject: Topic reply notification - "{TOPIC_TITLE}" + +Hello {USERNAME}, + +You are receiving this notification because a Private Message titled "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was reported. + +If you want to view the report, click the following link: +{U_VIEW_REPORT} + +If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here: + +{U_NOTIFICATION_SETTINGS} + +{EMAIL_SIG} diff --git a/phpBB/language/en/email/report_post.txt b/phpBB/language/en/email/report_post.txt new file mode 100644 index 0000000000..46983be1ed --- /dev/null +++ b/phpBB/language/en/email/report_post.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}" was reported. + +If you want to view the report, click the following link: +{U_VIEW_REPORT} + +If you want to view the post, click the following link: +{U_VIEW_POST} + +If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here: + +{U_NOTIFICATION_SETTINGS} + +{EMAIL_SIG} diff --git a/phpBB/language/en/email/short/bookmark.txt b/phpBB/language/en/email/short/bookmark.txt new file mode 100644 index 0000000000..95f17b5693 --- /dev/null +++ b/phpBB/language/en/email/short/bookmark.txt @@ -0,0 +1,20 @@ +Subject: Topic reply notification - "{TOPIC_TITLE}" + +Hello {USERNAME}, + +You are receiving this notification because a topic you bookmarked, "{TOPIC_TITLE}" at "{SITENAME}", has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic. + +If you want to view the newest post made since your last visit, click the following link: +{U_NEWEST_POST} + +If you want to view the topic, click the following link: +{U_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} diff --git a/phpBB/language/en/email/short/newtopic_notify.txt b/phpBB/language/en/email/short/newtopic_notify.txt new file mode 100644 index 0000000000..d4f5cae620 --- /dev/null +++ b/phpBB/language/en/email/short/newtopic_notify.txt @@ -0,0 +1,13 @@ +Subject: New topic notification - "{FORUM_NAME}" + +Hello {USERNAME}, + +You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic by {AUTHOR_NAME} since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum. + +{U_FORUM} + +If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link: + +{U_STOP_WATCHING_FORUM} + +{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/email/short/post_approved.txt b/phpBB/language/en/email/short/post_approved.txt new file mode 100644 index 0000000000..e715b54026 --- /dev/null +++ b/phpBB/language/en/email/short/post_approved.txt @@ -0,0 +1,14 @@ +Subject: Post approved - "{POST_SUBJECT}" + +Hello {USERNAME}, + +You are receiving this notification because your post "{POST_SUBJECT}" at "{SITENAME}" was approved by a moderator or administrator. + +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/short/post_disapproved.txt b/phpBB/language/en/email/short/post_disapproved.txt new file mode 100644 index 0000000000..3bc64bb611 --- /dev/null +++ b/phpBB/language/en/email/short/post_disapproved.txt @@ -0,0 +1,12 @@ +Subject: Post disapproved - "{POST_SUBJECT}" + +Hello {USERNAME}, + +You are receiving this notification because your post "{POST_SUBJECT}" at "{SITENAME}" was disapproved by a moderator or administrator. + +The following reason was given for the disapproval: + +{REASON} + + +{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/email/short/post_in_queue.txt b/phpBB/language/en/email/short/post_in_queue.txt new file mode 100644 index 0000000000..8d56ce6c4d --- /dev/null +++ b/phpBB/language/en/email/short/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} diff --git a/phpBB/language/en/email/short/privmsg_notify.txt b/phpBB/language/en/email/short/privmsg_notify.txt new file mode 100644 index 0000000000..d3a86cc73c --- /dev/null +++ b/phpBB/language/en/email/short/privmsg_notify.txt @@ -0,0 +1,15 @@ +Subject: New private message has arrived + +Hello {USERNAME}, + +You have received a new private message from "{AUTHOR_NAME}" to your account on "{SITENAME}" with the following subject: + +{SUBJECT} + +You can view your new message by clicking on the following link: + +{U_VIEW_MESSAGE} + +You have requested that you be notified on this event, remember that you can always choose not to be notified of new messages by changing the appropriate setting in your profile. + +{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/email/short/quote.txt b/phpBB/language/en/email/short/quote.txt new file mode 100644 index 0000000000..2b9525801f --- /dev/null +++ b/phpBB/language/en/email/short/quote.txt @@ -0,0 +1,20 @@ +Subject: Topic reply notification - "{TOPIC_TITLE}" + +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_VIEW_POST} + +If you want to view the topic, click the following link: +{U_TOPIC} + +If you want to view the forum, click the following link: +{U_FORUM} + +If you no longer wish to receive updates about replies quoting you, please update your notification settings here: + +{U_NOTIFICATION_SETTINGS} + +{EMAIL_SIG} diff --git a/phpBB/language/en/email/short/report_pm.txt b/phpBB/language/en/email/short/report_pm.txt new file mode 100644 index 0000000000..66ae82d074 --- /dev/null +++ b/phpBB/language/en/email/short/report_pm.txt @@ -0,0 +1,14 @@ +Subject: Topic reply notification - "{TOPIC_TITLE}" + +Hello {USERNAME}, + +You are receiving this notification because a Private Message titled "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was reported. + +If you want to view the report, click the following link: +{U_VIEW_REPORT} + +If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here: + +{U_NOTIFICATION_SETTINGS} + +{EMAIL_SIG} diff --git a/phpBB/language/en/email/short/report_post.txt b/phpBB/language/en/email/short/report_post.txt new file mode 100644 index 0000000000..46983be1ed --- /dev/null +++ b/phpBB/language/en/email/short/report_post.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}" was reported. + +If you want to view the report, click the following link: +{U_VIEW_REPORT} + +If you want to view the post, click the following link: +{U_VIEW_POST} + +If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here: + +{U_NOTIFICATION_SETTINGS} + +{EMAIL_SIG} diff --git a/phpBB/language/en/email/short/topic_approved.txt b/phpBB/language/en/email/short/topic_approved.txt new file mode 100644 index 0000000000..ffda378d30 --- /dev/null +++ b/phpBB/language/en/email/short/topic_approved.txt @@ -0,0 +1,11 @@ +Subject: Topic approved - "{TOPIC_TITLE}" + +Hello {USERNAME}, + +You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITENAME}" was approved by a moderator or administrator. + +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/short/topic_disapproved.txt b/phpBB/language/en/email/short/topic_disapproved.txt new file mode 100644 index 0000000000..49ef58bf39 --- /dev/null +++ b/phpBB/language/en/email/short/topic_disapproved.txt @@ -0,0 +1,12 @@ +Subject: Topic disapproved - "{TOPIC_TITLE}" + +Hello {USERNAME}, + +You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITENAME}" was disapproved by a moderator or administrator. + +The following reason was given for the disapproval: + +{REASON} + + +{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/email/short/topic_in_queue.txt b/phpBB/language/en/email/short/topic_in_queue.txt new file mode 100644 index 0000000000..ae8f9e2484 --- /dev/null +++ b/phpBB/language/en/email/short/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} diff --git a/phpBB/language/en/email/short/topic_notify.txt b/phpBB/language/en/email/short/topic_notify.txt new file mode 100644 index 0000000000..fa2481dd9a --- /dev/null +++ b/phpBB/language/en/email/short/topic_notify.txt @@ -0,0 +1,20 @@ +Subject: Topic reply notification - "{TOPIC_TITLE}" + +Hello {USERNAME}, + +You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply by {AUTHOR_NAME} since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic. + +If you want to view the newest post made since your last visit, click the following link: +{U_NEWEST_POST} + +If you want to view the topic, click the following link: +{U_TOPIC} + +If you want to view the forum, click the following link: +{U_FORUM} + +If you no longer wish to watch this topic you can either click the "Unsubscribe topic" link found at the bottom of the topic above, or by clicking the following link: + +{U_STOP_WATCHING_TOPIC} + +{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/email/topic_in_queue.txt b/phpBB/language/en/email/topic_in_queue.txt new file mode 100644 index 0000000000..ae8f9e2484 --- /dev/null +++ b/phpBB/language/en/email/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} -- cgit v1.2.1