some fixes

5 files changed, 29 insertions, 20 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 7e7f8b7..b4e26c2 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -161,3 +161,3 @@
 { "(EmptyName)","(KeinName)" },
-{ "Enable Recurrence","Wiederholender Termin" },
+{ "Enable Recurrence","Wiederholung anschalten" },
 { "End after","Endet nach"},
@@ -1334,5 +1334,5 @@
 { "Number of max.displayed todo prios:","Anzahl max.angezeigter Todo-Prios:" },
-{ "","" },
-{ "","" },
-{ "","" },
+{ " on "," am " },
+{ "On: ","Am: " },
+{ "<i>The recurrence is computed from the start datetime!</i>","<i>Die Wiederholung wird vom Startwert aus berechnet!</i>" },
 { "","" },
diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index 2a49528..d4aa78c 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -378,16 +378,23 @@ void KOEditorGeneralEvent::emitDateTimeStr()
   KLocale *l = KGlobal::locale();
-
-  QString from,to;
-  if (mNoTimeButton->isChecked()) {
-    from = l->formatDate(mCurrStartDateTime.date());
-    to = l->formatDate(mCurrEndDateTime.date());
+  QString startString = "";
+  if ( mCurrStartDateTime.date() < mCurrEndDateTime.date()  ) {
+      if ( mNoTimeButton->isChecked() ) {
+          startString = i18n("From: ") + l->formatDate(mCurrStartDateTime.date() );
+          startString += "\n"+i18n("To: ")+ l->formatDate(mCurrEndDateTime.date());
+          
+      } else {
+          startString = i18n("From: ") +l->formatDateTime(mCurrStartDateTime, false);
+          startString += "\n"+i18n("To: ")+l->formatDateTime(mCurrEndDateTime, false);
+      }
   } else {
-    from = l->formatDateTime(mCurrStartDateTime);
-    to = l->formatDateTime(mCurrEndDateTime);
+      if ( mNoTimeButton->isChecked() ) {
+          startString = i18n("On: ") + l->formatDate(mCurrStartDateTime.date() );
+      } else {
+          startString = i18n("From: ") + KGlobal::locale()->formatTime(mCurrStartDateTime.time())+
+              "-"+KGlobal::locale()->formatTime(mCurrEndDateTime.time());
+          startString += i18n(" on ")+KGlobal::locale()->formatDate( mCurrStartDateTime.date(), true);
+      }
   }
-
-  QString str = i18n("From: %1   To: %2   %3").arg(from).arg(to)
-                .arg(mDurationLabel->text());
-
-  emit dateTimeStrChanged(str);
+  startString +="\n"+mDurationLabel->text();
+  emit dateTimeStrChanged(startString);
 }
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index bf81b01..01c5773 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -731,3 +731,3 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) :
 
-  mTimeGroupBox = new QGroupBox( 1, Horizontal, i18n("Appointment Time "),
+  mTimeGroupBox = new QGroupBox( 1, Horizontal, i18n("Time"),  
                                  this );
@@ -746,4 +746,4 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) :
 //  layoutTimeFrame->addWidget( mDateTimeLabel );
-
-
+  //mTimeGroupBox->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum ) );
+  //mDateTimeLabel->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum) );
   mRuleBox = new QGroupBox( 1, Horizontal, i18n("Recurrence Rule"), this );
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index 51e2524..6a05cc8 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -74,2 +74,3 @@ void KOTodoEditor::init()
   connect(mGeneral,SIGNAL(datesChecked()),this ,SLOT(checkRecurrence()));
+  mRecurrence->setDateTimeStr( i18n("<i>The recurrence is computed from the start datetime!</i>")  );
 }
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 94f4677..ffc4d9a 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1589,3 +1589,4 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
                     "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time());
-            if ( incidence->categories().contains( i18n("Birthday") ) || incidence->categories().contains( i18n("Anniversary") )  ) {
+
+            if ( incidence->isBirthday() || incidence->isAnniversary() ) {
                 bool ok;