-rw-r--r-- | korganizer/koeventviewer.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 92d2a80..c0acf34 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp | |||
@@ -342,33 +342,33 @@ void KOEventViewer::appendEvent(Event *event, int mode ) | |||
342 | } else { | 342 | } else { |
343 | if (event->isMultiDay()) { | 343 | if (event->isMultiDay()) { |
344 | mText.append(i18n("<p><b>From:</b> %1</p> ") | 344 | mText.append(i18n("<p><b>From:</b> %1</p> ") |
345 | .arg(event->dtStartStr( shortDate))); | 345 | .arg(event->dtStartStr( shortDate))); |
346 | mText.append(i18n("<p><b>To:</b> %1</p>") | 346 | mText.append(i18n("<p><b>To:</b> %1</p>") |
347 | .arg(event->dtEndStr(shortDate))); | 347 | .arg(event->dtEndStr(shortDate))); |
348 | } else { | 348 | } else { |
349 | mText.append(i18n("<p><b>From:</b> %1 <b>To:</b> %2</p>") | 349 | mText.append(i18n("<p><b>From:</b> %1 <b>To:</b> %2</p>") |
350 | .arg(event->dtStartTimeStr()) | 350 | .arg(event->dtStartTimeStr()) |
351 | .arg(event->dtEndTimeStr())); | 351 | .arg(event->dtEndTimeStr())); |
352 | mText.append(i18n("<p><b>On:</b> %1</p> ") | 352 | mText.append(i18n("<p><b>On:</b> %1</p> ") |
353 | .arg(event->dtStartDateStr( shortDate ))); | 353 | .arg(event->dtStartDateStr( shortDate ))); |
354 | } | 354 | } |
355 | } | 355 | } |
356 | if (!event->location().isEmpty()) { | 356 | if (!event->location().isEmpty()) { |
357 | addTag("p","<b>"+i18n("Location: ")+"</b>"+ deTag(event->location() ) ); | 357 | addTag("p","<b>"+i18n("Location: ")+"</b>"+ deTag(event->location() ) ); |
358 | mMailSubject += i18n(" at ") + event->location(); | 358 | mMailSubject += " (" + i18n("Location: ") + event->location() + ")"; |
359 | } | 359 | } |
360 | if (event->doesRecur()) { | 360 | if (event->doesRecur()) { |
361 | 361 | ||
362 | QString recurText = event->recurrenceText(); | 362 | QString recurText = event->recurrenceText(); |
363 | addTag("p","<em>" + i18n("This is a %1 recurring event.").arg(recurText ) + "</em>"); | 363 | addTag("p","<em>" + i18n("This is a %1 recurring event.").arg(recurText ) + "</em>"); |
364 | bool ok; | 364 | bool ok; |
365 | QDate start = QDate::currentDate(); | 365 | QDate start = QDate::currentDate(); |
366 | QDateTime next; | 366 | QDateTime next; |
367 | next = event->getNextOccurence( QDateTime::currentDateTime() , &ok ); | 367 | next = event->getNextOccurence( QDateTime::currentDateTime() , &ok ); |
368 | if ( ok ) { | 368 | if ( ok ) { |
369 | if ( wideScreen ){ | 369 | if ( wideScreen ){ |
370 | addTag("p",i18n("<b>Next recurrence is on:</b>") +" " + KGlobal::locale()->formatDate( next.date(), shortDate ) ); | 370 | addTag("p",i18n("<b>Next recurrence is on:</b>") +" " + KGlobal::locale()->formatDate( next.date(), shortDate ) ); |
371 | } else { | 371 | } else { |
372 | addTag("p",i18n("<b>Next recurrence is on:</b>") ); | 372 | addTag("p",i18n("<b>Next recurrence is on:</b>") ); |
373 | addTag("p", KGlobal::locale()->formatDate( next.date(), shortDate )); | 373 | addTag("p", KGlobal::locale()->formatDate( next.date(), shortDate )); |
374 | } | 374 | } |
@@ -501,39 +501,40 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) | |||
501 | mText.append("<br>"); | 501 | mText.append("<br>"); |
502 | mText += "</font>"; | 502 | mText += "</font>"; |
503 | mMailSubject += i18n("(cancelled)"); | 503 | mMailSubject += i18n("(cancelled)"); |
504 | } | 504 | } |
505 | 505 | ||
506 | 506 | ||
507 | 507 | ||
508 | if (event->doesRecur()) { | 508 | if (event->doesRecur()) { |
509 | 509 | ||
510 | QString recurText = event->recurrence()->recurrenceText(); | 510 | QString recurText = event->recurrence()->recurrenceText(); |
511 | addTag("p","<em>" + i18n("This is a %1 recurring todo.").arg(recurText ) + "</em>"); | 511 | addTag("p","<em>" + i18n("This is a %1 recurring todo.").arg(recurText ) + "</em>"); |
512 | 512 | ||
513 | } | 513 | } |
514 | if (event->hasStartDate()) { | 514 | if (event->hasStartDate()) { |
515 | mText.append(i18n("<p><b>Start on:</b> %1</p>").arg(event->dtStartStr(KOPrefs::instance()->mShortDateInViewer))); | 515 | mText.append(i18n("<p><b>Start on:</b> %1</p>").arg(event->dtStartStr(KOPrefs::instance()->mShortDateInViewer))); |
516 | } | 516 | } |
517 | if (!event->location().isEmpty()) { | ||
518 | mMailSubject += " (" + i18n("Location: ") + event->location() + ")"; | ||
519 | } | ||
517 | if (event->hasDueDate()) { | 520 | if (event->hasDueDate()) { |
518 | mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer))); | 521 | mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer))); |
519 | mMailSubject += i18n(" - " )+event->dtDueStr( true ); | ||
520 | } | 522 | } |
521 | if (!event->location().isEmpty()) { | 523 | if (!event->location().isEmpty()) { |
522 | addTag("p","<b>"+i18n("Location: ")+"</b>"+ deTag(event->location() ) ); | 524 | addTag("p","<b>"+i18n("Location: ")+"</b>"+ deTag(event->location() ) ); |
523 | mMailSubject += i18n(" at ") + event->location(); | ||
524 | } | 525 | } |
525 | mText.append(i18n("<p><b>Priority:</b> %2</p>") | 526 | mText.append(i18n("<p><b>Priority:</b> %2</p>") |
526 | .arg(QString::number(event->priority()))); | 527 | .arg(QString::number(event->priority()))); |
527 | 528 | ||
528 | if (event->isAlarmEnabled()) { | 529 | if (event->isAlarmEnabled()) { |
529 | Alarm *alarm =event->alarms().first() ; | 530 | Alarm *alarm =event->alarms().first() ; |
530 | QDateTime t = alarm->time(); | 531 | QDateTime t = alarm->time(); |
531 | if (event->doesRecur()) { | 532 | if (event->doesRecur()) { |
532 | bool ok = false; | 533 | bool ok = false; |
533 | int offset = 0; | 534 | int offset = 0; |
534 | QDateTime next = event->getNextAlarmDateTime(& ok, &offset, QDateTime::currentDateTime() ) ; | 535 | QDateTime next = event->getNextAlarmDateTime(& ok, &offset, QDateTime::currentDateTime() ) ; |
535 | if ( ok ) { | 536 | if ( ok ) { |
536 | t = next; | 537 | t = next; |
537 | } | 538 | } |
538 | } | 539 | } |
539 | QString s =i18n("( %1 before )").arg( alarm->offsetText() ); | 540 | QString s =i18n("( %1 before )").arg( alarm->offsetText() ); |