Fixed Nabi issues N_SE-43611, N_SE-43441

[apps/osp/Settings.git] / src / StLanguageAndRegionForm.cpp

diff --git a/src/StLanguageAndRegionForm.cpp b/src/StLanguageAndRegionForm.cpp
index 4f27b5b..0ce1766 100644 (file)
--- a/src/StLanguageAndRegionForm.cpp
+++ b/src/StLanguageAndRegionForm.cpp
@@ -683,7 +683,15 @@ LocaleForm::CreateGroupItem(int groupIndex, int itemWidth)
                                tmpHeight = GetHeightForStringArea(groupText, itemWidth, fontSize);
                                itemHeight += tmpHeight;
 
-                               pDateFormatter->ApplyPattern("EEE, MMM dd, yyyy");
+                               String localPattern;
+                               if (SettingInfo::GetValue(L"http://tizen.org/setting/locale.date.format",localPattern) == E_SUCCESS)
+                               {
+                                       pDateFormatter->ApplyPattern(localPattern);
+                               }
+                               else
+                               {
+                                       pDateFormatter->ApplyPattern("EEE, MMM dd, yyyy");
+                               }
                                pDateFormatter->Format(dateTime, formattedString);
                                formattedString = dateText + L" : " + formattedString;
                                groupText.Insert(L"\n" + formattedString, groupText.GetLength());
@@ -1064,7 +1072,15 @@ LocaleForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupI
                                tempHeight = GetLineheight(groupText, labelWidth, fontSize, lineCount, lineHeight);
                                itemHeight += tempHeight;
 
-                               pDateFormatter->ApplyPattern("EEE, MMM dd, yyyy");
+                               String localPattern;
+                               if (SettingInfo::GetValue(L"http://tizen.org/setting/locale.date.format",localPattern) == E_SUCCESS)
+                               {
+                                       pDateFormatter->ApplyPattern(localPattern);
+                               }
+                               else
+                               {
+                                       pDateFormatter->ApplyPattern("EEE, MMM dd, yyyy");
+                               }
                                pDateFormatter->Format(dateTime, formattedString);
                                formattedString = dateText + L" : " + formattedString;
                                groupText.Insert(L"\n" + formattedString, groupText.GetLength());