From f60e0465114c13b6bc9ec905ecfd33f99ce264af Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 26 Oct 2015 15:10:39 +0000
Subject: [PATCH] fix sometimes shown old / no longer used delete dialog,
 buttons in new dialog were not translated and missing tooltip

---
 calendar/js/app.js                  | 13 ++++++-------
 calendar/templates/default/edit.xet | 15 ---------------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/calendar/js/app.js b/calendar/js/app.js
index 43a465ffb0..956a132959 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -145,7 +145,6 @@ app.classes.calendar = AppJS.extend(
 			case 'calendar.edit':
 				if (typeof content.data['conflicts'] == 'undefined')
 				{
-					$j(document.getElementById('calendar-edit_calendar-delete_series')).hide();
 					//Check if it's fallback from conflict window or it's from edit window
 					if (content.data['button_was'] != 'freetime')
 					{
@@ -874,21 +873,21 @@ app.classes.calendar = AppJS.extend(
 			var buttons = [
 				{
 					button_id: 'keep',
-					statustext:'All exceptions are converted into single events.',
-					text: 'Keep exceptions',
+					title: this.egw.lang('All exceptions are converted into single events.'),
+					text: this.egw.lang('Keep exceptions'),
 					id: 'button[delete_keep_exceptions]',
 					image: 'keep', "default":true
 				},
 				{
 					button_id: 'delete',
-					statustext:'The exceptions are deleted together with the series.',
-					text: 'Delete exceptions',
+					title: this.egw.lang('The exceptions are deleted together with the series.'),
+					text: this.egw.lang('Delete exceptions'),
 					id: 'button[delete_exceptions]',
 					image: 'delete'
 				},
 				{
 					button_id: 'cancel',
-					text: 'Cancel',
+					text: this.egw.lang('Cancel'),
 					id: 'dialog[cancel]',
 					image: 'cancel'
 				}
@@ -3032,4 +3031,4 @@ jQuery.extend(app.classes.calendar,{
 			etemplates: ['calendar.list']
 		})
 	}}
-);
\ No newline at end of file
+);
diff --git a/calendar/templates/default/edit.xet b/calendar/templates/default/edit.xet
index a675b70e8f..2c1184f13e 100644
--- a/calendar/templates/default/edit.xet
+++ b/calendar/templates/default/edit.xet
@@ -243,20 +243,6 @@
 	<template id="calendar.edit.history" template="" lang="" group="0" version="1.7.002">
 		<historylog id="history" options="history_status" width="100%" />
 	</template>
-	<template id="calendar.delete_series" template="" lang="" group="0" version="1.7.003">
-		<vbox>
-			<hbox class="promptheader">
-				<description value="This event is part of a series"/>
-			</hbox>
-			<vbox class="prompt">
-				<description value="Do you want to keep the series exceptions in your calendar?"/>
-				<hbox align="center">
-					<button statustext="All exceptions are converted into single events." label="Keep exceptions" id="button[delete_keep_exceptions]" image="keep" background_image="1"/>
-					<button statustext="The exceptions are deleted together with the series." label="Delete exceptions" id="button[delete_exceptions]" image="delete" background_image="1"/>
-				</hbox>
-			</vbox>
-		</vbox>
-	</template>
 	<template id="calendar.edit" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
 			<columns>
@@ -334,6 +320,5 @@
 			<checkbox label="Do not notify" id="no_notifications"/>
 			<button align="right" statustext="Delete this event" label="Delete" id="button[delete]" onclick="app.calendar.delete_btn(widget,$cont[query_delete_exceptions]);" image="delete" background_image="1"/>
 		</hbox>
-		<template id="calendar.delete_series"/>
 	</template>
 </overlay>