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

List:       kde-commits
Subject:    KDE/kdepimlibs/kcalutils
From:       Allen Winter <winter () kde ! org>
Date:       2010-09-29 19:11:42
Message-ID: 20100929191142.9F32EAC88E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1181007 by winterz:

port forward SVN commit 1180954 by winterz:

be smarter about detecting when the sender's response status needs to be recording
when printing the attendee list in the invitation.

also, update a couple of invitation strings to be more accurate.
kolab/issue4483


 M  +9 -7      incidenceformatter.cpp  


--- trunk/KDE/kdepimlibs/kcalutils/incidenceformatter.cpp #1181006:1181007
@@ -2176,18 +2176,19 @@
   Attendee::List attendees = incidence->attendees();
   if ( !attendees.isEmpty() ) {
 
-    QString statusStr;
     Attendee::List::ConstIterator it;
     for ( it = attendees.constBegin(); it != attendees.constEnd(); ++it ) {
       Attendee::Ptr a = *it;
       if ( !iamAttendee( a ) ) {
+        QString statusStr = Stringify::attendeeStatus( a->status () );
         if ( sender && a->email() == sender->email() ) {
           // use the attendee taken from the response incidence,
           // rather than the attendee from the calendar incidence.
+          if ( a->status() != sender->status() ) {
+            statusStr = i18n( "%1 (<i>unrecorded</i>)",
+                              Stringify::attendeeStatus( sender->status() ) );
+          }
           a = sender;
-          statusStr = i18n( "%1 (<i>unrecorded</i>)", Stringify::attendeeStatus( a->status () ) );
-        } else {
-          statusStr = Stringify::attendeeStatus( a->status () );
         }
         count++;
         if ( count == 1 ) {
@@ -2802,7 +2803,7 @@
     html += "<i><u>";
     if ( rsvpRec && inc ) {
       if ( inc->revision() == 0 ) {
-        html += i18n( "Your <b>%1</b> response has already been recorded",
+        html += i18n( "Your <b>%1</b> response has been recorded",
                       Stringify::attendeeStatus( ea->status() ) );
       } else {
         html += i18n( "Your status for this invitation is <b>%1</b>",
@@ -2810,7 +2811,7 @@
       }
       rsvpReq = false;
     } else if ( msg->method() == iTIPCancel ) {
-      html += i18n( "This invitation was declined" );
+      html += i18n( "This invitation was canceled" );
     } else if ( msg->method() == iTIPAdd ) {
       html += i18n( "This invitation was accepted" );
     } else {
@@ -2912,7 +2913,8 @@
       }
       if ( ea && ( ea->status() != Attendee::NeedsAction ) && ( ea->status() == a->status() ) ) {
         html += tdOpen;
-        html += htmlAddTag( "i", i18n( "The response has already been recorded" ) );
+        html += htmlAddTag( "i", i18n( "The <b>%1</b> response has been recorded",
+                                       Stringify::attendeeStatus( ea->status() ) ) );
         html += tdClose;
       } else {
         if ( inc ) {
[prev in list] [next in list] [prev in thread] [next in thread]