diff -urN ../calendar.orig/calendar.php ./calendar.php --- ../calendar.orig/calendar.php 2015-02-25 13:49:03.000000000 +0200 +++ ./calendar.php 2015-03-15 20:58:29.000000000 +0200 @@ -355,6 +355,7 @@ } $no_override = array_flip((array)$this->rc->config->get('dont_override')); +$p['current'] = 1; $p['blocks']['view']['name'] = $this->gettext('mainoptions'); @@ -1162,7 +1163,7 @@ private function event_save_success(&$event, $old, $action, $success) { // $success is a new event ID - if ($success !== true) { + if (($action != 'remove') and ($action != 'edit') and ($success !== true)) { // send update notification on the main event if ($event['_savemode'] == 'future' && $event['_notify'] && $old['attendees'] && $old['recurrence_id']) { $master = $this->driver->get_event(array('id' => $old['recurrence_id'], 'calendar' => $old['calendar'])); @@ -1203,7 +1204,10 @@ // only notify if data really changed (TODO: do diff check on client already) if (!$old || $action == 'remove' || self::event_diff($event, $old)) { - $sent = $this->notify_attendees($event, $old, $action, $event['_comment']); + if ($action == 'remove') + $sent = $this->notify_attendees($old, $old, $action, $event['_comment']); + else + $sent = $this->notify_attendees($event, $old, $action, $event['_comment']); if ($sent > 0) $this->rc->output->show_message('calendar.itipsendsuccess', 'confirmation'); else if ($sent < 0) diff -urN ../calendar.orig/drivers/database/database_driver.php ./drivers/database/database_driver.php --- ../calendar.orig/drivers/database/database_driver.php 2015-02-25 13:49:03.000000000 +0200 +++ ./drivers/database/database_driver.php 2015-03-15 21:10:02.000000000 +0200 @@ -107,7 +107,7 @@ { // attempt to create a default calendar for this user if (empty($this->calendars)) { - if ($this->create_calendar(array('name' => 'Default', 'color' => 'cc0000', 'showalarms' => true))) + if ($this->create_calendar(array('name' => ($this->cal->gettext('default_calendar_name') ? $this->cal->gettext('default_calendar_name') : 'Default'), 'color' => 'cc0000', 'showalarms' => true))) $this->_read_calendars(); } diff -urN ../calendar.orig/localization/en_US.inc ./localization/en_US.inc --- ../calendar.orig/localization/en_US.inc 2015-02-25 13:49:03.000000000 +0200 +++ ./localization/en_US.inc 2015-03-15 21:10:45.000000000 +0200 @@ -36,6 +36,7 @@ // calendar $labels['calendar'] = 'Calendar'; $labels['calendars'] = 'Calendars'; +$labels['default_calendar_name'] = 'Default calendar'; $labels['category'] = 'Category'; $labels['categories'] = 'Categories'; $labels['createcalendar'] = 'Create new calendar'; diff -urN ../calendar.orig/localization/ru_RU.inc ./localization/ru_RU.inc --- ../calendar.orig/localization/ru_RU.inc 2015-02-25 13:49:03.000000000 +0200 +++ ./localization/ru_RU.inc 2015-03-15 21:13:23.000000000 +0200 @@ -29,6 +29,7 @@ $labels['afteraction'] = 'После того, как приглашение или сообщение о его изменении обработано'; $labels['calendar'] = 'Календарь'; $labels['calendars'] = 'Календари'; +$labels['default_calendar_name'] = 'Основной календарь'; $labels['category'] = 'Категория'; $labels['categories'] = 'Категории'; $labels['createcalendar'] = 'Создать новый календарь';