Skip to content

Commit

Permalink
[ticket/11471] Unrelated text in e-mail templates
Browse files Browse the repository at this point in the history 
Some e-mail templates contain text unrelated
with the subject of the e-mail

PHPBB3-11471
  • Loading branch information
@MGaetan89
MGaetan89 committed Apr 24, 2013
1 parent ab628cb commit 1f6f243
Show file tree
Hide file tree
Showing 20 changed files with 10 additions and 54 deletions.
1 change: 0 additions & 1 deletion phpBB/language/en/email/post_approved.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@ If you want to view the post, click the following link:
If you want to view the topic, click the following link:
{U_VIEW_TOPIC}


{EMAIL_SIG}
1 change: 0 additions & 1 deletion phpBB/language/en/email/post_disapproved.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ The following reason was given for the disapproval:

{REASON}


{EMAIL_SIG}
6 changes: 1 addition & 5 deletions phpBB/language/en/email/post_in_queue.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Subject: Topic reply notification - "{TOPIC_TITLE}"
Subject: Post moderation notification - "{TOPIC_TITLE}"

Hello {USERNAME},

Expand All @@ -10,8 +10,4 @@ If you want to view the post, click the following link:
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}
3 changes: 1 addition & 2 deletions phpBB/language/en/email/report_closed.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ Hello {USERNAME},

You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" 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.


{EMAIL_SIG}
{EMAIL_SIG}
3 changes: 1 addition & 2 deletions phpBB/language/en/email/report_deleted.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ 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.


{EMAIL_SIG}
{EMAIL_SIG}
6 changes: 1 addition & 5 deletions phpBB/language/en/email/report_pm.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Subject: Topic reply notification - "{TOPIC_TITLE}"
Subject: Private Message report - "{TOPIC_TITLE}"

Hello {USERNAME},

Expand All @@ -7,8 +7,4 @@ You are receiving this notification because a Private Message titled "{SUBJECT}"
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}
6 changes: 1 addition & 5 deletions phpBB/language/en/email/report_post.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Subject: Topic reply notification - "{TOPIC_TITLE}"
Subject: Post report - "{TOPIC_TITLE}"

Hello {USERNAME},

Expand All @@ -10,8 +10,4 @@ If you want to view the report, click the following link:
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}
1 change: 0 additions & 1 deletion phpBB/language/en/email/short/post_approved.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@ If you want to view the post, click the following link:
If you want to view the topic, click the following link:
{U_VIEW_TOPIC}


{EMAIL_SIG}
1 change: 0 additions & 1 deletion phpBB/language/en/email/short/post_disapproved.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ The following reason was given for the disapproval:

{REASON}


{EMAIL_SIG}
6 changes: 1 addition & 5 deletions phpBB/language/en/email/short/post_in_queue.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Subject: Topic reply notification - "{TOPIC_TITLE}"
Subject: Post moderation notification - "{TOPIC_TITLE}"

Hello {USERNAME},

Expand All @@ -10,8 +10,4 @@ If you want to view the post, click the following link:
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}
6 changes: 1 addition & 5 deletions phpBB/language/en/email/short/report_pm.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Subject: Topic reply notification - "{TOPIC_TITLE}"
Subject: Private Message report - "{TOPIC_TITLE}"

Hello {USERNAME},

Expand All @@ -7,8 +7,4 @@ You are receiving this notification because a Private Message titled "{SUBJECT}"
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}
6 changes: 1 addition & 5 deletions phpBB/language/en/email/short/report_post.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Subject: Topic reply notification - "{TOPIC_TITLE}"
Subject: Post report - "{TOPIC_TITLE}"

Hello {USERNAME},

Expand All @@ -10,8 +10,4 @@ If you want to view the report, click the following link:
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}
1 change: 0 additions & 1 deletion phpBB/language/en/email/short/topic_approved.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITE
If you want to view the topic, click the following link:
{U_VIEW_TOPIC}


{EMAIL_SIG}
1 change: 0 additions & 1 deletion phpBB/language/en/email/short/topic_disapproved.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ The following reason was given for the disapproval:

{REASON}


{EMAIL_SIG}
6 changes: 1 addition & 5 deletions phpBB/language/en/email/short/topic_in_queue.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Subject: Topic reply notification - "{TOPIC_TITLE}"
Subject: Topic moderation notification - "{TOPIC_TITLE}"

Hello {USERNAME},

Expand All @@ -10,8 +10,4 @@ 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 receive updates about replies to bookmarks, please update your notification settings here:

{U_NOTIFICATION_SETTINGS}

{EMAIL_SIG}
1 change: 0 additions & 1 deletion phpBB/language/en/email/topic_approved.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITE
If you want to view the topic, click the following link:
{U_VIEW_TOPIC}


{EMAIL_SIG}
1 change: 0 additions & 1 deletion phpBB/language/en/email/topic_disapproved.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ The following reason was given for the disapproval:

{REASON}


{EMAIL_SIG}
6 changes: 1 addition & 5 deletions phpBB/language/en/email/topic_in_queue.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Subject: Topic reply notification - "{TOPIC_TITLE}"
Subject: Topic moderation notification - "{TOPIC_TITLE}"

Hello {USERNAME},

Expand All @@ -10,8 +10,4 @@ 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 receive updates about replies to bookmarks, please update your notification settings here:

{U_NOTIFICATION_SETTINGS}

{EMAIL_SIG}
1 change: 0 additions & 1 deletion phpBB/language/en/email/user_reactivate_account.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ Please visit the following link to reactivate your account:

{U_ACTIVATE}


{EMAIL_SIG}
1 change: 0 additions & 1 deletion phpBB/language/en/email/user_resend_inactive.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ Please visit the following link in order to activate your account:

{U_ACTIVATE}


Thank you for registering.

{EMAIL_SIG}

0 comments on commit 1f6f243

Please sign in to comment.