From 20cd3a97f2ed55715bdb519e0c415e467b61e7fb Mon Sep 17 00:00:00 2001 From: "Bogomil Shopov (Kolab Systems)" Date: Fri, 5 Aug 2011 15:16:10 +0300 Subject: [PATCH] Making change notification more user friendly --- plugins/calendar/calendar.php | 3 ++- plugins/calendar/localization/en_US.inc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php index f64bd1dd..68a1c560 100644 --- a/plugins/calendar/calendar.php +++ b/plugins/calendar/calendar.php @@ -1327,7 +1327,7 @@ class calendar extends rcube_plugin $headers['To'] = format_email_recipient($mailto, $attendee['name']); $headers['Subject'] = $this->gettext(array( - 'name' => $is_cancelled ? 'eventcancelsubject' : ($is_new ? 'invitationsubject' : 'eventupdatesubject'), + 'name' => $is_cancelled ? 'eventcancelsubject' : ($is_new ? 'invitationsubject' : ($event['title'] ? 'eventupdatesubject':'eventupdatesubjectempty')), 'vars' => array('title' => $event['title']), )); @@ -1680,3 +1680,4 @@ class calendar extends rcube_plugin } } + diff --git a/plugins/calendar/localization/en_US.inc b/plugins/calendar/localization/en_US.inc index 0c9c697a..91851da7 100644 --- a/plugins/calendar/localization/en_US.inc +++ b/plugins/calendar/localization/en_US.inc @@ -118,6 +118,7 @@ $labels['noslotfound'] = 'Unable to find a free time slot'; $labels['invitationsubject'] = 'You\'ve been invited to "$title"'; $labels['invitationmailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nPlease find attached an iCalendar file with all the event details which you can import to your calendar application."; $labels['eventupdatesubject'] = '"$title" has been updated'; +$labels['eventupdatesubjectempty'] = 'An event that concerns you has been updated'; $labels['eventupdatemailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nPlease find attached an iCalendar file with the updated event details which you can import to your calendar application."; $labels['eventcancelsubject'] = '"$title" has been canceled'; $labels['eventcancelmailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nThe event has been cancelled by \$organizer.\n\nPlease find attached an iCalendar file with the updated event details."; @@ -182,4 +183,4 @@ $labels['futurevents'] = 'Future'; $labels['allevents'] = 'All'; $labels['saveasnew'] = 'Save as new'; -?> \ No newline at end of file +?>