Fix UI of region setting

Change-Id: Iafe00beb1b26ba3a3fd06e135d4d749fca032928

diff --git a/setting-common/src/setting-common-draw-searchbar.c b/setting-common/src/setting-common-draw-searchbar.c
index 1cb646a..34e3e45 100755 (executable)
--- a/setting-common/src/setting-common-draw-searchbar.c
+++ b/setting-common/src/setting-common-draw-searchbar.c
@@ -174,7 +174,7 @@ Evas_Object *setting_create_searchbar(void *data, Evas_Object *parent,
        Evas_Object *cancel_btn = elm_button_add(searchbar_layout);
        elm_object_part_content_set(searchbar_layout, "button_cancel", cancel_btn);
        elm_object_style_set(cancel_btn, "searchbar/default");
-       elm_object_text_set(cancel_btn, _("Cancel"));
+       elm_object_text_set(cancel_btn, _("IDS_COM_SK_CANCEL"));
 
        if (!cancel_cb){
                cancel_cb = __searchbar_cancel_clicked_cb;

diff --git a/setting-phone/src/setting-phone-region-format.c b/setting-phone/src/setting-phone-region-format.c
index 29440c5..77627c8 100755 (executable)
--- a/setting-phone/src/setting-phone-region-format.c
+++ b/setting-phone/src/setting-phone-region-format.c
@@ -348,6 +348,7 @@ static Eina_Bool __region_genlist_update(void *data)
        ad->selected_region_idx = -1;
 
        int i = 0;
+       int noResult = TRUE;
        for (; i < ad->region_num; i++) {
                if (isEmptyStr(ad->search_text) ||
                      is_substr_ncase(ad->region_desc[i], ad->search_text)) {
@@ -369,6 +370,7 @@ static Eina_Bool __region_genlist_update(void *data)
                        if (!safeStrCmp(ad->region_vconf_str, ad->region_keyStr[i])) {
                                ad->selected_region_idx = i;
                        }
+                       noResult = FALSE;
                }
        }
 
@@ -376,6 +378,14 @@ static Eina_Bool __region_genlist_update(void *data)
                elm_radio_value_set(ad->chk_region, ad->selected_region_idx);
        }
 
+       if (noResult) {
+               item_data =
+                       setting_create_Gendial_field_def(ad->gl_region,
+                                       &(ad->itc_1text), NULL, NULL,
+                                       SWALLOW_Type_INVALID, NULL, NULL, 0,
+                                       _("No search result"), NULL, NULL);
+       }
+
        ad->search_idler = NULL;
        return ECORE_CALLBACK_CANCEL;
 }

diff --git a/setting-phone/src/setting-phone.c b/setting-phone/src/setting-phone.c
index 0ca48d4..e301d79 100755 (executable)
--- a/setting-phone/src/setting-phone.c
+++ b/setting-phone/src/setting-phone.c
@@ -207,6 +207,21 @@ char *setting_phone_lang_get_region_str(const char *region)
        UErrorCode status = U_ZERO_ERROR;
        char *ret_str = NULL;
 
+       const char *pa_lang = vconf_get_str(VCONFKEY_LANGSET);
+       if (pa_lang) {
+               char *q = strchr(pa_lang, '.');
+               if (q) {
+                       *q = '\0';
+               }   
+               SETTING_TRACE("pa_lang:%s", pa_lang);
+               int err = -1; 
+               uloc_setDefault(pa_lang, &err);
+               free((void *)pa_lang);
+               pa_lang = NULL;
+       } else {
+               SETTING_TRACE_ERROR("get vconf failed");
+       }
+
        localeID = uloc_getDefault();
        uloc_getDisplayName(region, localeID, displayname, SETTING_STR_SLP_LEN,
                            &status);