Fix for Issue N_SE-45108, N_SE-45069, N_SE-44843

[apps/osp/Calendar.git] / src / ClEventPresentationModel.cpp

diff --git a/src/ClEventPresentationModel.cpp b/src/ClEventPresentationModel.cpp
index 50a6800..6321ddc 100644 (file)
--- a/src/ClEventPresentationModel.cpp
+++ b/src/ClEventPresentationModel.cpp
@@ -256,12 +256,27 @@ EventPresentationModel::GetReminderString(int index) const
        switch (pReminder->GetTimeUnit())
        {
        case REMINDER_TIME_UNIT_MINUTE:
-               format = ResourceManager::GetString(IDS_REMINDER_MINUTE_BEFORE);
+               if (pReminder->GetTimeOffset() == 1)
+               {
+                       format = ResourceManager::GetString(IDS_REMINDER_1_MINUTE_BEFORE);
+               }
+               else
+               {
+                       format = ResourceManager::GetString(IDS_REMINDER_MINUTE_BEFORE);
+               }
                result.Format(format.GetLength() + Integer::ToString(pReminder->GetTimeOffset()).GetLength() + 1,
                                        format.GetPointer(), pReminder->GetTimeOffset());
                break;
        case REMINDER_TIME_UNIT_HOUR:
-               format = ResourceManager::GetString(IDS_REMINDER_HOUR_BEFORE);
+               if (pReminder->GetTimeOffset() == 1)
+               {
+                       format = ResourceManager::GetString(IDS_REMINDER_1_HOUR_BEFORE);
+               }
+               else
+               {
+                       format = ResourceManager::GetString(IDS_REMINDER_HOUR_BEFORE);
+               }
+
                result.Format(format.GetLength() + Integer::ToString(pReminder->GetTimeOffset()).GetLength() + 1,
                                        format.GetPointer(), pReminder->GetTimeOffset());
                break;
@@ -290,13 +305,29 @@ EventPresentationModel::GetReminderString(int index) const
                        break;
                }
 
-               format = ResourceManager::GetString(IDS_REMINDER_DAY_BEFORE);
+               if (pReminder->GetTimeOffset() == 1)
+               {
+                       format = ResourceManager::GetString(IDS_REMINDER_1_DAY_BEFORE);
+               }
+               else
+               {
+                       format = ResourceManager::GetString(IDS_REMINDER_DAY_BEFORE);
+               }
+
                result.Format(format.GetLength() + Integer::ToString(pReminder->GetTimeOffset()).GetLength() + 1,
                                        format.GetPointer(), pReminder->GetTimeOffset());
                break;
        }
        case REMINDER_TIME_UNIT_WEEK:
-               format = ResourceManager::GetString(IDS_REMINDER_WEEK_BEFORE);
+               if (pReminder->GetTimeOffset() == 1)
+               {
+                       format = ResourceManager::GetString(IDS_REMINDER_1_WEEK_BEFORE);
+               }
+               else
+               {
+                       format = ResourceManager::GetString(IDS_REMINDER_WEEK_BEFORE);
+               }
+
                result.Format(format.GetLength() + Integer::ToString(pReminder->GetTimeOffset()).GetLength() + 1,
                                        format.GetPointer(), pReminder->GetTimeOffset());
                break;