Fix a error to get wwrong Displayname 85/107885/1
authorKiseok Chang <kiso.chang@samsung.com>
Fri, 30 Dec 2016 11:45:47 +0000 (20:45 +0900)
committerKiseok Chang <kiso.chang@samsung.com>
Fri, 30 Dec 2016 11:47:38 +0000 (20:47 +0900)
- Add codes to consider daylight time

Change-Id: Ic1a5c010077c4df103933dbbe07b08e31f446b33
Signed-off-by: Kiseok Chang <kiso.chang@samsung.com>
setting-time/src/setting-time-main.c [changed mode: 0644->0755]

old mode 100644 (file)
new mode 100755 (executable)
index 92326bc..510e7e4
@@ -1668,7 +1668,8 @@ static char *get_timezone_displayname()
        i18n_error_code_e status = I18N_ERROR_NONE;
        i18n_uchar displayName[SETTING_STR_SLP_LEN] = {0, };
        char *timezone_str = NULL;
-       int32_t buf_size_needed;
+       int32_t buf_size_needed = 0;
+       i18n_ubool isIn = false;
        const char *localeID = NULL;
        i18n_ulocale_get_default(&localeID);
 
@@ -1687,11 +1688,19 @@ static char *get_timezone_displayname()
 
        /* get timezone display name (check dst) */
        if (cal) {
-               if (pdata)
-                       status = i18n_ucalendar_get_timezone_displayname(cal,
+               if (pdata) {
+                       i18n_ucalendar_is_in_daylight_time(cal, &isIn);
+                       if (isIn)
+                               status = i18n_ucalendar_get_timezone_displayname(cal,
                                        I18N_UCALENDAR_DST,
                                        localeID, displayName,
                                        SETTING_STR_SLP_LEN, &buf_size_needed);
+                        else
+                               status = i18n_ucalendar_get_timezone_displayname(cal,
+                                       I18N_UCALENDAR_STANDARD,
+                                       localeID, displayName,
+                                       SETTING_STR_SLP_LEN, &buf_size_needed);
+               }
 
                if (I18N_ERROR_NONE != status) {
                        SETTING_TRACE_ERROR("i18n_ucalendar_get_timezone_displayname got "