From a55b96c9f65f159bcb851455bef23a07fe667e4a Mon Sep 17 00:00:00 2001 From: Christian Schnegelberger Date: Sun, 4 Oct 2020 13:44:41 +0200 Subject: [PATCH 1/7] [ticket/16589] Shortens subject and email content PHPBB3-16589 --- phpBB/language/en/email/bookmark.txt | 7 +++---- phpBB/language/en/email/forum_notify.txt | 9 ++++----- phpBB/language/en/email/newtopic_notify.txt | 12 +++++------- phpBB/language/en/email/pm_report_closed.txt | 4 +++- phpBB/language/en/email/pm_report_deleted.txt | 2 +- phpBB/language/en/email/post_approved.txt | 2 +- phpBB/language/en/email/post_disapproved.txt | 2 +- phpBB/language/en/email/post_in_queue.txt | 2 +- phpBB/language/en/email/quote.txt | 5 ++--- phpBB/language/en/email/report_closed.txt | 2 +- phpBB/language/en/email/report_deleted.txt | 2 +- phpBB/language/en/email/report_pm.txt | 2 +- phpBB/language/en/email/report_pm_closed.txt | 2 +- phpBB/language/en/email/report_post.txt | 2 +- phpBB/language/en/email/short/newtopic_notify.txt | 9 ++++----- phpBB/language/en/email/short/post_approved.txt | 2 +- phpBB/language/en/email/short/post_disapproved.txt | 2 +- phpBB/language/en/email/short/post_in_queue.txt | 2 +- phpBB/language/en/email/short/privmsg_notify.txt | 3 +-- phpBB/language/en/email/short/quote.txt | 11 ++--------- phpBB/language/en/email/short/report_pm.txt | 2 +- phpBB/language/en/email/short/report_post.txt | 2 +- phpBB/language/en/email/short/topic_approved.txt | 2 +- .../language/en/email/short/topic_disapproved.txt | 2 +- phpBB/language/en/email/short/topic_in_queue.txt | 4 ++-- phpBB/language/en/email/short/topic_notify.txt | 14 ++++---------- phpBB/language/en/email/topic_approved.txt | 2 +- phpBB/language/en/email/topic_disapproved.txt | 2 +- phpBB/language/en/email/topic_in_queue.txt | 2 +- phpBB/language/en/email/topic_notify.txt | 9 +++++---- 30 files changed, 54 insertions(+), 71 deletions(-) diff --git a/phpBB/language/en/email/bookmark.txt b/phpBB/language/en/email/bookmark.txt index 95f17b5693..32f8d6b685 100644 --- a/phpBB/language/en/email/bookmark.txt +++ b/phpBB/language/en/email/bookmark.txt @@ -1,10 +1,10 @@ -Subject: Topic reply notification - "{TOPIC_TITLE}" +Subject: Reply in "{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. +Your bookmarked topic "{TOPIC_TITLE}" received a new reply since your last visit at "{SITENAME}". 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: +If you want to view the newest post click the following link: {U_NEWEST_POST} If you want to view the topic, click the following link: @@ -14,7 +14,6 @@ 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/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt index 1dfe8c652d..e53321e2ff 100644 --- a/phpBB/language/en/email/forum_notify.txt +++ b/phpBB/language/en/email/forum_notify.txt @@ -1,10 +1,9 @@ -Subject: Forum post notification - "{FORUM_NAME}" +Subject: Reply in "{FORUM_NAME}" List-Unsubscribe: <{U_STOP_WATCHING_FORUM}> Hello {USERNAME}, -You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}" by {AUTHOR_NAME} since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic. - +The "{FORUM_NAME}" received a new reply to the topic"{TOPIC_TITLE}" by {AUTHOR_NAME} since your last visit at "{SITENAME}". No more notifications will be sent until you visit the topic. {U_NEWEST_POST} If you want to view the topic, click the following link: @@ -13,8 +12,8 @@ If you want to view the topic, click the following link: If you want to view the forum, click the following link: {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: - +If you no longer wish to watch this forum click the following link: {U_STOP_WATCHING_FORUM} +Or click the "Unsubscribe forum" link found at the bottom of the forum above. {EMAIL_SIG} diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt index 0dfc9e43b4..18dfb5e0fe 100644 --- a/phpBB/language/en/email/newtopic_notify.txt +++ b/phpBB/language/en/email/newtopic_notify.txt @@ -1,18 +1,16 @@ -Subject: New topic notification - "{FORUM_NAME}" +Subject: Topic in "{FORUM_NAME}" List-Unsubscribe: <{U_STOP_WATCHING_FORUM}> 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. - +The forum "{FORUM_NAME}" received a new topic "{TOPIC_TITLE}" by {AUTHOR_NAME} since your last visit at "{SITENAME}". No more notifications will be sent until you visit the forum. {U_FORUM} -To see new topic directly, visit the following link: - +If you want to view the new topic, click the following link: {U_TOPIC} -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: - +If you no longer wish to watch this forum click the following link: {U_STOP_WATCHING_FORUM} +Or click the "Unsubscribe forum" link found at the bottom of the forum above. {EMAIL_SIG} diff --git a/phpBB/language/en/email/pm_report_closed.txt b/phpBB/language/en/email/pm_report_closed.txt index 0202b9d374..0e29925f4d 100644 --- a/phpBB/language/en/email/pm_report_closed.txt +++ b/phpBB/language/en/email/pm_report_closed.txt @@ -2,6 +2,8 @@ Subject: Report closed - "{PM_SUBJECT}" Hello {USERNAME}, -You are receiving this notification because the report you filed regarding the private message "{PM_SUBJECT}" at "{SITENAME}" has been tended to by a moderator or administrator. The report is now closed. If you have further questions, please contact {CLOSER_NAME} by private message. +The report you filed regarding the private message "{PM_SUBJECT}" at "{SITENAME}" has been tended to by a moderator or administrator. The report is now closed. + +If you have further questions, please contact {CLOSER_NAME} by private message. {EMAIL_SIG} diff --git a/phpBB/language/en/email/pm_report_deleted.txt b/phpBB/language/en/email/pm_report_deleted.txt index 991ed59f31..7c0f363d47 100644 --- a/phpBB/language/en/email/pm_report_deleted.txt +++ b/phpBB/language/en/email/pm_report_deleted.txt @@ -2,6 +2,6 @@ Subject: Report deleted - "{PM_SUBJECT}" Hello {USERNAME}, -You are receiving this notification because the report you filed regarding the private message "{PM_SUBJECT}" at "{SITENAME}" was deleted by a moderator or administrator. +The report you filed regarding the private message "{PM_SUBJECT}" at "{SITENAME}" was deleted by a moderator or administrator. {EMAIL_SIG} diff --git a/phpBB/language/en/email/post_approved.txt b/phpBB/language/en/email/post_approved.txt index 854d785f5f..87e8acebb6 100644 --- a/phpBB/language/en/email/post_approved.txt +++ b/phpBB/language/en/email/post_approved.txt @@ -2,7 +2,7 @@ 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. +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} diff --git a/phpBB/language/en/email/post_disapproved.txt b/phpBB/language/en/email/post_disapproved.txt index 9b2ee643ff..11a0564cb8 100644 --- a/phpBB/language/en/email/post_disapproved.txt +++ b/phpBB/language/en/email/post_disapproved.txt @@ -2,7 +2,7 @@ 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. +Your post "{POST_SUBJECT}" at "{SITENAME}" was disapproved by a moderator or administrator. The following reason was given for the disapproval: diff --git a/phpBB/language/en/email/post_in_queue.txt b/phpBB/language/en/email/post_in_queue.txt index 941f070d37..68667ca7e5 100644 --- a/phpBB/language/en/email/post_in_queue.txt +++ b/phpBB/language/en/email/post_in_queue.txt @@ -2,7 +2,7 @@ Subject: Post moderation notification - "{TOPIC_TITLE}" Hello {USERNAME}, -You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" needs approval. +The post "{POST_SUBJECT}" at "{SITENAME}" needs approval. If you want to view the post, click the following link: {U_VIEW_POST} diff --git a/phpBB/language/en/email/quote.txt b/phpBB/language/en/email/quote.txt index 2b9525801f..592ce5493b 100644 --- a/phpBB/language/en/email/quote.txt +++ b/phpBB/language/en/email/quote.txt @@ -1,8 +1,8 @@ -Subject: Topic reply notification - "{TOPIC_TITLE}" +Subject: Quoted in "{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. +"{AUTHOR_NAME}" quoted you in the topic "{TOPIC_TITLE}" at "{SITENAME}". If you want to view the quoted post, click the following link: {U_VIEW_POST} @@ -14,7 +14,6 @@ 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_closed.txt b/phpBB/language/en/email/report_closed.txt index 5ac9a8f878..71db29f65f 100644 --- a/phpBB/language/en/email/report_closed.txt +++ b/phpBB/language/en/email/report_closed.txt @@ -2,7 +2,7 @@ Subject: Report closed - "{POST_SUBJECT}" Hello {USERNAME}, -You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" by "{AUTHOR_NAME}" in "{TOPIC_TITLE}" at "{SITENAME}" was handled by a moderator or by an administrator. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a personal message. +The report you filed on the post "{POST_SUBJECT}" by "{AUTHOR_NAME}" in "{TOPIC_TITLE}" at "{SITENAME}" was handled by a moderator or by an administrator. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a personal message. You can view your reported post by clicking on the following link: diff --git a/phpBB/language/en/email/report_deleted.txt b/phpBB/language/en/email/report_deleted.txt index 9a30ea2ddd..059d9999ff 100644 --- a/phpBB/language/en/email/report_deleted.txt +++ b/phpBB/language/en/email/report_deleted.txt @@ -2,6 +2,6 @@ Subject: Report deleted - "{POST_SUBJECT}" Hello {USERNAME}, -You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at "{SITENAME}" was deleted by a moderator or by an administrator. +The report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at "{SITENAME}" was deleted by a moderator or by an administrator. {EMAIL_SIG} diff --git a/phpBB/language/en/email/report_pm.txt b/phpBB/language/en/email/report_pm.txt index a6b8086a9a..771646046b 100644 --- a/phpBB/language/en/email/report_pm.txt +++ b/phpBB/language/en/email/report_pm.txt @@ -2,7 +2,7 @@ Subject: Private Message report - "{SUBJECT}" Hello {USERNAME}, -You are receiving this notification because a Private Message titled "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was reported. +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} diff --git a/phpBB/language/en/email/report_pm_closed.txt b/phpBB/language/en/email/report_pm_closed.txt index 4492fe881f..66ba17fb1b 100644 --- a/phpBB/language/en/email/report_pm_closed.txt +++ b/phpBB/language/en/email/report_pm_closed.txt @@ -2,7 +2,7 @@ Subject: Private message report closed - "{SUBJECT}" Hello {USERNAME}, -You are receiving this notification because the report you filed on the private message "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was handled by a moderator or by an administrator. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a personal message. +The report you filed on the private message "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was handled by a moderator or by an administrator. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a personal message. You can view your reported private message by clicking on the following link: diff --git a/phpBB/language/en/email/report_post.txt b/phpBB/language/en/email/report_post.txt index 8eb24ec6af..1e50af1615 100644 --- a/phpBB/language/en/email/report_post.txt +++ b/phpBB/language/en/email/report_post.txt @@ -2,7 +2,7 @@ Subject: Post report - "{TOPIC_TITLE}" Hello {USERNAME}, -You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" was reported. +The post "{POST_SUBJECT}" at "{SITENAME}" was reported. If you want to view the report, click the following link: {U_VIEW_REPORT} diff --git a/phpBB/language/en/email/short/newtopic_notify.txt b/phpBB/language/en/email/short/newtopic_notify.txt index b9416d8e40..72ca1a928a 100644 --- a/phpBB/language/en/email/short/newtopic_notify.txt +++ b/phpBB/language/en/email/short/newtopic_notify.txt @@ -1,13 +1,12 @@ -Subject: New topic notification - "{FORUM_NAME}" +Subject: Topic in "{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. - +The forum "{FORUM_NAME}" received a new topic "{TOPIC_TITLE}" by {AUTHOR_NAME} since your last visit at "{SITENAME}". 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: - +If you no longer wish to watch this forum click the following link: {U_STOP_WATCHING_FORUM} +Or click the "Unsubscribe forum" link found at the bottom of the forum above. {EMAIL_SIG} diff --git a/phpBB/language/en/email/short/post_approved.txt b/phpBB/language/en/email/short/post_approved.txt index 854d785f5f..87e8acebb6 100644 --- a/phpBB/language/en/email/short/post_approved.txt +++ b/phpBB/language/en/email/short/post_approved.txt @@ -2,7 +2,7 @@ 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. +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} diff --git a/phpBB/language/en/email/short/post_disapproved.txt b/phpBB/language/en/email/short/post_disapproved.txt index 9b2ee643ff..11a0564cb8 100644 --- a/phpBB/language/en/email/short/post_disapproved.txt +++ b/phpBB/language/en/email/short/post_disapproved.txt @@ -2,7 +2,7 @@ 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. +Your post "{POST_SUBJECT}" at "{SITENAME}" was disapproved by a moderator or administrator. The following reason was given for the disapproval: diff --git a/phpBB/language/en/email/short/post_in_queue.txt b/phpBB/language/en/email/short/post_in_queue.txt index 941f070d37..68667ca7e5 100644 --- a/phpBB/language/en/email/short/post_in_queue.txt +++ b/phpBB/language/en/email/short/post_in_queue.txt @@ -2,7 +2,7 @@ Subject: Post moderation notification - "{TOPIC_TITLE}" Hello {USERNAME}, -You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" needs approval. +The post "{POST_SUBJECT}" at "{SITENAME}" needs approval. If you want to view the post, click the following link: {U_VIEW_POST} diff --git a/phpBB/language/en/email/short/privmsg_notify.txt b/phpBB/language/en/email/short/privmsg_notify.txt index 41fdbb782c..bf29071ac8 100644 --- a/phpBB/language/en/email/short/privmsg_notify.txt +++ b/phpBB/language/en/email/short/privmsg_notify.txt @@ -2,12 +2,11 @@ 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: +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. diff --git a/phpBB/language/en/email/short/quote.txt b/phpBB/language/en/email/short/quote.txt index 2b9525801f..871f471037 100644 --- a/phpBB/language/en/email/short/quote.txt +++ b/phpBB/language/en/email/short/quote.txt @@ -1,20 +1,13 @@ -Subject: Topic reply notification - "{TOPIC_TITLE}" +Subject: Quoted in "{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. +"{AUTHOR_NAME}" quoted you in the topic "{TOPIC_TITLE}" at "{SITENAME}". 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 index a101a014ff..7a5f17a7d9 100644 --- a/phpBB/language/en/email/short/report_pm.txt +++ b/phpBB/language/en/email/short/report_pm.txt @@ -2,7 +2,7 @@ Subject: Private Message report - "{TOPIC_TITLE}" Hello {USERNAME}, -You are receiving this notification because a Private Message titled "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was reported. +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} diff --git a/phpBB/language/en/email/short/report_post.txt b/phpBB/language/en/email/short/report_post.txt index 8eb24ec6af..1e50af1615 100644 --- a/phpBB/language/en/email/short/report_post.txt +++ b/phpBB/language/en/email/short/report_post.txt @@ -2,7 +2,7 @@ Subject: Post report - "{TOPIC_TITLE}" Hello {USERNAME}, -You are receiving this notification because the post "{POST_SUBJECT}" at "{SITENAME}" was reported. +The post "{POST_SUBJECT}" at "{SITENAME}" was reported. If you want to view the report, click the following link: {U_VIEW_REPORT} diff --git a/phpBB/language/en/email/short/topic_approved.txt b/phpBB/language/en/email/short/topic_approved.txt index 60c7ef4c09..132a15ea24 100644 --- a/phpBB/language/en/email/short/topic_approved.txt +++ b/phpBB/language/en/email/short/topic_approved.txt @@ -2,7 +2,7 @@ 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. +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} diff --git a/phpBB/language/en/email/short/topic_disapproved.txt b/phpBB/language/en/email/short/topic_disapproved.txt index 9c821e2bba..dfb0f29228 100644 --- a/phpBB/language/en/email/short/topic_disapproved.txt +++ b/phpBB/language/en/email/short/topic_disapproved.txt @@ -2,7 +2,7 @@ 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. +Your topic "{TOPIC_TITLE}" at "{SITENAME}" was disapproved by a moderator or administrator. The following reason was given for the disapproval: diff --git a/phpBB/language/en/email/short/topic_in_queue.txt b/phpBB/language/en/email/short/topic_in_queue.txt index 706dddf64f..a906a12a8b 100644 --- a/phpBB/language/en/email/short/topic_in_queue.txt +++ b/phpBB/language/en/email/short/topic_in_queue.txt @@ -1,8 +1,8 @@ -Subject: Topic moderation notification - "{TOPIC_TITLE}" +Subject: Topic "{TOPIC_TITLE}" needs approval Hello {USERNAME}, -You are receiving this notification because the topic "{TOPIC_TITLE}" at "{SITENAME}" needs approval. +The topic "{TOPIC_TITLE}" at "{SITENAME}" needs approval. If you want to view the topic, click the following link: {U_VIEW_TOPIC} diff --git a/phpBB/language/en/email/short/topic_notify.txt b/phpBB/language/en/email/short/topic_notify.txt index b1ed65727c..614bacfcec 100644 --- a/phpBB/language/en/email/short/topic_notify.txt +++ b/phpBB/language/en/email/short/topic_notify.txt @@ -1,20 +1,14 @@ -Subject: Topic reply notification - "{TOPIC_TITLE}" +Subject: Reply in "{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. +The topic "{TOPIC_TITLE}" received a new reply by {AUTHOR_NAME} since your last visit at "{SITENAME}". No more emails 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: - +If you no longer wish to watch this topic click the following link: {U_STOP_WATCHING_TOPIC} +Or click the "Unsubscribe topic" link found at the bottom of the topic above. {EMAIL_SIG} diff --git a/phpBB/language/en/email/topic_approved.txt b/phpBB/language/en/email/topic_approved.txt index 60c7ef4c09..132a15ea24 100644 --- a/phpBB/language/en/email/topic_approved.txt +++ b/phpBB/language/en/email/topic_approved.txt @@ -2,7 +2,7 @@ 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. +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} diff --git a/phpBB/language/en/email/topic_disapproved.txt b/phpBB/language/en/email/topic_disapproved.txt index 9c821e2bba..dfb0f29228 100644 --- a/phpBB/language/en/email/topic_disapproved.txt +++ b/phpBB/language/en/email/topic_disapproved.txt @@ -2,7 +2,7 @@ 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. +Your topic "{TOPIC_TITLE}" at "{SITENAME}" was disapproved by a moderator or administrator. The following reason was given for the disapproval: diff --git a/phpBB/language/en/email/topic_in_queue.txt b/phpBB/language/en/email/topic_in_queue.txt index 706dddf64f..a58c44d321 100644 --- a/phpBB/language/en/email/topic_in_queue.txt +++ b/phpBB/language/en/email/topic_in_queue.txt @@ -2,7 +2,7 @@ Subject: Topic moderation notification - "{TOPIC_TITLE}" Hello {USERNAME}, -You are receiving this notification because the topic "{TOPIC_TITLE}" at "{SITENAME}" needs approval. +The topic "{TOPIC_TITLE}" at "{SITENAME}" needs approval. If you want to view the topic, click the following link: {U_VIEW_TOPIC} diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt index 92bf85806e..a5932e48c6 100644 --- a/phpBB/language/en/email/topic_notify.txt +++ b/phpBB/language/en/email/topic_notify.txt @@ -1,11 +1,11 @@ -Subject: Topic reply notification - "{TOPIC_TITLE}" +Subject: Reply in "{TOPIC_TITLE}" List-Unsubscribe: <{U_STOP_WATCHING_TOPIC}> 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. No more notifications will be sent until you visit the topic. +The topic "{TOPIC_TITLE}" received a new reply by {AUTHOR_NAME} since your last visit at "{SITENAME}". No more emails 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: +If you want to view the newest post click the following link: {U_NEWEST_POST} If you want to view the topic, click the following link: @@ -14,7 +14,8 @@ If you want to view the topic, click the following link: 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: +If you no longer wish to watch this topic click the following link: {U_STOP_WATCHING_TOPIC} +Or click the "Unsubscribe topic" link found at the bottom of the topic above. {EMAIL_SIG} From 03c6ed32fb928f72a3a38dedfe2a9390a8b9d06f Mon Sep 17 00:00:00 2001 From: Christian Schnegelberger Date: Mon, 5 Oct 2020 18:17:57 +0200 Subject: [PATCH 2/7] [ticket/16589] Shorten the short/bookmark.txt mail template PHPBB3-16589 --- phpBB/language/en/email/short/bookmark.txt | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/phpBB/language/en/email/short/bookmark.txt b/phpBB/language/en/email/short/bookmark.txt index 95f17b5693..a0642b9920 100644 --- a/phpBB/language/en/email/short/bookmark.txt +++ b/phpBB/language/en/email/short/bookmark.txt @@ -1,20 +1,13 @@ -Subject: Topic reply notification - "{TOPIC_TITLE}" +Subject: Reply in "{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. +Your bookmarked topic "{TOPIC_TITLE}" received a new reply since your last visit at "{SITENAME}". 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} From 21019fac662a3595c69419160dc44e559bef1750 Mon Sep 17 00:00:00 2001 From: Christian Schnegelberger Date: Mon, 5 Oct 2020 19:43:48 +0200 Subject: [PATCH 3/7] [ticket/16589] Update titles and mail text PHPBB3-16589 --- phpBB/language/en/email/post_in_queue.txt | 2 +- phpBB/language/en/email/privmsg_notify.txt | 5 ++--- phpBB/language/en/email/short/post_in_queue.txt | 2 +- phpBB/language/en/email/short/privmsg_notify.txt | 3 +-- phpBB/language/en/email/short/topic_in_queue.txt | 2 +- phpBB/language/en/email/topic_in_queue.txt | 2 +- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/phpBB/language/en/email/post_in_queue.txt b/phpBB/language/en/email/post_in_queue.txt index 68667ca7e5..d3a8259a9a 100644 --- a/phpBB/language/en/email/post_in_queue.txt +++ b/phpBB/language/en/email/post_in_queue.txt @@ -1,4 +1,4 @@ -Subject: Post moderation notification - "{TOPIC_TITLE}" +Subject: Post needs aprroval - "{TOPIC_TITLE}" Hello {USERNAME}, diff --git a/phpBB/language/en/email/privmsg_notify.txt b/phpBB/language/en/email/privmsg_notify.txt index 41fdbb782c..442da23769 100644 --- a/phpBB/language/en/email/privmsg_notify.txt +++ b/phpBB/language/en/email/privmsg_notify.txt @@ -1,9 +1,8 @@ -Subject: New private message has arrived +Subject: New private message Hello {USERNAME}, -You have received a new private message from "{AUTHOR_NAME}" to your account on "{SITENAME}" with the following subject: - +A new private message from "{AUTHOR_NAME}" to your account on "{SITENAME}" with the following subject has arrived: {SUBJECT} You can view your new message by clicking on the following link: diff --git a/phpBB/language/en/email/short/post_in_queue.txt b/phpBB/language/en/email/short/post_in_queue.txt index 68667ca7e5..d3a8259a9a 100644 --- a/phpBB/language/en/email/short/post_in_queue.txt +++ b/phpBB/language/en/email/short/post_in_queue.txt @@ -1,4 +1,4 @@ -Subject: Post moderation notification - "{TOPIC_TITLE}" +Subject: Post needs aprroval - "{TOPIC_TITLE}" Hello {USERNAME}, diff --git a/phpBB/language/en/email/short/privmsg_notify.txt b/phpBB/language/en/email/short/privmsg_notify.txt index bf29071ac8..da4acfb373 100644 --- a/phpBB/language/en/email/short/privmsg_notify.txt +++ b/phpBB/language/en/email/short/privmsg_notify.txt @@ -2,8 +2,7 @@ Subject: New private message has arrived Hello {USERNAME}, -New private message from "{AUTHOR_NAME}" to your account on "{SITENAME}" with the following subject: - +A new private message from "{AUTHOR_NAME}" to your account on "{SITENAME}" with the following subject has arrived: {SUBJECT} You can view your new message by clicking on the following link: diff --git a/phpBB/language/en/email/short/topic_in_queue.txt b/phpBB/language/en/email/short/topic_in_queue.txt index a906a12a8b..f4ed7b2ace 100644 --- a/phpBB/language/en/email/short/topic_in_queue.txt +++ b/phpBB/language/en/email/short/topic_in_queue.txt @@ -1,4 +1,4 @@ -Subject: Topic "{TOPIC_TITLE}" needs approval +Subject: Topic needs approval - "{TOPIC_TITLE}" Hello {USERNAME}, diff --git a/phpBB/language/en/email/topic_in_queue.txt b/phpBB/language/en/email/topic_in_queue.txt index a58c44d321..f4ed7b2ace 100644 --- a/phpBB/language/en/email/topic_in_queue.txt +++ b/phpBB/language/en/email/topic_in_queue.txt @@ -1,4 +1,4 @@ -Subject: Topic moderation notification - "{TOPIC_TITLE}" +Subject: Topic needs approval - "{TOPIC_TITLE}" Hello {USERNAME}, From a951ca44893c1feb5612fb3592b1e55d30ba4b99 Mon Sep 17 00:00:00 2001 From: Christian Schnegelberger Date: Thu, 8 Oct 2020 14:11:02 +0200 Subject: [PATCH 4/7] [ticket/16589] Topic in to New topic in > newtopic_notify.txt PHPBB3-16589 --- phpBB/language/en/email/newtopic_notify.txt | 2 +- phpBB/language/en/email/short/newtopic_notify.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt index 18dfb5e0fe..c0ea44d9ee 100644 --- a/phpBB/language/en/email/newtopic_notify.txt +++ b/phpBB/language/en/email/newtopic_notify.txt @@ -1,4 +1,4 @@ -Subject: Topic in "{FORUM_NAME}" +Subject: New topic in "{FORUM_NAME}" List-Unsubscribe: <{U_STOP_WATCHING_FORUM}> Hello {USERNAME}, diff --git a/phpBB/language/en/email/short/newtopic_notify.txt b/phpBB/language/en/email/short/newtopic_notify.txt index 72ca1a928a..a0e9cbb70a 100644 --- a/phpBB/language/en/email/short/newtopic_notify.txt +++ b/phpBB/language/en/email/short/newtopic_notify.txt @@ -1,4 +1,4 @@ -Subject: Topic in "{FORUM_NAME}" +Subject: New topic in "{FORUM_NAME}" Hello {USERNAME}, From 552587dbb2b11abba4aee7177f033005d53ad309 Mon Sep 17 00:00:00 2001 From: Christian Schnegelberger Date: Sun, 31 Jan 2021 14:07:01 +0100 Subject: [PATCH 5/7] [ticket/16589] Visit at => visit to PHPBB3-16589 --- phpBB/language/en/email/bookmark.txt | 2 +- phpBB/language/en/email/forum_notify.txt | 2 +- phpBB/language/en/email/newtopic_notify.txt | 2 +- phpBB/language/en/email/short/bookmark.txt | 2 +- phpBB/language/en/email/short/newtopic_notify.txt | 2 +- phpBB/language/en/email/short/topic_notify.txt | 2 +- phpBB/language/en/email/topic_notify.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/phpBB/language/en/email/bookmark.txt b/phpBB/language/en/email/bookmark.txt index 32f8d6b685..2ec8a35138 100644 --- a/phpBB/language/en/email/bookmark.txt +++ b/phpBB/language/en/email/bookmark.txt @@ -2,7 +2,7 @@ Subject: Reply in "{TOPIC_TITLE}" Hello {USERNAME}, -Your bookmarked topic "{TOPIC_TITLE}" received a new reply since your last visit at "{SITENAME}". No more notifications will be sent until you visit the topic. +Your bookmarked topic "{TOPIC_TITLE}" received a new reply since your last visit to "{SITENAME}". No more notifications will be sent until you visit the topic. If you want to view the newest post click the following link: {U_NEWEST_POST} diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt index e53321e2ff..7b9c19809d 100644 --- a/phpBB/language/en/email/forum_notify.txt +++ b/phpBB/language/en/email/forum_notify.txt @@ -3,7 +3,7 @@ List-Unsubscribe: <{U_STOP_WATCHING_FORUM}> Hello {USERNAME}, -The "{FORUM_NAME}" received a new reply to the topic"{TOPIC_TITLE}" by {AUTHOR_NAME} since your last visit at "{SITENAME}". No more notifications will be sent until you visit the topic. +The "{FORUM_NAME}" received a new reply to the topic"{TOPIC_TITLE}" by {AUTHOR_NAME} since your last visit to "{SITENAME}". No more notifications will be sent until you visit the topic. {U_NEWEST_POST} If you want to view the topic, click the following link: diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt index c0ea44d9ee..b8d6300a59 100644 --- a/phpBB/language/en/email/newtopic_notify.txt +++ b/phpBB/language/en/email/newtopic_notify.txt @@ -3,7 +3,7 @@ List-Unsubscribe: <{U_STOP_WATCHING_FORUM}> Hello {USERNAME}, -The forum "{FORUM_NAME}" received a new topic "{TOPIC_TITLE}" by {AUTHOR_NAME} since your last visit at "{SITENAME}". No more notifications will be sent until you visit the forum. +The forum "{FORUM_NAME}" received a new topic "{TOPIC_TITLE}" by {AUTHOR_NAME} since your last visit to "{SITENAME}". No more notifications will be sent until you visit the forum. {U_FORUM} If you want to view the new topic, click the following link: diff --git a/phpBB/language/en/email/short/bookmark.txt b/phpBB/language/en/email/short/bookmark.txt index a0642b9920..963b644415 100644 --- a/phpBB/language/en/email/short/bookmark.txt +++ b/phpBB/language/en/email/short/bookmark.txt @@ -2,7 +2,7 @@ Subject: Reply in "{TOPIC_TITLE}" Hello {USERNAME}, -Your bookmarked topic "{TOPIC_TITLE}" received a new reply since your last visit at "{SITENAME}". No more notifications will be sent until you visit the topic. +Your bookmarked topic "{TOPIC_TITLE}" received a new reply since your last visit to "{SITENAME}". 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} diff --git a/phpBB/language/en/email/short/newtopic_notify.txt b/phpBB/language/en/email/short/newtopic_notify.txt index a0e9cbb70a..8cd97b5cd6 100644 --- a/phpBB/language/en/email/short/newtopic_notify.txt +++ b/phpBB/language/en/email/short/newtopic_notify.txt @@ -2,7 +2,7 @@ Subject: New topic in "{FORUM_NAME}" Hello {USERNAME}, -The forum "{FORUM_NAME}" received a new topic "{TOPIC_TITLE}" by {AUTHOR_NAME} since your last visit at "{SITENAME}". No more notifications will be sent until you visit the forum. +The forum "{FORUM_NAME}" received a new topic "{TOPIC_TITLE}" by {AUTHOR_NAME} since your last visit to "{SITENAME}". No more notifications will be sent until you visit the forum. {U_FORUM} If you no longer wish to watch this forum click the following link: diff --git a/phpBB/language/en/email/short/topic_notify.txt b/phpBB/language/en/email/short/topic_notify.txt index 614bacfcec..5cce11c461 100644 --- a/phpBB/language/en/email/short/topic_notify.txt +++ b/phpBB/language/en/email/short/topic_notify.txt @@ -2,7 +2,7 @@ Subject: Reply in "{TOPIC_TITLE}" Hello {USERNAME}, -The topic "{TOPIC_TITLE}" received a new reply by {AUTHOR_NAME} since your last visit at "{SITENAME}". No more emails will be sent until you visit the topic. +The topic "{TOPIC_TITLE}" received a new reply by {AUTHOR_NAME} since your last visit to "{SITENAME}". No more emails 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} diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt index a5932e48c6..08d4d99607 100644 --- a/phpBB/language/en/email/topic_notify.txt +++ b/phpBB/language/en/email/topic_notify.txt @@ -3,7 +3,7 @@ List-Unsubscribe: <{U_STOP_WATCHING_TOPIC}> Hello {USERNAME}, -The topic "{TOPIC_TITLE}" received a new reply by {AUTHOR_NAME} since your last visit at "{SITENAME}". No more emails will be sent until you visit the topic. +The topic "{TOPIC_TITLE}" received a new reply by {AUTHOR_NAME} since your last visit to "{SITENAME}". No more emails will be sent until you visit the topic. If you want to view the newest post click the following link: {U_NEWEST_POST} From 8e599e23a04d5d03881b61104627adb1258d9fd3 Mon Sep 17 00:00:00 2001 From: Christian Schnegelberger Date: Sat, 6 Feb 2021 17:53:40 +0100 Subject: [PATCH 6/7] [ticket/16589] Remove "or click unsubscribe ... link" sentence PHPBB3-16589 --- phpBB/language/en/email/forum_notify.txt | 3 +-- phpBB/language/en/email/newtopic_notify.txt | 1 - phpBB/language/en/email/short/newtopic_notify.txt | 1 - phpBB/language/en/email/short/privmsg_notify.txt | 2 +- phpBB/language/en/email/short/topic_notify.txt | 1 - phpBB/language/en/email/topic_notify.txt | 1 - 6 files changed, 2 insertions(+), 7 deletions(-) diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt index 7b9c19809d..f0a260130b 100644 --- a/phpBB/language/en/email/forum_notify.txt +++ b/phpBB/language/en/email/forum_notify.txt @@ -3,7 +3,7 @@ List-Unsubscribe: <{U_STOP_WATCHING_FORUM}> Hello {USERNAME}, -The "{FORUM_NAME}" received a new reply to the topic"{TOPIC_TITLE}" by {AUTHOR_NAME} since your last visit to "{SITENAME}". No more notifications will be sent until you visit the topic. +The "{FORUM_NAME}" received a new reply to the topic "{TOPIC_TITLE}" by {AUTHOR_NAME} since your last visit to "{SITENAME}". No more notifications will be sent until you visit the topic. {U_NEWEST_POST} If you want to view the topic, click the following link: @@ -14,6 +14,5 @@ If you want to view the forum, click the following link: If you no longer wish to watch this forum click the following link: {U_STOP_WATCHING_FORUM} -Or click the "Unsubscribe forum" link found at the bottom of the forum above. {EMAIL_SIG} diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt index b8d6300a59..fd946100e1 100644 --- a/phpBB/language/en/email/newtopic_notify.txt +++ b/phpBB/language/en/email/newtopic_notify.txt @@ -11,6 +11,5 @@ If you want to view the new topic, click the following link: If you no longer wish to watch this forum click the following link: {U_STOP_WATCHING_FORUM} -Or click the "Unsubscribe forum" link found at the bottom of the forum above. {EMAIL_SIG} diff --git a/phpBB/language/en/email/short/newtopic_notify.txt b/phpBB/language/en/email/short/newtopic_notify.txt index 8cd97b5cd6..e8f8c25b9e 100644 --- a/phpBB/language/en/email/short/newtopic_notify.txt +++ b/phpBB/language/en/email/short/newtopic_notify.txt @@ -7,6 +7,5 @@ The forum "{FORUM_NAME}" received a new topic "{TOPIC_TITLE}"