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

List:       kde-commits
Subject:    kdepim/kalarm
From:       David Jarvie <software () astrojar ! org ! uk>
Date:       2003-11-24 1:17:12
[Download RAW message or body]

CVS commit by djarvie: 

Include error messages (temporarily untranslated during string freeze)


  M +2 -1      alarmcalendar.cpp   1.33
  M +3 -7      editdlg.cpp   1.105


--- kdepim/kalarm/alarmcalendar.cpp  #1.32:1.33
@@ -228,5 +228,6 @@ bool AlarmCalendar::saveCal(const QStrin
         {
                 kdError(5950) << "AlarmCalendar::saveCal(" << saveFilename << "): \
                failed.\n";
-#warning "Need user error message here"
+#warning "Temporary untranslated string"
+                KMessageBox::error(0, QString::fromLatin1("Failed to save calendar \
to\n'%1'").arg(mICalUrl.prettyURL()), kapp->aboutData()->programName());  return \
false;  }

--- kdepim/kalarm/editdlg.cpp  #1.104:1.105
@@ -761,15 +761,11 @@ void EditAlarmDlg::slotOk()
                                 // A timed recurrence has an entered start date \
                which
                                 // has already expired, so we must adjust it.
-// Temporary during i18n string freeze
-DateTime savedDT = mAlarmDateTime;
                                 KAlarmEvent event;
                                 getEvent(event);
                                 if (event.nextOccurrence(now, mAlarmDateTime) == \
KAlarmEvent::NO_OCCURRENCE)  {
-// Commented out due to i18n string freeze
-//                                      KMessageBox::sorry(this, i18n("Recurrence \
                has already expired"));
-//                                      return;
-// Temporary during i18n string freeze
-mAlarmDateTime = savedDT;
+#warning "Temporary untranslated string"
+                                        KMessageBox::sorry(this, \
QString::fromLatin1("Recurrence has already expired")); +                             \
return;  }
                         }


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