[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepimlibs/kcal
From:       Sergio Luis Martins <iamsergio () gmail ! com>
Date:       2010-06-20 1:56:55
Message-ID: 20100620015655.DC8D0AC8D9 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1140156 by smartins:

Fwd port r1140155 by smartins from branch 4.4 to trunk:

Crash even less.

MERGE: e35


 M  +6 -2      incidenceformatter.cpp  


--- trunk/KDE/kdepimlibs/kcal/incidenceformatter.cpp #1140155:1140156
@@ -3604,7 +3604,7 @@
   case Recurrence::rYearlyMonth:
   {
     if ( recur->duration() != -1 ) {
-      if ( !recur->yearDates().isEmpty() ) {
+      if ( !recur->yearDates().isEmpty() && !recur->yearMonths().isEmpty() ) {
         txt = i18ncp( "Recurs Every N years on month-name [1st|2nd|...]"
                       " until end-date",
                       "Recurs yearly on %2 %3 until %4",
@@ -3621,7 +3621,7 @@
         return txt;
       }
     }
-    if ( !recur->yearDates().isEmpty() ) {
+    if ( !recur->yearDates().isEmpty() && !recur->yearMonths().isEmpty() ) {
       return i18ncp( "Recurs Every N years on month-name [1st|2nd|...]",
                      "Recurs yearly on %2 %3",
                      "Recurs every %1 years on %2 %3",
@@ -3646,6 +3646,7 @@
     }
   }
   case Recurrence::rYearlyDay:
+    if ( !recur->yearDays().isEmpty() ) {
     if ( recur->duration() != -1 ) {
       txt = i18ncp( "Recurs every N years on day N until end-date",
                     "Recurs every year on day <numid>%2</numid> until %3",
@@ -3666,8 +3667,10 @@
                    "Recurs every <numid>%1</numid> years"
                    " on day <numid>%2</numid>",
                    recur->frequency(), recur->yearDays()[0] );
+    }
   case Recurrence::rYearlyPos:
   {
+    if ( !recur->yearMonths().isEmpty() && !recur->yearPositions().isEmpty() ) {
     KCal::RecurrenceRule::WDayPos rule = recur->yearPositions()[0];
     if ( recur->duration() != -1 ) {
       txt = i18ncp( "Every N years on the [2nd|3rd|...] weekdayname "
@@ -3696,6 +3699,7 @@
                    calSys->weekDayName( rule.day(), KCalendarSystem::LongDayName ),
                    calSys->monthName( recur->yearMonths()[0], recur->startDate().year() ) );
   }
+  }
   default:
     return i18n( "Incidence recurs" );
   }
[prev in list] [next in list] [prev in thread] [next in thread]