holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for wrong message on event-deletion (was: series deleted); corrected one german translation string

Browse Source
This commit is contained in:
Klaus Leithoff 2010-06-08 09:52:48 +00:00
parent b672e1941b
commit 0c60f43c61
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -424,6 +424,7 @@ class calendar_uiforms extends calendar_ui
'template' => $content['template'],
);
$noerror=true;
//error_log(__METHOD__.$button.'#'.array2string($content['edit_single']).'#');
switch((string)$button)
{
case 'exception': // create an exception in a recuring event
@ -604,7 +605,7 @@ class calendar_uiforms extends calendar_ui
case 'delete_exceptions': // series and user selected to delete the exceptions too
if ($this->bo->delete($event['id'],(int)$content['edit_single']))
{
if ($content['reference'] == 0 && !$content['edit_single'])
if ($content['reference'] == 0 && !$content['edit_single'] && $button != 'delete')
{
$msg = lang('Series deleted');
$delete_exceptions = $button == 'delete_exceptions';

2
calendar/lang/egw_de.lang
View File

@ -6,7 +6,7 @@
%1 records read (not yet imported, you may go back and uncheck test import) calendar de %1 Datensätze gelesen (noch nicht importiert, Sie können zurück gehen und Test Import ausschalten)
%1 weeks calendar de %1 Wochen
(%1 events in %2 seconds) calendar de (%1 Termine in %2 Sekunden
, exceptions preserved calendar de und Ausnahmen erhalten
, exceptions preserved calendar de und Ausnahmen erhalten
<b>please note</b>: the calendar use the holidays of your country, which is set to %1. you can change it in your %2.<br />holidays are %3 automatic installed from %4. you can changed it in %5. calendar de <b>Bitte beachten</b>: Der Kalender verwendet die Feiertages des Landes, welches auf %1 eingestellt ist. Das können Sie in Ihren %2 ändern.<br />Feiertage werden %3 automatisch von %4 installiert, was in %5 änderbar ist.
a non blocking event will not conflict with other events calendar de Ein nicht blockierender Termin ergibt keine Konflikt mit anderen Terminen
accept or reject an invitation calendar de Einladung zu- oder absagen