From ff45c9aa7c077fc0a03c64764917d1efcccf48f4 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sun, 9 Sep 2012 10:36:22 -0500 Subject: [ticket/11103] General notification email template. PHPBB3-11103 --- phpBB/language/en/email/notification.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 phpBB/language/en/email/notification.txt (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/email/notification.txt b/phpBB/language/en/email/notification.txt new file mode 100644 index 0000000000..ed35e96c85 --- /dev/null +++ b/phpBB/language/en/email/notification.txt @@ -0,0 +1,16 @@ +Subject: Notification from {SITENAME} + +Hello {USERNAME}, + +{MESSAGE} + +You can view this by clicking on the following link: + +{U_VIEW_MESSAGE} + + +You may unsubscribe by clicking on the following link: +{U_UNSUBSCRIBE} + + +{EMAIL_SIG} \ No newline at end of file -- cgit v1.2.1 From 3624d2c50ac1acca767c5642767102b97fd6b832 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sun, 9 Sep 2012 14:20:14 -0500 Subject: [ticket/11103] Use the language system, topic notifications PHPBB3-11103 --- phpBB/language/en/common.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index e6022e3b79..23f205dcc7 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -385,6 +385,9 @@ $lang = array_merge($lang, array( 'NOT_AUTHORISED' => 'You are not authorised to access this area.', 'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.', 'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.', + 'NOTIFICATION_PM' => '%1$s sent you a Private Message titled: %2$s.', + 'NOTIFICATION_POST' => '%1$s replied to the topic "%2$s".', + 'NOTIFICATION_TOPIC' => '%1$s posted a new topic "%2$s" in the forum "%3$s".', 'NOTIFY_ADMIN' => 'Please notify the board administrator or webmaster.', 'NOTIFY_ADMIN_EMAIL' => 'Please notify the board administrator or webmaster: %1$s', 'NO_ACCESS_ATTACHMENT' => 'You are not allowed to access this file.', -- cgit v1.2.1 From 9b1de1e487e162f55085ce72e660c5b348615649 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Wed, 12 Sep 2012 21:05:11 -0500 Subject: [ticket/11103] Add topic ID to view post URL PHPBB3-11103 --- phpBB/language/en/common.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 23f205dcc7..a437c924cf 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -385,7 +385,8 @@ $lang = array_merge($lang, array( 'NOT_AUTHORISED' => 'You are not authorised to access this area.', 'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.', 'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.', - 'NOTIFICATION_PM' => '%1$s sent you a Private Message titled: %2$s.', + 'NOTIFICATIONS' => '[ Notifications ]', + 'NOTIFICATION_PM' => '%1$s sent you a Private Message "%2$s".', 'NOTIFICATION_POST' => '%1$s replied to the topic "%2$s".', 'NOTIFICATION_TOPIC' => '%1$s posted a new topic "%2$s" in the forum "%3$s".', 'NOTIFY_ADMIN' => 'Please notify the board administrator or webmaster.', -- cgit v1.2.1 From 207bbdf48cb05abfb611f238e4ba07131131c74d Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Wed, 12 Sep 2012 23:55:29 -0500 Subject: [ticket/11103] Quote notifications PHPBB3-11103 --- phpBB/language/en/common.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index a437c924cf..75ca5c0000 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -388,6 +388,7 @@ $lang = array_merge($lang, array( 'NOTIFICATIONS' => '[ Notifications ]', 'NOTIFICATION_PM' => '%1$s sent you a Private Message "%2$s".', 'NOTIFICATION_POST' => '%1$s replied to the topic "%2$s".', + '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".', 'NOTIFY_ADMIN' => 'Please notify the board administrator or webmaster.', 'NOTIFY_ADMIN_EMAIL' => 'Please notify the board administrator or webmaster: %1$s', -- cgit v1.2.1 From ed1ec8e720a7ec3c1270cd631cc37e531f315f26 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Fri, 14 Sep 2012 16:54:20 -0500 Subject: [ticket/11103] Add/Update/Mark Read functions accept an array for the type This saves a lot of code in some areas (where the same data is sent, just for different types) Notifications for bookmarks PHPBB3-11103 --- phpBB/language/en/common.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 75ca5c0000..3e69c6bb03 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -386,6 +386,7 @@ $lang = array_merge($lang, array( 'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.', 'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.', 'NOTIFICATIONS' => '[ Notifications ]', + 'NOTIFICATION_BOOKMARK' => '%1$s replied to the topic "%2$s" you have bookmarked.', 'NOTIFICATION_PM' => '%1$s sent you a Private Message "%2$s".', 'NOTIFICATION_POST' => '%1$s replied to the topic "%2$s".', 'NOTIFICATION_QUOTE' => '%1$s quoted you in the post "%2$s".', -- cgit v1.2.1 From 959c81d00e830e89fa9d583ee93bf8f166013fe0 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Fri, 14 Sep 2012 18:05:13 -0500 Subject: [ticket/11103] Use appropriate email templates to send notifications Fixing a number of bugs PHPBB3-11103 --- phpBB/language/en/email/notification.txt | 16 ---------------- phpBB/language/en/email/notifications/bookmark.txt | 20 ++++++++++++++++++++ phpBB/language/en/email/notifications/quote.txt | 20 ++++++++++++++++++++ 3 files changed, 40 insertions(+), 16 deletions(-) delete mode 100644 phpBB/language/en/email/notification.txt create mode 100644 phpBB/language/en/email/notifications/bookmark.txt create mode 100644 phpBB/language/en/email/notifications/quote.txt (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/email/notification.txt b/phpBB/language/en/email/notification.txt deleted file mode 100644 index ed35e96c85..0000000000 --- a/phpBB/language/en/email/notification.txt +++ /dev/null @@ -1,16 +0,0 @@ -Subject: Notification from {SITENAME} - -Hello {USERNAME}, - -{MESSAGE} - -You can view this by clicking on the following link: - -{U_VIEW_MESSAGE} - - -You may unsubscribe by clicking on the following link: -{U_UNSUBSCRIBE} - - -{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/email/notifications/bookmark.txt b/phpBB/language/en/email/notifications/bookmark.txt new file mode 100644 index 0000000000..9888008604 --- /dev/null +++ b/phpBB/language/en/email/notifications/bookmark.txt @@ -0,0 +1,20 @@ +Subject: Topic reply notification - "{TOPIC_TITLE}" + +Hello {USERNAME}, + +You are receiving this notification because the 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} \ No newline at end of file diff --git a/phpBB/language/en/email/notifications/quote.txt b/phpBB/language/en/email/notifications/quote.txt new file mode 100644 index 0000000000..96fd527c8f --- /dev/null +++ b/phpBB/language/en/email/notifications/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_QUOTED_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} \ No newline at end of file -- cgit v1.2.1 From 05b573ebf76c737f89deaefd22ce963aa910e5d1 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sat, 15 Sep 2012 13:51:02 -0500 Subject: [ticket/11103] Topic and post dis/approval notifications Remove the formatted title function, plaintext is not needed since email templates are used Fix a number of bugs. PHPBB3-11103 --- phpBB/language/en/common.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 3e69c6bb03..4229b41fb8 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -385,12 +385,16 @@ $lang = array_merge($lang, array( 'NOT_AUTHORISED' => 'You are not authorised to access this area.', 'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.', 'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.', - 'NOTIFICATIONS' => '[ Notifications ]', - 'NOTIFICATION_BOOKMARK' => '%1$s replied to the topic "%2$s" you have bookmarked.', - 'NOTIFICATION_PM' => '%1$s sent you a Private Message "%2$s".', - 'NOTIFICATION_POST' => '%1$s replied to the topic "%2$s".', - '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".', + 'NOTIFICATIONS' => '[ Notifications ]', + 'NOTIFICATION_BOOKMARK' => '%1$s replied to the topic "%2$s" you have bookmarked.', + 'NOTIFICATION_PM' => '%1$s sent you a Private Message "%2$s".', + '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_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".', 'NOTIFY_ADMIN' => 'Please notify the board administrator or webmaster.', 'NOTIFY_ADMIN_EMAIL' => 'Please notify the board administrator or webmaster: %1$s', 'NO_ACCESS_ATTACHMENT' => 'You are not allowed to access this file.', -- cgit v1.2.1 From 7454d5c2d526f237bf24825b80edf6c9f1750fc6 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sat, 15 Sep 2012 14:33:15 -0500 Subject: [ticket/11103] Topic/Post in queue notification Also, bug fixes and cleanup PHPBB3-11103 --- phpBB/language/en/common.php | 2 ++ phpBB/language/en/email/notifications/post_in_queue.txt | 17 +++++++++++++++++ phpBB/language/en/email/notifications/quote.txt | 2 +- .../language/en/email/notifications/topic_in_queue.txt | 17 +++++++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 phpBB/language/en/email/notifications/post_in_queue.txt create mode 100644 phpBB/language/en/email/notifications/topic_in_queue.txt (limited to 'phpBB/language/en') 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: %1$s', '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 -- cgit v1.2.1 From 661dd09d6f44b46e5a30b37bb3425058f055ea01 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sun, 16 Sep 2012 23:03:00 -0500 Subject: [ticket/11103] Bug fix PHPBB3-11103 --- phpBB/language/en/email/notifications/topic_in_queue.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/email/notifications/topic_in_queue.txt b/phpBB/language/en/email/notifications/topic_in_queue.txt index 17c8b15880..e1ff486ac5 100644 --- a/phpBB/language/en/email/notifications/topic_in_queue.txt +++ b/phpBB/language/en/email/notifications/topic_in_queue.txt @@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}" Hello {USERNAME}, -You are receiving this notification because the topic , "{TOPIC_TITLE}" at "{SITENAME}" needs approval. +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} -- cgit v1.2.1 From 98731b127748af4673fdee92db2e139e84fd4d4b Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Thu, 20 Sep 2012 10:36:11 -0500 Subject: [ticket/11103] Prettify the output for prosilver. Create a way to mark items read from the output list. PHPBB3-11103 --- phpBB/language/en/common.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 90acd0854b..8ad7628891 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -347,6 +347,7 @@ $lang = array_merge($lang, array( 'MARK' => 'Mark', 'MARK_ALL' => 'Mark all', 'MARK_FORUMS_READ' => 'Mark forums read', + 'MARK_READ' => 'Mark read', 'MARK_SUBFORUMS_READ' => 'Mark subforums read', 'MB' => 'MB', 'MIB' => 'MiB', @@ -385,7 +386,7 @@ $lang = array_merge($lang, array( 'NOT_AUTHORISED' => 'You are not authorised to access this area.', 'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.', 'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.', - 'NOTIFICATIONS' => '[ Notifications ]', + 'NOTIFICATIONS' => 'Notifications', 'NOTIFICATION_BOOKMARK' => '%1$s replied to the topic "%2$s" you have bookmarked.', 'NOTIFICATION_PM' => '%1$s sent you a Private Message "%2$s".', 'NOTIFICATION_POST' => '%1$s replied to the topic "%2$s".', -- cgit v1.2.1 From e66117409c68242832f76cdb456d16c40573639e Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Wed, 26 Sep 2012 22:39:12 -0500 Subject: [ticket/11103] More work on the UCP Notifications page PHPBB3-11103 --- phpBB/language/en/ucp.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 648de587aa..85845d2b27 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -287,6 +287,18 @@ $lang = array_merge($lang, array( 'NEW_PASSWORD' => 'New password', 'NEW_PASSWORD_CONFIRM_EMPTY' => 'You did not enter a confirm password.', 'NEW_PASSWORD_ERROR' => 'The passwords you entered do not match.', + + 'NOTIFICATION_METHOD_EMAIL' => 'Email', + 'NOTIFICATION_METHOD_JABBER' => 'Jabber', + 'NOTIFICATION_TYPE' => 'Notification type', + 'NOTIFICATION_TYPE_BOOKMARK' => 'Someone replies to a topic you have bookmarked', + 'NOTIFICATION_TYPE_IN_MODERATION_QUEUE' => 'A post or topic needs approval', + 'NOTIFICATION_TYPE_MODERATION_QUEUE' => 'Your topics/posts are approved or disapproved by a moderator', + 'NOTIFICATION_TYPE_PM' => 'Someone sends you a private message', + 'NOTIFICATION_TYPE_POST' => 'Someone replies to a topic you are subscribed to', + 'NOTIFICATION_TYPE_QUOTE' => 'Someone quotes you in a post', + 'NOTIFICATION_TYPE_TOPIC' => 'Someone creates a topic in a forum you are subscribed to', + 'NOTIFY_METHOD' => 'Notification method', 'NOTIFY_METHOD_BOTH' => 'Both', 'NOTIFY_METHOD_EMAIL' => 'Email only', @@ -456,6 +468,8 @@ $lang = array_merge($lang, array( 'UCP_MSNM' => 'Windows Live Messenger', 'UCP_NO_ATTACHMENTS' => 'You have posted no files.', + 'UCP_NOTIFICATION_OPTIONS' => 'Notification Options', + 'UCP_PREFS' => 'Board preferences', 'UCP_PREFS_PERSONAL' => 'Edit global settings', 'UCP_PREFS_POST' => 'Edit posting defaults', -- cgit v1.2.1 From 544fbe35f4b5cd12e4556c9c300f471a4092dc41 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Wed, 26 Sep 2012 22:59:22 -0500 Subject: [ticket/11103] Some tweaks to the template output PHPBB3-11103 --- phpBB/language/en/ucp.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 85845d2b27..66662d2f63 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -288,16 +288,16 @@ $lang = array_merge($lang, array( 'NEW_PASSWORD_CONFIRM_EMPTY' => 'You did not enter a confirm password.', 'NEW_PASSWORD_ERROR' => 'The passwords you entered do not match.', - 'NOTIFICATION_METHOD_EMAIL' => 'Email', - 'NOTIFICATION_METHOD_JABBER' => 'Jabber', - 'NOTIFICATION_TYPE' => 'Notification type', - 'NOTIFICATION_TYPE_BOOKMARK' => 'Someone replies to a topic you have bookmarked', - 'NOTIFICATION_TYPE_IN_MODERATION_QUEUE' => 'A post or topic needs approval', - 'NOTIFICATION_TYPE_MODERATION_QUEUE' => 'Your topics/posts are approved or disapproved by a moderator', - 'NOTIFICATION_TYPE_PM' => 'Someone sends you a private message', - 'NOTIFICATION_TYPE_POST' => 'Someone replies to a topic you are subscribed to', - 'NOTIFICATION_TYPE_QUOTE' => 'Someone quotes you in a post', - 'NOTIFICATION_TYPE_TOPIC' => 'Someone creates a topic in a forum you are subscribed to', + 'NOTIFICATION_METHOD_EMAIL' => 'Email', + 'NOTIFICATION_METHOD_JABBER' => 'Jabber', + 'NOTIFICATION_TYPE' => 'Notification type', + 'NOTIFICATION_TYPE_BOOKMARK' => 'Someone replies to a topic you have bookmarked', + 'NOTIFICATION_TYPE_IN_MODERATION_QUEUE' => 'A post or topic needs approval', + 'NOTIFICATION_TYPE_MODERATION_QUEUE' => 'Your topics/posts are approved or disapproved by a moderator', + 'NOTIFICATION_TYPE_PM' => 'Someone sends you a private message', + 'NOTIFICATION_TYPE_POST' => 'Someone replies to a topic you are subscribed to', + 'NOTIFICATION_TYPE_QUOTE' => 'Someone quotes you in a post', + 'NOTIFICATION_TYPE_TOPIC' => 'Someone creates a topic in a forum you are subscribed to', 'NOTIFY_METHOD' => 'Notification method', 'NOTIFY_METHOD_BOTH' => 'Both', @@ -468,7 +468,7 @@ $lang = array_merge($lang, array( 'UCP_MSNM' => 'Windows Live Messenger', 'UCP_NO_ATTACHMENTS' => 'You have posted no files.', - 'UCP_NOTIFICATION_OPTIONS' => 'Notification Options', + 'UCP_NOTIFICATION_OPTIONS' => 'Notification options', 'UCP_PREFS' => 'Board preferences', 'UCP_PREFS_PERSONAL' => 'Edit global settings', -- cgit v1.2.1 From 48ccc9eb93c8413f05f6a50d40e597f560c671d8 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Thu, 27 Sep 2012 18:25:37 -0500 Subject: [ticket/11103] UCP Notification Options can now be set PHPBB3-11103 --- phpBB/language/en/common.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 8ad7628891..43bc6328fe 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -386,7 +386,10 @@ $lang = array_merge($lang, array( 'NOT_AUTHORISED' => 'You are not authorised to access this area.', 'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.', 'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.', - 'NOTIFICATIONS' => 'Notifications', + 'NOTIFICATIONS_CNT' => array( + 1 => '%d Notification', + 2 => '%d Notifications', + ), 'NOTIFICATION_BOOKMARK' => '%1$s replied to the topic "%2$s" you have bookmarked.', 'NOTIFICATION_PM' => '%1$s sent you a Private Message "%2$s".', 'NOTIFICATION_POST' => '%1$s replied to the topic "%2$s".', -- cgit v1.2.1 From dfb17f444ae560a0af1b242cfbf85008cd993816 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Thu, 27 Sep 2012 19:04:47 -0500 Subject: [ticket/11103] Fix module setup, add explanation to template PHPBB3-11103 --- phpBB/language/en/ucp.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 66662d2f63..843039635c 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -468,7 +468,8 @@ $lang = array_merge($lang, array( 'UCP_MSNM' => 'Windows Live Messenger', 'UCP_NO_ATTACHMENTS' => 'You have posted no files.', - 'UCP_NOTIFICATION_OPTIONS' => 'Notification options', + 'UCP_NOTIFICATION_OPTIONS' => 'Notification options', + 'UCP_NOTIFICATION_OPTIONS_EXPLAIN' => 'Here you can set your preferred notification methods for the board.', 'UCP_PREFS' => 'Board preferences', 'UCP_PREFS_PERSONAL' => 'Edit global settings', -- cgit v1.2.1 From 521992215cfaac6ae22421325fbcfb0c3fefecb7 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Thu, 27 Sep 2012 19:08:22 -0500 Subject: [ticket/11103] Language key needed in the UCP PHPBB3-11103 --- phpBB/language/en/ucp.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 843039635c..7ad860673b 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -288,6 +288,7 @@ $lang = array_merge($lang, array( 'NEW_PASSWORD_CONFIRM_EMPTY' => 'You did not enter a confirm password.', 'NEW_PASSWORD_ERROR' => 'The passwords you entered do not match.', + 'NOTIFICATIONS' => 'Notifications', 'NOTIFICATION_METHOD_EMAIL' => 'Email', 'NOTIFICATION_METHOD_JABBER' => 'Jabber', 'NOTIFICATION_TYPE' => 'Notification type', -- cgit v1.2.1 From 07fb66ac1090dfe92431ed749b520115595f7927 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Thu, 4 Oct 2012 14:31:00 -0500 Subject: [ticket/11103] Do not abbreviate template output PHPBB3-11103 --- phpBB/language/en/common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 43bc6328fe..f05ce5b175 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -386,7 +386,7 @@ $lang = array_merge($lang, array( 'NOT_AUTHORISED' => 'You are not authorised to access this area.', 'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.', 'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.', - 'NOTIFICATIONS_CNT' => array( + 'NOTIFICATIONS_COUNT' => array( 1 => '%d Notification', 2 => '%d Notifications', ), -- cgit v1.2.1 From 0bab8ff777bcb82361b75441c085ee2e510db5cc Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Fri, 5 Oct 2012 13:43:03 -0500 Subject: [ticket/11103] ACP option to enable/disable notifications output in header PHPBB3-11103 --- phpBB/language/en/acp/common.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 5eb10d50b3..0096a84878 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -250,6 +250,8 @@ $lang = array_merge($lang, array( 'IP' => 'User IP', 'IP_HOSTNAME' => 'IP addresses or hostnames', + 'LOAD_NOTIFICATIONS' => 'Display Notifications', + 'LOAD_NOTIFICATIONS_EXPLAIN' => 'Display the notifications list on every page (typically in the header).', 'LOGGED_IN_AS' => 'You are logged in as:', 'LOGIN_ADMIN' => 'To administer the board you must be an authenticated user.', 'LOGIN_ADMIN_CONFIRM' => 'To administer the board you must re-authenticate yourself.', -- cgit v1.2.1 From 948bd69495175db6967c0f5e99c3e0ba31e1882a Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Fri, 5 Oct 2012 13:54:27 -0500 Subject: [ticket/11103] Move UCP Notification Options to Board Preferences tab Also rename to "Edit notification options" for consistency PHPBB3-11103 --- phpBB/language/en/ucp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 7ad860673b..78f863541c 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -469,7 +469,7 @@ $lang = array_merge($lang, array( 'UCP_MSNM' => 'Windows Live Messenger', 'UCP_NO_ATTACHMENTS' => 'You have posted no files.', - 'UCP_NOTIFICATION_OPTIONS' => 'Notification options', + 'UCP_NOTIFICATION_OPTIONS' => 'Edit notification options', 'UCP_NOTIFICATION_OPTIONS_EXPLAIN' => 'Here you can set your preferred notification methods for the board.', 'UCP_PREFS' => 'Board preferences', -- cgit v1.2.1 From b33e5273942c4f67e8168763eec224fd61edaa8f Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Tue, 9 Oct 2012 22:02:49 -0500 Subject: [ticket/11103] Working on report notifications (post/pm) PHPBB3-11103 --- phpBB/language/en/common.php | 1 + phpBB/language/en/email/notifications/report_post.txt | 17 +++++++++++++++++ phpBB/language/en/ucp.php | 1 + 3 files changed, 19 insertions(+) create mode 100644 phpBB/language/en/email/notifications/report_post.txt (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index f05ce5b175..ae487f7159 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -397,6 +397,7 @@ $lang = array_merge($lang, array( '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_REPORT' => 'A post "%1$s" was reported because "%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".', diff --git a/phpBB/language/en/email/notifications/report_post.txt b/phpBB/language/en/email/notifications/report_post.txt new file mode 100644 index 0000000000..f0863d346e --- /dev/null +++ b/phpBB/language/en/email/notifications/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} \ No newline at end of file diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 78f863541c..e2dbd542f9 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -298,6 +298,7 @@ $lang = array_merge($lang, array( 'NOTIFICATION_TYPE_PM' => 'Someone sends you a private message', 'NOTIFICATION_TYPE_POST' => 'Someone replies to a topic you are subscribed to', 'NOTIFICATION_TYPE_QUOTE' => 'Someone quotes you in a post', + 'NOTIFICATION_TYPE_REPORT' => 'Someone reports a post', 'NOTIFICATION_TYPE_TOPIC' => 'Someone creates a topic in a forum you are subscribed to', 'NOTIFY_METHOD' => 'Notification method', -- cgit v1.2.1 From 6d53bd4675e00419bcfcf476b03166b9774bebca Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Tue, 9 Oct 2012 22:28:41 -0500 Subject: [ticket/11103] Finishing up PM Report notifications PHPBB3-11103 --- phpBB/language/en/common.php | 3 ++- phpBB/language/en/email/notifications/report_pm.txt | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 phpBB/language/en/email/notifications/report_pm.txt (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index ae487f7159..cbf8e6ee4c 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -397,7 +397,8 @@ $lang = array_merge($lang, array( '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_REPORT' => 'A post "%1$s" was reported because "%2$s".', + 'NOTIFICATION_REPORT_PM' => 'A Private Message "%1$s" was reported because "%2$s".', + 'NOTIFICATION_REPORT_POST' => 'A post "%1$s" was reported because "%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".', diff --git a/phpBB/language/en/email/notifications/report_pm.txt b/phpBB/language/en/email/notifications/report_pm.txt new file mode 100644 index 0000000000..eeaa8ee9b9 --- /dev/null +++ b/phpBB/language/en/email/notifications/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} \ No newline at end of file -- cgit v1.2.1 From 1b56a1d6be12afb851a158a5e09965a6528d1435 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Thu, 11 Oct 2012 22:36:48 -0500 Subject: [ticket/11103] Finishing up report post/pm and adding report closed PHPBB3-11103 --- phpBB/language/en/common.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index cbf8e6ee4c..78ba02ed0f 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -397,8 +397,9 @@ $lang = array_merge($lang, array( '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_REPORT_PM' => 'A Private Message "%1$s" was reported because "%2$s".', - 'NOTIFICATION_REPORT_POST' => 'A post "%1$s" was reported because "%2$s".', + 'NOTIFICATION_REPORT_PM' => '%1$s reported a Private Message "%2$s" because "%3$s".', + 'NOTIFICATION_REPORT_POST' => '%1$s reported a post "%2$s" because "%3$s".', + 'NOTIFICATION_REPORT_CLOSED' => '%1$s closed the report you made for "%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".', -- cgit v1.2.1 From cb937841269017d13058208378e4c9ad79718c6e Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sat, 13 Oct 2012 20:02:38 -0500 Subject: [ticket/11103] UCP Notification List PHPBB3-11103 --- phpBB/language/en/ucp.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index e2dbd542f9..d75609880b 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -289,6 +289,9 @@ $lang = array_merge($lang, array( 'NEW_PASSWORD_ERROR' => 'The passwords you entered do not match.', 'NOTIFICATIONS' => 'Notifications', + 'NOTIFICATIONS_MARK_ALL_READ' => 'Mark all notifications read', + 'NOTIFICATIONS_MARK_ALL_READ_CONFIRM' => 'Are you sure you want to mark all notifications read?', + 'NOTIFICATIONS_MARK_ALL_READ_SUCCESS' => 'All notifications have been marked read successfully.', 'NOTIFICATION_METHOD_EMAIL' => 'Email', 'NOTIFICATION_METHOD_JABBER' => 'Jabber', 'NOTIFICATION_TYPE' => 'Notification type', @@ -470,6 +473,8 @@ $lang = array_merge($lang, array( 'UCP_MSNM' => 'Windows Live Messenger', 'UCP_NO_ATTACHMENTS' => 'You have posted no files.', + 'UCP_NOTIFICATION_LIST' => 'Manage notifications', + 'UCP_NOTIFICATION_LIST_EXPLAIN' => 'Here you may view all past notifications.', 'UCP_NOTIFICATION_OPTIONS' => 'Edit notification options', 'UCP_NOTIFICATION_OPTIONS_EXPLAIN' => 'Here you can set your preferred notification methods for the board.', -- cgit v1.2.1 From c5f280351a96aaebd90c27da095c9b1ff28624a5 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sat, 13 Oct 2012 23:52:49 -0500 Subject: [ticket/11103] UCP Notification option grouping Also add the ability to specify an _EXPLAIN text for the notification option PHPBB3-11103 --- phpBB/language/en/ucp.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index d75609880b..1d17ed5caf 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -292,6 +292,9 @@ $lang = array_merge($lang, array( 'NOTIFICATIONS_MARK_ALL_READ' => 'Mark all notifications read', 'NOTIFICATIONS_MARK_ALL_READ_CONFIRM' => 'Are you sure you want to mark all notifications read?', 'NOTIFICATIONS_MARK_ALL_READ_SUCCESS' => 'All notifications have been marked read successfully.', + 'NOTIFICATION_GROUP_MISCELLANEOUS' => 'Miscellaneous Notifications', + 'NOTIFICATION_GROUP_MODERATION' => 'Moderation Notifications', + 'NOTIFICATION_GROUP_POSTING' => 'Posting Notifications', 'NOTIFICATION_METHOD_EMAIL' => 'Email', 'NOTIFICATION_METHOD_JABBER' => 'Jabber', 'NOTIFICATION_TYPE' => 'Notification type', -- cgit v1.2.1 From 716635c834dd2d6644f3d47c67f7184f95a35c0b Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sun, 14 Oct 2012 10:58:23 -0500 Subject: [ticket/11103] Fix some language strings Newlines at end of email files PHPBB3-11103 --- phpBB/language/en/common.php | 8 ++++---- phpBB/language/en/email/notifications/bookmark.txt | 4 ++-- phpBB/language/en/email/notifications/post_in_queue.txt | 2 +- phpBB/language/en/email/notifications/quote.txt | 2 +- phpBB/language/en/email/notifications/report_pm.txt | 2 +- phpBB/language/en/email/notifications/report_post.txt | 2 +- phpBB/language/en/email/notifications/topic_in_queue.txt | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 78ba02ed0f..2f9f646cd3 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -394,15 +394,15 @@ $lang = array_merge($lang, array( 'NOTIFICATION_PM' => '%1$s sent you a Private Message "%2$s".', '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_DISAPPROVED' => 'Your post "%1$s" was disapproved for reason: "%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_REPORT_PM' => '%1$s reported a Private Message "%2$s" because "%3$s".', - 'NOTIFICATION_REPORT_POST' => '%1$s reported a post "%2$s" because "%3$s".', + 'NOTIFICATION_REPORT_PM' => '%1$s reported a Private Message "%2$s" for reason: "%3$s".', + 'NOTIFICATION_REPORT_POST' => '%1$s reported a post "%2$s" for reason: "%3$s".', 'NOTIFICATION_REPORT_CLOSED' => '%1$s closed the report you made for "%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_DISAPPROVED' => 'Your topic "%1$s" was disapproved for reason: "%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: %1$s', diff --git a/phpBB/language/en/email/notifications/bookmark.txt b/phpBB/language/en/email/notifications/bookmark.txt index 9888008604..95f17b5693 100644 --- a/phpBB/language/en/email/notifications/bookmark.txt +++ b/phpBB/language/en/email/notifications/bookmark.txt @@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}" Hello {USERNAME}, -You are receiving this notification because the 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. +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} @@ -17,4 +17,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda {U_NOTIFICATION_SETTINGS} -{EMAIL_SIG} \ No newline at end of file +{EMAIL_SIG} diff --git a/phpBB/language/en/email/notifications/post_in_queue.txt b/phpBB/language/en/email/notifications/post_in_queue.txt index 5ce2b8fe09..5208182a70 100644 --- a/phpBB/language/en/email/notifications/post_in_queue.txt +++ b/phpBB/language/en/email/notifications/post_in_queue.txt @@ -14,4 +14,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda {U_NOTIFICATION_SETTINGS} -{EMAIL_SIG} \ No newline at end of file +{EMAIL_SIG} diff --git a/phpBB/language/en/email/notifications/quote.txt b/phpBB/language/en/email/notifications/quote.txt index 8b8584a794..0efcf7940c 100644 --- a/phpBB/language/en/email/notifications/quote.txt +++ b/phpBB/language/en/email/notifications/quote.txt @@ -17,4 +17,4 @@ If you no longer wish to receive updates about replies quoting you, please updat {U_NOTIFICATION_SETTINGS} -{EMAIL_SIG} \ No newline at end of file +{EMAIL_SIG} diff --git a/phpBB/language/en/email/notifications/report_pm.txt b/phpBB/language/en/email/notifications/report_pm.txt index eeaa8ee9b9..f515242893 100644 --- a/phpBB/language/en/email/notifications/report_pm.txt +++ b/phpBB/language/en/email/notifications/report_pm.txt @@ -11,4 +11,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda {U_NOTIFICATION_SETTINGS} -{EMAIL_SIG} \ No newline at end of file +{EMAIL_SIG} diff --git a/phpBB/language/en/email/notifications/report_post.txt b/phpBB/language/en/email/notifications/report_post.txt index f0863d346e..4ece935ccb 100644 --- a/phpBB/language/en/email/notifications/report_post.txt +++ b/phpBB/language/en/email/notifications/report_post.txt @@ -14,4 +14,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda {U_NOTIFICATION_SETTINGS} -{EMAIL_SIG} \ No newline at end of file +{EMAIL_SIG} diff --git a/phpBB/language/en/email/notifications/topic_in_queue.txt b/phpBB/language/en/email/notifications/topic_in_queue.txt index e1ff486ac5..782fc4d629 100644 --- a/phpBB/language/en/email/notifications/topic_in_queue.txt +++ b/phpBB/language/en/email/notifications/topic_in_queue.txt @@ -14,4 +14,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda {U_NOTIFICATION_SETTINGS} -{EMAIL_SIG} \ No newline at end of file +{EMAIL_SIG} -- cgit v1.2.1 From a48f09033810148fd9b2d5a0b6a683f14ac73a6a Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sun, 14 Oct 2012 12:35:35 -0500 Subject: [ticket/11103] Make sure notifications are marked read when clicking them How do we do this? If an item is unread, the URL to view that item will be the URL to mark it as read (index.php?mark_notification=$id). When the URL is visited it marks the item as read and redirects them to the correct URL for the item. If the item is read, the URL is directly to the item. Prettify the html output PHPBB-11103 --- phpBB/language/en/common.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 2f9f646cd3..8980c274ef 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -395,7 +395,7 @@ $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 for reason: "%2$s".', - 'NOTIFICATION_POST_IN_QUEUE' => 'A new post titled "%2$s" was posted by "%1$s" and needs approval.', + '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_REPORT_PM' => '%1$s reported a Private Message "%2$s" for reason: "%3$s".', 'NOTIFICATION_REPORT_POST' => '%1$s reported a post "%2$s" for reason: "%3$s".', @@ -403,7 +403,7 @@ $lang = array_merge($lang, array( '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 for reason: "%2$s".', - 'NOTIFICATION_TOPIC_IN_QUEUE' => 'A new topic titled "%2$s" was posted by "%1$s" and needs approval.', + '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: %1$s', 'NO_ACCESS_ATTACHMENT' => 'You are not allowed to access this file.', -- cgit v1.2.1 From 31502cdd6c3a5bac5164ec30530e5b4bf63f3196 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sun, 14 Oct 2012 12:45:04 -0500 Subject: [ticket/11103] Fix comma usage https://github.com/phpbb/phpbb3/pull/992#discussion_r1837084 PHPBB3-11103 --- phpBB/language/en/email/forum_notify.txt | 2 +- phpBB/language/en/email/newtopic_notify.txt | 2 +- phpBB/language/en/email/notifications/post_in_queue.txt | 2 +- phpBB/language/en/email/notifications/quote.txt | 2 +- phpBB/language/en/email/notifications/report_pm.txt | 2 +- phpBB/language/en/email/notifications/report_post.txt | 2 +- phpBB/language/en/email/notifications/topic_in_queue.txt | 2 +- phpBB/language/en/email/topic_notify.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt index fae5a83885..bbfd3ad7e7 100644 --- a/phpBB/language/en/email/forum_notify.txt +++ b/phpBB/language/en/email/forum_notify.txt @@ -2,7 +2,7 @@ Subject: Forum post 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 reply to the topic "{TOPIC_TITLE}" 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. +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}" 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. {U_NEWEST_POST} diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt index 529bbf0f8f..badc48b5a9 100644 --- a/phpBB/language/en/email/newtopic_notify.txt +++ b/phpBB/language/en/email/newtopic_notify.txt @@ -2,7 +2,7 @@ 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 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. +You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic 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} diff --git a/phpBB/language/en/email/notifications/post_in_queue.txt b/phpBB/language/en/email/notifications/post_in_queue.txt index 5208182a70..8d56ce6c4d 100644 --- a/phpBB/language/en/email/notifications/post_in_queue.txt +++ b/phpBB/language/en/email/notifications/post_in_queue.txt @@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}" Hello {USERNAME}, -You are receiving this notification because the post, "{POST_SUBJECT}" at "{SITENAME}" needs approval. +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} diff --git a/phpBB/language/en/email/notifications/quote.txt b/phpBB/language/en/email/notifications/quote.txt index 0efcf7940c..2b9525801f 100644 --- a/phpBB/language/en/email/notifications/quote.txt +++ b/phpBB/language/en/email/notifications/quote.txt @@ -2,7 +2,7 @@ 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. +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} diff --git a/phpBB/language/en/email/notifications/report_pm.txt b/phpBB/language/en/email/notifications/report_pm.txt index f515242893..66ae82d074 100644 --- a/phpBB/language/en/email/notifications/report_pm.txt +++ b/phpBB/language/en/email/notifications/report_pm.txt @@ -2,7 +2,7 @@ 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. +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} diff --git a/phpBB/language/en/email/notifications/report_post.txt b/phpBB/language/en/email/notifications/report_post.txt index 4ece935ccb..46983be1ed 100644 --- a/phpBB/language/en/email/notifications/report_post.txt +++ b/phpBB/language/en/email/notifications/report_post.txt @@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}" Hello {USERNAME}, -You are receiving this notification because the post, "{POST_SUBJECT}" at "{SITENAME}" was reported. +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} diff --git a/phpBB/language/en/email/notifications/topic_in_queue.txt b/phpBB/language/en/email/notifications/topic_in_queue.txt index 782fc4d629..ae8f9e2484 100644 --- a/phpBB/language/en/email/notifications/topic_in_queue.txt +++ b/phpBB/language/en/email/notifications/topic_in_queue.txt @@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}" Hello {USERNAME}, -You are receiving this notification because the topic, "{TOPIC_TITLE}" at "{SITENAME}" needs approval. +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} diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt index 99587b28e0..a6a3d2df36 100644 --- a/phpBB/language/en/email/topic_notify.txt +++ b/phpBB/language/en/email/topic_notify.txt @@ -2,7 +2,7 @@ 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 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. +You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic 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} -- cgit v1.2.1 From 61a1467c90e865f43c359bb8678d27b5e571f21f Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Tue, 16 Oct 2012 16:47:18 -0500 Subject: [ticket/11103] U_VIEW_ALL_NOTIFICATIONS Link PHPBB3-11103 --- phpBB/language/en/common.php | 2 ++ phpBB/language/en/ucp.php | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 8980c274ef..75c681e86a 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -386,6 +386,7 @@ $lang = array_merge($lang, array( 'NOT_AUTHORISED' => 'You are not authorised to access this area.', 'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.', 'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.', + 'NOTIFICATIONS' => 'Notifications', 'NOTIFICATIONS_COUNT' => array( 1 => '%d Notification', 2 => '%d Notifications', @@ -591,6 +592,7 @@ $lang = array_merge($lang, array( 'SEARCH_UNREAD' => 'View unread posts', 'SEARCH_USER_POSTS' => 'Search user’s posts', 'SECONDS' => 'Seconds', + 'SEE_ALL' => 'See All', 'SELECT' => 'Select', 'SELECT_ALL_CODE' => 'Select all', 'SELECT_DESTINATION_FORUM' => 'Please select a destination forum', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 1d17ed5caf..a09f0a62a1 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -288,7 +288,6 @@ $lang = array_merge($lang, array( 'NEW_PASSWORD_CONFIRM_EMPTY' => 'You did not enter a confirm password.', 'NEW_PASSWORD_ERROR' => 'The passwords you entered do not match.', - 'NOTIFICATIONS' => 'Notifications', 'NOTIFICATIONS_MARK_ALL_READ' => 'Mark all notifications read', 'NOTIFICATIONS_MARK_ALL_READ_CONFIRM' => 'Are you sure you want to mark all notifications read?', 'NOTIFICATIONS_MARK_ALL_READ_SUCCESS' => 'All notifications have been marked read successfully.', -- cgit v1.2.1 From 6861af22eecfa4a254eb62245ee109d8e5635f93 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sat, 20 Oct 2012 19:19:26 -0500 Subject: [ticket/11103] Message of no notifications if you have none PHPBB3-11103 --- phpBB/language/en/common.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 75c681e86a..f3c597af89 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -382,6 +382,7 @@ $lang = array_merge($lang, array( 'NEXT_STEP' => 'Next', 'NEVER' => 'Never', 'NO' => 'No', + 'NO_NOTIFICATIONS' => 'You have no notifications', 'NOT_ALLOWED_MANAGE_GROUP' => 'You are not allowed to manage this group.', 'NOT_AUTHORISED' => 'You are not authorised to access this area.', 'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.', -- cgit v1.2.1 From 94d682f77431add84867bb0b196ad0719b293606 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sat, 20 Oct 2012 20:54:18 -0500 Subject: [ticket/11103] Use the full class name as the item_type/method This is going to require you recreate the db tables. PHPBB3-11103 --- phpBB/language/en/ucp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 7c3960204a..5b1e7add02 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -295,8 +295,6 @@ $lang = array_merge($lang, array( 'NOTIFICATION_GROUP_MISCELLANEOUS' => 'Miscellaneous Notifications', 'NOTIFICATION_GROUP_MODERATION' => 'Moderation Notifications', 'NOTIFICATION_GROUP_POSTING' => 'Posting Notifications', - 'NOTIFICATION_METHOD_EMAIL' => 'Email', - 'NOTIFICATION_METHOD_JABBER' => 'Jabber', 'NOTIFICATION_TYPE' => 'Notification type', 'NOTIFICATION_TYPE_BOOKMARK' => 'Someone replies to a topic you have bookmarked', 'NOTIFICATION_TYPE_IN_MODERATION_QUEUE' => 'A post or topic needs approval', @@ -376,6 +374,8 @@ $lang = array_merge($lang, array( 'PASSWORD_UPDATED' => 'A new password was sent to your registered email address.', 'PERMISSIONS_RESTORED' => 'Successfully restored original permissions.', 'PERMISSIONS_TRANSFERRED' => 'Successfully transferred permissions from %s, you are now able to browse the board with this user’s permissions.
Please note that admin permissions were not transferred. You are able to revert to your permission set at any time.', + 'PHPBB_NOTIFICATION_METHOD_EMAIL' => 'Email', + 'PHPBB_NOTIFICATION_METHOD_JABBER' => 'Jabber', 'PM_DISABLED' => 'Private messaging has been disabled on this board.', 'PM_FROM' => 'From', 'PM_FROM_REMOVED_AUTHOR' => 'This message was sent by a user no longer registered.', -- cgit v1.2.1 From f09ee162528d931aabc3f216410d02d3a072c21d Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Fri, 9 Nov 2012 07:40:08 -0600 Subject: [ticket/11103] Use phpBB Container to load types/methods PHPBB3-11103 --- phpBB/language/en/ucp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 5b1e7add02..7c3960204a 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -295,6 +295,8 @@ $lang = array_merge($lang, array( 'NOTIFICATION_GROUP_MISCELLANEOUS' => 'Miscellaneous Notifications', 'NOTIFICATION_GROUP_MODERATION' => 'Moderation Notifications', 'NOTIFICATION_GROUP_POSTING' => 'Posting Notifications', + 'NOTIFICATION_METHOD_EMAIL' => 'Email', + 'NOTIFICATION_METHOD_JABBER' => 'Jabber', 'NOTIFICATION_TYPE' => 'Notification type', 'NOTIFICATION_TYPE_BOOKMARK' => 'Someone replies to a topic you have bookmarked', 'NOTIFICATION_TYPE_IN_MODERATION_QUEUE' => 'A post or topic needs approval', @@ -374,8 +376,6 @@ $lang = array_merge($lang, array( 'PASSWORD_UPDATED' => 'A new password was sent to your registered email address.', 'PERMISSIONS_RESTORED' => 'Successfully restored original permissions.', 'PERMISSIONS_TRANSFERRED' => 'Successfully transferred permissions from %s, you are now able to browse the board with this user’s permissions.
Please note that admin permissions were not transferred. You are able to revert to your permission set at any time.', - 'PHPBB_NOTIFICATION_METHOD_EMAIL' => 'Email', - 'PHPBB_NOTIFICATION_METHOD_JABBER' => 'Jabber', 'PM_DISABLED' => 'Private messaging has been disabled on this board.', 'PM_FROM' => 'From', 'PM_FROM_REMOVED_AUTHOR' => 'This message was sent by a user no longer registered.', -- cgit v1.2.1 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') 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 From b91ba8d5f1c05bc285e3f3b24fc5ffd50f6ee3ed Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sat, 8 Dec 2012 13:18:11 -0600 Subject: [ticket/11103] Newlines at end of files PHPBB3-11103 --- phpBB/language/en/email/newtopic_notify.txt | 2 +- phpBB/language/en/email/post_disapproved.txt | 2 +- phpBB/language/en/email/privmsg_notify.txt | 2 +- phpBB/language/en/email/short/newtopic_notify.txt | 2 +- phpBB/language/en/email/short/post_disapproved.txt | 2 +- phpBB/language/en/email/short/privmsg_notify.txt | 2 +- phpBB/language/en/email/short/topic_approved.txt | 2 +- phpBB/language/en/email/short/topic_disapproved.txt | 2 +- phpBB/language/en/email/short/topic_notify.txt | 2 +- phpBB/language/en/email/topic_approved.txt | 2 +- phpBB/language/en/email/topic_disapproved.txt | 2 +- phpBB/language/en/email/topic_notify.txt | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt index d4f5cae620..bf6799e5be 100644 --- a/phpBB/language/en/email/newtopic_notify.txt +++ b/phpBB/language/en/email/newtopic_notify.txt @@ -10,4 +10,4 @@ If you no longer wish to watch this forum you can either click the "Unsubscribe {U_STOP_WATCHING_FORUM} -{EMAIL_SIG} \ No newline at end of file +{EMAIL_SIG} diff --git a/phpBB/language/en/email/post_disapproved.txt b/phpBB/language/en/email/post_disapproved.txt index 3bc64bb611..2f8a8381cb 100644 --- a/phpBB/language/en/email/post_disapproved.txt +++ b/phpBB/language/en/email/post_disapproved.txt @@ -9,4 +9,4 @@ The following reason was given for the disapproval: {REASON} -{EMAIL_SIG} \ No newline at end of file +{EMAIL_SIG} diff --git a/phpBB/language/en/email/privmsg_notify.txt b/phpBB/language/en/email/privmsg_notify.txt index d3a86cc73c..41fdbb782c 100644 --- a/phpBB/language/en/email/privmsg_notify.txt +++ b/phpBB/language/en/email/privmsg_notify.txt @@ -12,4 +12,4 @@ You can view your new message by clicking on the following link: 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 +{EMAIL_SIG} diff --git a/phpBB/language/en/email/short/newtopic_notify.txt b/phpBB/language/en/email/short/newtopic_notify.txt index d4f5cae620..bf6799e5be 100644 --- a/phpBB/language/en/email/short/newtopic_notify.txt +++ b/phpBB/language/en/email/short/newtopic_notify.txt @@ -10,4 +10,4 @@ If you no longer wish to watch this forum you can either click the "Unsubscribe {U_STOP_WATCHING_FORUM} -{EMAIL_SIG} \ No newline at end of file +{EMAIL_SIG} diff --git a/phpBB/language/en/email/short/post_disapproved.txt b/phpBB/language/en/email/short/post_disapproved.txt index 3bc64bb611..2f8a8381cb 100644 --- a/phpBB/language/en/email/short/post_disapproved.txt +++ b/phpBB/language/en/email/short/post_disapproved.txt @@ -9,4 +9,4 @@ The following reason was given for the disapproval: {REASON} -{EMAIL_SIG} \ No newline at end of file +{EMAIL_SIG} diff --git a/phpBB/language/en/email/short/privmsg_notify.txt b/phpBB/language/en/email/short/privmsg_notify.txt index d3a86cc73c..41fdbb782c 100644 --- a/phpBB/language/en/email/short/privmsg_notify.txt +++ b/phpBB/language/en/email/short/privmsg_notify.txt @@ -12,4 +12,4 @@ You can view your new message by clicking on the following link: 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 +{EMAIL_SIG} diff --git a/phpBB/language/en/email/short/topic_approved.txt b/phpBB/language/en/email/short/topic_approved.txt index ffda378d30..0b09918b89 100644 --- a/phpBB/language/en/email/short/topic_approved.txt +++ b/phpBB/language/en/email/short/topic_approved.txt @@ -8,4 +8,4 @@ If you want to view the topic, click the following link: {U_VIEW_TOPIC} -{EMAIL_SIG} \ No newline at end of file +{EMAIL_SIG} diff --git a/phpBB/language/en/email/short/topic_disapproved.txt b/phpBB/language/en/email/short/topic_disapproved.txt index 49ef58bf39..a4bd9c151e 100644 --- a/phpBB/language/en/email/short/topic_disapproved.txt +++ b/phpBB/language/en/email/short/topic_disapproved.txt @@ -9,4 +9,4 @@ The following reason was given for the disapproval: {REASON} -{EMAIL_SIG} \ No newline at end of file +{EMAIL_SIG} diff --git a/phpBB/language/en/email/short/topic_notify.txt b/phpBB/language/en/email/short/topic_notify.txt index fa2481dd9a..472375fb22 100644 --- a/phpBB/language/en/email/short/topic_notify.txt +++ b/phpBB/language/en/email/short/topic_notify.txt @@ -17,4 +17,4 @@ If you no longer wish to watch this topic you can either click the "Unsubscribe {U_STOP_WATCHING_TOPIC} -{EMAIL_SIG} \ No newline at end of file +{EMAIL_SIG} diff --git a/phpBB/language/en/email/topic_approved.txt b/phpBB/language/en/email/topic_approved.txt index ffda378d30..0b09918b89 100644 --- a/phpBB/language/en/email/topic_approved.txt +++ b/phpBB/language/en/email/topic_approved.txt @@ -8,4 +8,4 @@ If you want to view the topic, click the following link: {U_VIEW_TOPIC} -{EMAIL_SIG} \ No newline at end of file +{EMAIL_SIG} diff --git a/phpBB/language/en/email/topic_disapproved.txt b/phpBB/language/en/email/topic_disapproved.txt index 49ef58bf39..a4bd9c151e 100644 --- a/phpBB/language/en/email/topic_disapproved.txt +++ b/phpBB/language/en/email/topic_disapproved.txt @@ -9,4 +9,4 @@ The following reason was given for the disapproval: {REASON} -{EMAIL_SIG} \ No newline at end of file +{EMAIL_SIG} diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt index fa2481dd9a..472375fb22 100644 --- a/phpBB/language/en/email/topic_notify.txt +++ b/phpBB/language/en/email/topic_notify.txt @@ -17,4 +17,4 @@ If you no longer wish to watch this topic you can either click the "Unsubscribe {U_STOP_WATCHING_TOPIC} -{EMAIL_SIG} \ No newline at end of file +{EMAIL_SIG} -- cgit v1.2.1 From 6dee2539419ba2c050830b7677294603a63b559a Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Sun, 9 Dec 2012 17:01:08 -0600 Subject: [ticket/11259] Make phpbb_admin_path available everywhere PHPBB3-11259 --- phpBB/language/en/install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 1c45deae11..f7820714e1 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -374,7 +374,7 @@ $lang = array_merge($lang, array( // Updater $lang = array_merge($lang, array( - 'ALL_FILES_UP_TO_DATE' => 'All files are up to date with the latest phpBB version. You should now login to your board and check if everything is working fine. Do not forget to delete, rename or move your install directory! Please send us updated information about your server and board configurations from the Send statistics module in your ACP.', + 'ALL_FILES_UP_TO_DATE' => 'All files are up to date with the latest phpBB version. You should now login to your board and check if everything is working fine. Do not forget to delete, rename or move your install directory! Please send us updated information about your server and board configurations from the Send statistics module in your ACP.', 'ARCHIVE_FILE' => 'Source file within archive', 'BACK' => 'Back', -- cgit v1.2.1 From 9affd6f7e7b95442f1ef14894858d8213f3fbd2a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 11 Jan 2013 00:41:03 +0100 Subject: [ticket/11201] Remove MSN/WLM fields WLM will be shutdown in March 2013. Skype is the new replacement. But as Skype uses a different login ID and service, the values in this field are useless. So we can safely remove the field and the links/functions we create. PHPBB3-11201 --- phpBB/language/en/acp/styles.php | 1 - phpBB/language/en/common.php | 3 --- phpBB/language/en/memberlist.php | 4 ---- phpBB/language/en/ucp.php | 1 - 4 files changed, 9 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index e7954ff148..3cb2e741ca 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -186,7 +186,6 @@ $lang = array_merge($lang, array( 'IMG_ICON_CONTACT_EMAIL' => 'Send email', 'IMG_ICON_CONTACT_ICQ' => 'ICQ', 'IMG_ICON_CONTACT_JABBER' => 'Jabber', - 'IMG_ICON_CONTACT_MSNM' => 'WLM', 'IMG_ICON_CONTACT_PM' => 'Send message', 'IMG_ICON_CONTACT_YAHOO' => 'YIM', 'IMG_ICON_CONTACT_WWW' => 'Website', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 6277457af7..6cad4136a2 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -368,7 +368,6 @@ $lang = array_merge($lang, array( 'MODERATORS' => 'Moderators', 'MONTH' => 'Month', 'MOVE' => 'Move', - 'MSNM' => 'WLM', 'NA' => 'N/A', 'NEWEST_USER' => 'Our newest member %s', @@ -627,7 +626,6 @@ $lang = array_merge($lang, array( 'TOO_LONG_INTERESTS' => 'The interests you entered is too long.', 'TOO_LONG_JABBER' => 'The Jabber account name you entered is too long.', 'TOO_LONG_LOCATION' => 'The location you entered is too long.', - 'TOO_LONG_MSN' => 'The WLM name you entered is too long.', 'TOO_LONG_NEW_PASSWORD' => 'The password you entered is too long.', 'TOO_LONG_OCCUPATION' => 'The occupation you entered is too long.', 'TOO_LONG_PASSWORD_CONFIRM' => 'The password confirmation you entered is too long.', @@ -648,7 +646,6 @@ $lang = array_merge($lang, array( 'TOO_SHORT_INTERESTS' => 'The interests you entered is too short.', 'TOO_SHORT_JABBER' => 'The Jabber account name you entered is too short.', 'TOO_SHORT_LOCATION' => 'The location you entered is too short.', - 'TOO_SHORT_MSN' => 'The WLM name you entered is too short.', 'TOO_SHORT_NEW_PASSWORD' => 'The password you entered is too short.', 'TOO_SHORT_OCCUPATION' => 'The occupation you entered is too short.', 'TOO_SHORT_PASSWORD_CONFIRM' => 'The password confirmation you entered is too short.', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index ec21e8e904..bc5a0c100b 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -78,9 +78,6 @@ $lang = array_merge($lang, array( 'IM_JABBER' => 'Please note that users may have selected to not receive unsolicited instant messages.', 'IM_JABBER_SUBJECT' => 'This is an automated message please do not reply! Message from user %1$s at %2$s.', 'IM_MESSAGE' => 'Your message', - 'IM_MSNM' => 'Please note that you need Windows Live Messenger installed to use this.', - 'IM_MSNM_BROWSER' => 'Your browser does not support this.', - 'IM_MSNM_CONNECT' => 'WLM is not connected.\nYou have to connect to WLM to continue.', 'IM_NAME' => 'Your Name', 'IM_NO_DATA' => 'There is no suitable contact information for this user.', 'IM_NO_JABBER' => 'Sorry, direct messaging of Jabber users is not supported on this board. You will need a Jabber client installed on your system to contact the recipient above.', @@ -123,7 +120,6 @@ $lang = array_merge($lang, array( 'SEND_IM' => 'Instant messaging', 'SEND_JABBER_MESSAGE' => 'Send Jabber message', 'SEND_MESSAGE' => 'Message', - 'SEND_MSNM_MESSAGE' => 'Send WLM message', 'SEND_YIM_MESSAGE' => 'Send YIM message', 'SORT_EMAIL' => 'Email', 'SORT_LAST_ACTIVE' => 'Last active', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 267ae00710..2eb34b3713 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -455,7 +455,6 @@ $lang = array_merge($lang, array( 'UCP_MAIN_FRONT' => 'Front page', 'UCP_MAIN_SUBSCRIBED' => 'Manage subscriptions', - 'UCP_MSNM' => 'Windows Live Messenger', 'UCP_NO_ATTACHMENTS' => 'You have posted no files.', 'UCP_PREFS' => 'Board preferences', -- cgit v1.2.1 From 1d5f8a2bbf13305f9ba651c7ed131911dbcfa016 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Wed, 16 Jan 2013 11:37:13 +0200 Subject: [ticket/11328] Add language variables for buttons New language variables for buttons PHPBB3-11328 --- phpBB/language/en/common.php | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 6cad4136a2..63241b71b5 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -119,6 +119,17 @@ $lang = array_merge($lang, array( 1 => 'Users browsing this forum: %2$s and %1$d guest', 2 => 'Users browsing this forum: %2$s and %1$d guests', ), + 'BUTTON_EDIT' => 'Edit', + 'BUTTON_FORUM_LOCKED' => 'Locked', + 'BUTTON_NEW_TOPIC' => 'New Topic', + 'BUTTON_PM' => 'PM', + 'BUTTON_PM_FORWARD' => 'Forward', + 'BUTTON_PM_NEW' => 'New PM', + 'BUTTON_PM_REPLY' => 'Send Reply', + 'BUTTON_PM_REPLY_ALL' => 'Reply All', + 'BUTTON_POST_REPLY' => 'Post Reply', + 'BUTTON_QUOTE' => 'Quote', + 'BUTTON_TOPIC_LOCKED' => 'Locked', 'BYTES' => 'Bytes', 'CANCEL' => 'Cancel', -- cgit v1.2.1 From cf3edb2c6e7f18e143e6627a8f9a5848df74f6ec Mon Sep 17 00:00:00 2001 From: Crizz0 Date: Sun, 27 Jan 2013 21:13:49 +0100 Subject: [ticket/11220] Improvement to the info pop-up from "list=" A improvement to the info popup which is displayed when the cursor is over the bbcode-button [list=] in the posting-editor PHPBB3-11220 --- phpBB/language/en/posting.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index 24f3204c57..dfc5065a05 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -54,9 +54,9 @@ $lang = array_merge($lang, array( 'BBCODE_IS_OFF' => '%sBBCode%s is OFF', 'BBCODE_IS_ON' => '%sBBCode%s is ON', 'BBCODE_I_HELP' => 'Italic text: [i]text[/i]', - 'BBCODE_L_HELP' => 'List: [list]text[/list]', - 'BBCODE_LISTITEM_HELP' => 'List item: [*]text[/*]', - 'BBCODE_O_HELP' => 'Ordered list: [list=]text[/list]', + 'BBCODE_L_HELP' => 'List: [list][*]text[/list]', + 'BBCODE_LISTITEM_HELP' => 'List item: [*]text', + 'BBCODE_O_HELP' => 'Ordered list: e.g. [list=1][*]First point[/list] or [list=a][*]Point a[/list]', 'BBCODE_P_HELP' => 'Insert image: [img]http://image_url[/img]', 'BBCODE_Q_HELP' => 'Quote text: [quote]text[/quote]', 'BBCODE_S_HELP' => 'Font colour: [color=red]text[/color] Tip: you can also use color=#FF0000', -- cgit v1.2.1 From 336187151a2010197ddda1bcdabc311fd10c1c87 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 4 Feb 2013 01:30:04 +0100 Subject: [ticket/11201] Revert WLM dropping because it is still used in China. Windows Live Messenger is still in use in china which accounts for ~20% of world population. Revert WLM dropping which has been merged under the assumption that WLM data and features are completely useless. This commit reverts commits - 460470229d972b93ef5a98b0d1d97a2a970d684f - 9affd6f7e7b95442f1ef14894858d8213f3fbd2a which have been merged by d59431691c27c73fba8ae9934b84b34a13280dd2. PHPBB3-11201 --- phpBB/language/en/acp/styles.php | 1 + phpBB/language/en/common.php | 3 +++ phpBB/language/en/memberlist.php | 4 ++++ phpBB/language/en/ucp.php | 1 + 4 files changed, 9 insertions(+) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index 3cb2e741ca..e7954ff148 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -186,6 +186,7 @@ $lang = array_merge($lang, array( 'IMG_ICON_CONTACT_EMAIL' => 'Send email', 'IMG_ICON_CONTACT_ICQ' => 'ICQ', 'IMG_ICON_CONTACT_JABBER' => 'Jabber', + 'IMG_ICON_CONTACT_MSNM' => 'WLM', 'IMG_ICON_CONTACT_PM' => 'Send message', 'IMG_ICON_CONTACT_YAHOO' => 'YIM', 'IMG_ICON_CONTACT_WWW' => 'Website', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 63241b71b5..8158209a68 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -379,6 +379,7 @@ $lang = array_merge($lang, array( 'MODERATORS' => 'Moderators', 'MONTH' => 'Month', 'MOVE' => 'Move', + 'MSNM' => 'WLM', 'NA' => 'N/A', 'NEWEST_USER' => 'Our newest member %s', @@ -637,6 +638,7 @@ $lang = array_merge($lang, array( 'TOO_LONG_INTERESTS' => 'The interests you entered is too long.', 'TOO_LONG_JABBER' => 'The Jabber account name you entered is too long.', 'TOO_LONG_LOCATION' => 'The location you entered is too long.', + 'TOO_LONG_MSN' => 'The WLM name you entered is too long.', 'TOO_LONG_NEW_PASSWORD' => 'The password you entered is too long.', 'TOO_LONG_OCCUPATION' => 'The occupation you entered is too long.', 'TOO_LONG_PASSWORD_CONFIRM' => 'The password confirmation you entered is too long.', @@ -657,6 +659,7 @@ $lang = array_merge($lang, array( 'TOO_SHORT_INTERESTS' => 'The interests you entered is too short.', 'TOO_SHORT_JABBER' => 'The Jabber account name you entered is too short.', 'TOO_SHORT_LOCATION' => 'The location you entered is too short.', + 'TOO_SHORT_MSN' => 'The WLM name you entered is too short.', 'TOO_SHORT_NEW_PASSWORD' => 'The password you entered is too short.', 'TOO_SHORT_OCCUPATION' => 'The occupation you entered is too short.', 'TOO_SHORT_PASSWORD_CONFIRM' => 'The password confirmation you entered is too short.', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index bc5a0c100b..ec21e8e904 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -78,6 +78,9 @@ $lang = array_merge($lang, array( 'IM_JABBER' => 'Please note that users may have selected to not receive unsolicited instant messages.', 'IM_JABBER_SUBJECT' => 'This is an automated message please do not reply! Message from user %1$s at %2$s.', 'IM_MESSAGE' => 'Your message', + 'IM_MSNM' => 'Please note that you need Windows Live Messenger installed to use this.', + 'IM_MSNM_BROWSER' => 'Your browser does not support this.', + 'IM_MSNM_CONNECT' => 'WLM is not connected.\nYou have to connect to WLM to continue.', 'IM_NAME' => 'Your Name', 'IM_NO_DATA' => 'There is no suitable contact information for this user.', 'IM_NO_JABBER' => 'Sorry, direct messaging of Jabber users is not supported on this board. You will need a Jabber client installed on your system to contact the recipient above.', @@ -120,6 +123,7 @@ $lang = array_merge($lang, array( 'SEND_IM' => 'Instant messaging', 'SEND_JABBER_MESSAGE' => 'Send Jabber message', 'SEND_MESSAGE' => 'Message', + 'SEND_MSNM_MESSAGE' => 'Send WLM message', 'SEND_YIM_MESSAGE' => 'Send YIM message', 'SORT_EMAIL' => 'Email', 'SORT_LAST_ACTIVE' => 'Last active', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 2eb34b3713..267ae00710 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -455,6 +455,7 @@ $lang = array_merge($lang, array( 'UCP_MAIN_FRONT' => 'Front page', 'UCP_MAIN_SUBSCRIBED' => 'Manage subscriptions', + 'UCP_MSNM' => 'Windows Live Messenger', 'UCP_NO_ATTACHMENTS' => 'You have posted no files.', 'UCP_PREFS' => 'Board preferences', -- cgit v1.2.1 From 293b65e3efbf94f6521acebe1b9f3e7bbca20286 Mon Sep 17 00:00:00 2001 From: David Tobin Date: Thu, 5 Jul 2012 02:47:49 +0100 Subject: [ticket/10896] Adds email validation to email settings in ACP Adds a new validation type to the ACP validate_config_vars function and implements it on the board_contact and board_email settings. PHPBB3-10896 --- phpBB/language/en/common.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 844d5ef3ef..9f8799b6d6 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -160,6 +160,7 @@ $lang = array_merge($lang, array( 'EDIT_POST' => 'Edit post', 'EMAIL' => 'E-mail', // Short form for EMAIL_ADDRESS 'EMAIL_ADDRESS' => 'E-mail address', + 'EMAIL_INVALID' => 'The email address you entered is invalid.', 'EMAIL_SMTP_ERROR_RESPONSE' => 'Ran into problems sending e-mail at Line %1$s. Response: %2$s.', 'EMPTY_SUBJECT' => 'You must specify a subject when posting a new topic.', 'EMPTY_MESSAGE_SUBJECT' => 'You must specify a subject when composing a new message.', -- cgit v1.2.1 From 5aec7600a68adb9466fb7ce034ba22070ac8a244 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Mon, 4 Feb 2013 23:13:47 -0600 Subject: [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID PHPBB3-10896 --- phpBB/language/en/common.php | 2 +- phpBB/language/en/ucp.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 9f8799b6d6..6dd390ed24 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -160,7 +160,7 @@ $lang = array_merge($lang, array( 'EDIT_POST' => 'Edit post', 'EMAIL' => 'E-mail', // Short form for EMAIL_ADDRESS 'EMAIL_ADDRESS' => 'E-mail address', - 'EMAIL_INVALID' => 'The email address you entered is invalid.', + 'EMAIL_INVALID_EMAIL' => 'The e-mail address you entered is invalid.', 'EMAIL_SMTP_ERROR_RESPONSE' => 'Ran into problems sending e-mail at Line %1$s. Response: %2$s.', 'EMPTY_SUBJECT' => 'You must specify a subject when posting a new topic.', 'EMPTY_MESSAGE_SUBJECT' => 'You must specify a subject when composing a new message.', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 5152c4b50b..0dce2961e5 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -176,7 +176,6 @@ $lang = array_merge($lang, array( 'EDIT_DRAFT_EXPLAIN' => 'Here you are able to edit your draft. Drafts do not contain attachment and poll information.', 'EMAIL_BANNED_EMAIL' => 'The e-mail address you entered is not allowed to be used.', - 'EMAIL_INVALID_EMAIL' => 'The e-mail address you entered is invalid.', 'EMAIL_REMIND' => 'This must be the e-mail address associated with your account. If you have not changed this via your user control panel then it is the e-mail address you registered your account with.', 'EMAIL_TAKEN_EMAIL' => 'The entered e-mail address is already in use.', 'EMPTY_DRAFT' => 'You must enter a message to submit your changes.', -- cgit v1.2.1 From babdb92aa998728b58eec1e3f2c036b5f2342492 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Thu, 10 Jan 2013 17:25:53 -0600 Subject: [feature/migrations] Remove hardcoded language, use lang instead. PHPBB3-9737 --- phpBB/language/en/install.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index f7820714e1..7607512eab 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -397,7 +397,10 @@ $lang = array_merge($lang, array( 'CURRENT_VERSION' => 'Current version', 'DATABASE_TYPE' => 'Database type', + 'DATABASE_UPDATE_COMPLETE' => 'Database updater has completed!', + 'DATABASE_UPDATE_CONTINUE' => 'Continue database update.', 'DATABASE_UPDATE_INFO_OLD' => 'The database update file within the install directory is outdated. Please make sure you uploaded the correct version of the file.', + 'DATABASE_UPDATE_NOT_COMPLETED' => 'The database update has not yet completed.', 'DELETE_USER_REMOVE' => 'Delete user and remove posts', 'DELETE_USER_RETAIN' => 'Delete user but keep posts', 'DESTINATION' => 'Destination file', -- cgit v1.2.1 From cacaffee6e013e43b75212d49960922f88f9f69a Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Sat, 9 Feb 2013 20:56:42 -0600 Subject: [feature/migrations] Add language strings for migrations errors Unfulfillable returns string of the missing dependency name now if the migration is unfulfillable (this is significantly more helpful). PHPBB3-11351 --- phpBB/language/en/migrator.php | 55 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 phpBB/language/en/migrator.php (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php new file mode 100644 index 0000000000..bc9fbc57af --- /dev/null +++ b/phpBB/language/en/migrator.php @@ -0,0 +1,55 @@ + 'The config setting "%s" unexpectedly already exists.', + 'CONFIG_NOT_EXIST' => 'The config setting "%s" unexpectedly does not exist.', + + 'GROUP_NOT_EXIST' => 'The group "%s" unexpectedly does not exist.', + + 'MIGRATION_NOT_FULFILLABLE' => 'The migration "%1$s" is not fulfillable, missing migration "%2$s".', + + 'MODULE_ALREADY_EXIST' => 'The module "%s" unexpectedly already exists.', + 'MODULE_ERROR' => 'An error occured while creating a module: %s', + 'MODULE_INFO_FILE_NOT_EXIST' => 'A required module info file is missing: %2$s', + 'MODULE_NOT_EXIST' => 'A required module does not exist: %s', + 'MODULE_NOT_REMOVABLE' => 'Module %1$s was unable to be removed: %2$s', + + 'PERMISSION_ALREADY_EXIST' => 'The permission setting "%s" unexpectedly already exists.', + 'PERMISSION_NOT_EXIST' => 'The permission setting "%s" unexpectedly does not exist.', + + 'ROLE_NOT_EXIST' => 'The permission role "%s" unexpectedly does not exist.', +)); -- cgit v1.2.1 From f409697137b0b1d01b663bb81d12f6179c3922e3 Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Sat, 9 Feb 2013 21:06:08 -0600 Subject: [feature/migrations] Add explanatory language string for migration errors This should be used if an exception is thrown to inform the user of what occurred. PHPBB3-11351 --- phpBB/language/en/migrator.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php index bc9fbc57af..84074c391c 100644 --- a/phpBB/language/en/migrator.php +++ b/phpBB/language/en/migrator.php @@ -40,6 +40,7 @@ $lang = array_merge($lang, array( 'GROUP_NOT_EXIST' => 'The group "%s" unexpectedly does not exist.', + 'MIGRATION_EXCEPTION_ERROR' => 'Something went wrong during the request and an exception was thrown. The changes made before the error occurred were reversed to the best of our abilities, but you should check the board for errors.', 'MIGRATION_NOT_FULFILLABLE' => 'The migration "%1$s" is not fulfillable, missing migration "%2$s".', 'MODULE_ALREADY_EXIST' => 'The module "%s" unexpectedly already exists.', -- cgit v1.2.1 From dc9cfcd613a722e65ac8645cf8e2d0b60d5fa21f Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Wed, 13 Feb 2013 13:30:05 -0600 Subject: [ticket/11103] Make the number of notifications strong if > 0 PHPBB3-11103 --- phpBB/language/en/common.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 5954ec0501..b747310e5e 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -403,8 +403,9 @@ $lang = array_merge($lang, array( 'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.', 'NOTIFICATIONS' => 'Notifications', 'NOTIFICATIONS_COUNT' => array( - 1 => '%d Notification', - 2 => '%d Notifications', + 0 => '%d Notifications', + 1 => '%d Notification', + 2 => '%d Notifications', ), 'NOTIFICATION_BOOKMARK' => '%1$s replied to the topic "%2$s" you have bookmarked.', 'NOTIFICATION_PM' => '%1$s sent you a Private Message "%2$s".', -- cgit v1.2.1 From db5a05418d251c65ee6cdc1571d4a23c5dd7a7fe Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Thu, 28 Feb 2013 17:48:46 -0600 Subject: [ticket/11103] Few more minor language things PHPBB3-11103 --- phpBB/language/en/ucp.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/language/en') diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 65a8711733..c8b0686a5b 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -290,7 +290,7 @@ $lang = array_merge($lang, array( 'NOTIFICATIONS_MARK_ALL_READ' => 'Mark all notifications read', 'NOTIFICATIONS_MARK_ALL_READ_CONFIRM' => 'Are you sure you want to mark all notifications read?', - 'NOTIFICATIONS_MARK_ALL_READ_SUCCESS' => 'All notifications have been marked read successfully.', + 'NOTIFICATIONS_MARK_ALL_READ_SUCCESS' => 'All notifications have been marked read.', 'NOTIFICATION_GROUP_MISCELLANEOUS' => 'Miscellaneous Notifications', 'NOTIFICATION_GROUP_MODERATION' => 'Moderation Notifications', 'NOTIFICATION_GROUP_POSTING' => 'Posting Notifications', @@ -301,10 +301,10 @@ $lang = array_merge($lang, array( 'NOTIFICATION_TYPE_IN_MODERATION_QUEUE' => 'A post or topic needs approval', 'NOTIFICATION_TYPE_MODERATION_QUEUE' => 'Your topics/posts are approved or disapproved by a moderator', 'NOTIFICATION_TYPE_PM' => 'Someone sends you a private message', - 'NOTIFICATION_TYPE_POST' => 'Someone replies to a topic you are subscribed to', + 'NOTIFICATION_TYPE_POST' => 'Someone replies to a topic to which you are subscribed', 'NOTIFICATION_TYPE_QUOTE' => 'Someone quotes you in a post', 'NOTIFICATION_TYPE_REPORT' => 'Someone reports a post', - 'NOTIFICATION_TYPE_TOPIC' => 'Someone creates a topic in a forum you are subscribed to', + 'NOTIFICATION_TYPE_TOPIC' => 'Someone creates a topic in a forum to which you are subscribed', 'NOTIFY_METHOD' => 'Notification method', 'NOTIFY_METHOD_BOTH' => 'Both', -- cgit v1.2.1