From 855f41bb1f76276b2f84dd6ed0391fbfb6693038 Mon Sep 17 00:00:00 2001 From: Changyong Jeon Date: Thu, 27 Jun 2013 16:25:52 +0900 Subject: [PATCH] fix string resource issues Change-Id: Ic5d213ffb29788de639ba2d12653f6be9e6a81ca --- .cproject | 36 ++++++++++++++++++------------------ manifest.xml | 2 +- packaging/apps.Calendar.changes | 4 ++++ src/ClListPanel.cpp | 3 +-- src/ClTypes.cpp | 8 ++++---- 5 files changed, 28 insertions(+), 25 deletions(-) create mode 100644 packaging/apps.Calendar.changes diff --git a/.cproject b/.cproject index 69231bd..31deb4d 100644 --- a/.cproject +++ b/.cproject @@ -28,7 +28,7 @@ @@ -58,7 +57,7 @@ @@ -90,9 +88,9 @@ @@ -168,7 +168,7 @@ @@ -195,7 +194,7 @@ @@ -224,9 +222,9 @@ @@ -309,7 +309,7 @@ @@ -337,7 +336,7 @@ @@ -367,9 +365,9 @@ diff --git a/manifest.xml b/manifest.xml index 87068d5..acb8631 100644 --- a/manifest.xml +++ b/manifest.xml @@ -9,7 +9,7 @@ true - 2.1 + 2.2 http://tizen.org/privilege/calendar.read http://tizen.org/privilege/application.launch diff --git a/packaging/apps.Calendar.changes b/packaging/apps.Calendar.changes new file mode 100644 index 0000000..8fa2294 --- /dev/null +++ b/packaging/apps.Calendar.changes @@ -0,0 +1,4 @@ +* The Jun 27 2013 Changyong Jeon +- fix string resource issues. + + diff --git a/src/ClListPanel.cpp b/src/ClListPanel.cpp index 87ae5a0..889e4cd 100644 --- a/src/ClListPanel.cpp +++ b/src/ClListPanel.cpp @@ -365,8 +365,7 @@ ListPanel::CreateItem(int groupIndex, int itemIndex, int itemWidth) __pDateFormatter->Format(__pPm->GetViewMaxRange(), dateString); string = ResourceManager::GetString(IDS_LIST_VIEW_TAP_VIEW_AFTER); } - string.Append(L" "); - string.Append(dateString); + string.Format(string.GetLength() + dateString.GetLength(), string.GetPointer(), dateString.GetPointer()); pItem->Construct(Dimension(itemWidth, ITEM_HEIGHT), LIST_ANNEX_STYLE_NORMAL); pItem->AddElement(Rectangle(LEFT_MARGIN, 0, itemWidth - TOTAL_MARGIN, ITEM_HEIGHT) diff --git a/src/ClTypes.cpp b/src/ClTypes.cpp index 55f13eb..88ec511 100644 --- a/src/ClTypes.cpp +++ b/src/ClTypes.cpp @@ -146,10 +146,10 @@ const wchar_t* IDS_EMAIL_BODY_COMPLETE = L"IDS_EMAIL_BODY_COMPLETE"; const wchar_t* IDS_RSSR_BODY_FAILED_TO_IMPORT_FILE = L"IDS_RSSR_BODY_FAILED_TO_IMPORT_FILE"; const wchar_t* IDS_CLD_POP_MY_PHONE = L"IDS_CLD_POP_MY_PHONE"; const wchar_t* IDS_CLD_BODY_NO_DUE_DATE_M_NOUN = L"IDS_CLD_BODY_NO_DUE_DATE_M_NOUN"; -const wchar_t* IDS_LIST_VIEW_TAP_VIEW_BEFORE = L"IDS_LIST_VIEW_TAP_VIEW_BEFORE"; -const wchar_t* IDS_LIST_VIEW_TAP_VIEW_AFTER = L"IDS_LIST_VIEW_TAP_VIEW_AFTER"; -const wchar_t* IDS_EVENT_EDITOR_FROM = L"IDS_EVENT_EDITOR_FROM"; -const wchar_t* IDS_EVENT_EDITOR_TO = L"IDS_EVENT_EDITOR_TO"; +const wchar_t* IDS_LIST_VIEW_TAP_VIEW_BEFORE = L"IDS_CLD_BODY_TAP_TO_VIEW_EVENTS_BEFORE_P1SS"; +const wchar_t* IDS_LIST_VIEW_TAP_VIEW_AFTER = L"IDS_CLD_BODY_TAP_TO_VIEW_EVENTS_AFTER_P1SS"; +const wchar_t* IDS_EVENT_EDITOR_FROM = L"IDS_CLD_BODY_FROM"; +const wchar_t* IDS_EVENT_EDITOR_TO = L"IDS_CLD_POP_TO"; const wchar_t* IDS_CLD_BODY_ALL_DAY_EVENT = L"IDS_CLD_BODY_ALL_DAY_EVENT"; const wchar_t* IDS_REMINDER_CUSTOM_TIME_UNIT_MINUTE = L"IDS_REMINDER_CUSTOM_TIME_UNIT_MINUTE"; const wchar_t* IDS_REMINDER_CUSTOM_TIME_UNIT_HOUR = L"IDS_REMINDER_CUSTOM_TIME_UNIT_HOUR"; -- 2.7.4