backport: fiX a bug on Display Language Setting$ 96/197996/1
authorLukasz Stanislawski <l.stanislaws@samsung.com>
Thu, 17 Jan 2019 09:42:09 +0000 (10:42 +0100)
committerLukasz Stanislawski <l.stanislaws@samsung.com>
Thu, 17 Jan 2019 09:42:09 +0000 (10:42 +0100)
problem : handle wrong string with ".UTF-8" when set a key,
SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY

commit e6180d2f89d5d24c6dac27f4aabce54e2082ddba$
Author: Kiseok Chang <kiso.chang@samsung.com>$

Change-Id: I0228c826599cbc5ea0cd8f5f8eac7c8d4b2c2b16

setting-language-and-input/src/setting-display-language-view.c

index 449ba11963b0049e4bd64a6ef758f346f0f8f3e4..06c6aa288d0d836eaa3d05e5295e09f82e0cb5e7 100644 (file)
@@ -244,9 +244,14 @@ static void _close_popup_ex(void *data)
                        ad);
        if (ret == SETTING_RETURN_FAIL)
                SETTING_TRACE_ERROR("[Error] set date format fail");
+       FREE(pa_lang);
 
        char *lang = vconf_get_str(VCONFKEY_LANGSET);
        if (lang) {
+               char *q = strchr(lang, '.');
+               if (q)
+                       *q = '\0';
+
                ret = system_settings_set_value_string(
                                SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, lang);
                if (ret != 0) {
@@ -259,8 +264,6 @@ static void _close_popup_ex(void *data)
        /* Bundle send message */
        add_app_reply(&ad->md, "result", "rbutton_click");
        ui_app_exit();
-
-       FREE(pa_lang);
 }
 
 /**