Revision: 1933
http://mrbs.svn.sourceforge.net/mrbs/?rev=1933&view=rev
Author: cimorrison
Date: 2011-09-07 09:13:31 +0000 (Wed, 07 Sep 2011)
Log Message:
-----------
Improved the message in email notifications for a list of deleted repeat
bookings
Modified Paths:
--------------
mrbs/trunk/web/functions_mail.inc
mrbs/trunk/web/lang.en
Modified: mrbs/trunk/web/functions_mail.inc
===================================================================
--- mrbs/trunk/web/functions_mail.inc 2011-09-07 08:42:58 UTC (rev 1932)
+++ mrbs/trunk/web/functions_mail.inc 2011-09-07 09:13:31 UTC (rev 1933)
@@ -401,7 +401,7 @@
// Generate a list of repeat dates for a series
-function create_repeat_list($data, $as_html)
+function create_repeat_list($data, $action, $as_html)
{
global $max_rep_entrys;
@@ -412,7 +412,14 @@
// The introductory text
$result = ($as_html) ? "<p>" : "\n\n";
- $result .= get_vocab("mail_body_repeats");
+ if (($action == "delete") || ($action == "reject"))
+ {
+ $result .= get_vocab("mail_body_repeats_deleted");
+ }
+ else
+ {
+ $result .= get_vocab("mail_body_repeats_booked");
+ }
$result .= ($as_html) ? "</p>\n" : "\n\n";
$reps = mrbsGetRepeatEntryList($data['start_time'],
@@ -741,7 +748,7 @@
// be booked due to conflicts.
if ($data['rep_type'] != REP_NONE)
{
- $body .= create_repeat_list($data, $as_html);
+ $body .= create_repeat_list($data, $action, $as_html);
}
if ($as_html)
Modified: mrbs/trunk/web/lang.en
===================================================================
--- mrbs/trunk/web/lang.en 2011-09-07 08:42:58 UTC (rev 1932)
+++ mrbs/trunk/web/lang.en 2011-09-07 09:13:31 UTC (rev 1933)
@@ -160,8 +160,9 @@
$vocab["mail_body_rej_entry"] = "An entry has been rejected by the
administrators, here are the details:";
$vocab["mail_body_more_info"] = "The administrators require more
information about an entry; here are the details:";
$vocab["mail_body_reminder"] = "Reminder - an entry is awaiting approval;
here are the details:";
-$vocab["mail_body_repeats"] = "The following dates were booked:";
-$vocab["mail_body_exceptions"] = "The following dates could not be booked
due to conflicts:";
+$vocab["mail_body_repeats_booked"] = "The following dates were booked:";
+$vocab["mail_body_repeats_deleted"] = "The following bookings were deleted:";
+$vocab["mail_body_exceptions"] = "The following dates could not be
booked due to conflicts:";
$vocab["mail_subject_new_entry"] = "Entry added for $mrbs_company MRBS";
$vocab["mail_subject_changed_entry"] = "Entry changed for $mrbs_company MRBS";
$vocab["mail_subject_delete"] = "Entry deleted for $mrbs_company MRBS";
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Using storage to extend the benefits of virtualization and iSCSI
Virtualization increases hardware utilization and delivers a new level of
agility. Learn what those decisions are and how to modernize your storage
and backup environments for virtualization.
http://www.accelacomm.com/jaw/sfnl/114/51434361/
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
