Fix for N_SE-50992

Change-Id: I951419a6934e4b52933a8b4a3830ac53d6a0b3c8
Signed-off-by: Gaurav Bhatt <gaurav.bhatt@samsung.com>

diff --git a/inc/ClCalendarApp.h b/inc/ClCalendarApp.h
index efff176..0c0bbed 100644 (file)
--- a/inc/ClCalendarApp.h
+++ b/inc/ClCalendarApp.h
@@ -69,6 +69,7 @@ private:
        OperationType __type;
        RequestId __requestId;
        Tizen::Base::String __currentDisplayLang;
+       Tizen::Base::String __currentRegion;
        Tizen::Base::String __initialScene;
        Tizen::Base::String __mimeType;
        Tizen::Base::String __uriScheme;

diff --git a/src/ClCalendarApp.cpp b/src/ClCalendarApp.cpp
index b74dbe8..f9b8132 100644 (file)
--- a/src/ClCalendarApp.cpp
+++ b/src/ClCalendarApp.cpp
@@ -188,8 +188,10 @@ CalendarApp::OnAppInitialized(void)
                SettingInfo::AddSettingEventListener(*this);
        }
 
-       //Get Current Language Info
+       //Get Current Language Reigon Info
        SettingInfo::GetValue(KEY_SYSTEM_LANGUAGE, __currentDisplayLang);
+       SettingInfo::GetValue(KEY_SYSTEM_COUNTRY, __currentRegion);
+
 
        return true;
 }
@@ -349,13 +351,16 @@ CalendarApp::OnSettingChanged(String& key)
 {
        AppLogDebug("key: %ls", key.GetPointer());
        String changedLanguage;
+       String changedRegion;
        SettingInfo::GetValue(KEY_SYSTEM_LANGUAGE, changedLanguage);
+       SettingInfo::GetValue(KEY_SYSTEM_COUNTRY, changedRegion);
        if (key == KEY_SYSTEM_LANGUAGE
                || key == KEY_SYSTEM_COUNTRY
                || key == KEY_SYSTEM_TIME_ZONE
                || key == L"http://tizen.org/setting/font.size")
        {
-               if (!(key == KEY_SYSTEM_LANGUAGE && __currentDisplayLang.Equals(changedLanguage)))
+               if (!(key == KEY_SYSTEM_LANGUAGE && __currentDisplayLang.Equals(changedLanguage)) && !(key == KEY_SYSTEM_COUNTRY &&
+                               __currentRegion.Equals(changedRegion)))
                {
                        if (__type != OPERATION_TYPE_MAIN)
                        {