fixes

1 files changed, 12 insertions, 2 deletions

diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index dbe0668..bdad248 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -371,6 +371,5 @@ void KOEventViewer::appendEvent(Event *event, int mode )
         Alarm *alarm =event->alarms().first() ;
         QDateTime t = alarm->time();
-        int min = t.secsTo( event->dtStart() )/60;
-        QString s =i18n("( %1 min before )").arg( min );
+        QString s =i18n("( %1 before )").arg( alarm->offsetText() );
         addTag("p",i18n("<b>Alarm on: ") + s  +" </b>");
         addTag("p", KGlobal::locale()->formatDateTime( t, shortDate ));
@@ -470,4 +469,15 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
         mMailSubject += i18n(" - " )+event->dtDueStr(  true );
     }
+
+
+    if (event->isAlarmEnabled()) {
+        Alarm *alarm =event->alarms().first() ;
+        QDateTime t = alarm->time();
+        QString s =i18n("( %1 before )").arg( alarm->offsetText() );
+        addTag("p",i18n("<b>Alarm on: ") + s  +" </b>");
+        addTag("p", KGlobal::locale()->formatDateTime( t, shortDate ));
+        //addTag("p",s);
+    }
+
     addTag("b",i18n("Access: "));
     mText.append(event->secrecyStr()+"<br>");