diff --git a/kcalutils/incidenceformatter.cpp b/kcalutils/incidenceformatter.cpp --- a/kcalutils/incidenceformatter.cpp +++ b/kcalutils/incidenceformatter.cpp @@ -4090,7 +4090,7 @@ static QString noRecurrence = i18n("No recurrence"); switch (recur->recurrenceType()) { case Recurrence::rNone: - return noRecurrence; + break; case Recurrence::rMinutely: if (recur->duration() != -1) { @@ -4407,6 +4407,21 @@ recurStr = i18n("%1 (excluding %2)", recurStr, exStr.join(QLatin1String(","))); } + l = recur->rDateTimes(); + QStringList rDateStr; + for (il = l.constBegin(); il != l.constEnd(); ++il) { + rDateStr << KGlobal::locale()->formatDate((*il).date(), KLocale::ShortDate); + } + + d = recur->rDates(); + for (dl = d.constBegin(); dl != d.constEnd(); ++dl) { + rDateStr << KGlobal::locale()->formatDate((*dl), KLocale::ShortDate); + } + + if (!rDateStr.isEmpty()) { + recurStr = i18n("%1 on %2", recurStr, rDateStr.join(QLatin1String(", "))); + } + return recurStr; }