Fix strings not to chnage when language change

- Cancel/Done button and Helps default storage loc

Change-Id: Id02c3617643c8ab4c24ab4f99eda3a67b3563014
Signed-off-by: kiso.chang <kiso.chang@samsung.com>

diff --git a/setting-accessibility/src/setting-accessibility-screen-reader-settings.c b/setting-accessibility/src/setting-accessibility-screen-reader-settings.c
old mode 100644 (file)
new mode 100755 (executable)
index 5d56af7..bfa461e
--- a/setting-accessibility/src/setting-accessibility-screen-reader-settings.c
+++ b/setting-accessibility/src/setting-accessibility-screen-reader-settings.c
@@ -548,8 +548,8 @@ static void _status_bar_info_mouse_up_Gendial_list_cb(
                        ELM_SCALE_SIZE(POPUP_CONTENT_BASE_SIZE) * size);
        elm_object_content_set(popup, box);
 
-       const char *btnCancelText = "Cancel";
-       const char *btnDoneText = "Done";
+       const char *btnCancelText = _("IDS_MSG_ACBUTTON_CANCEL_ABB");
+       const char *btnDoneText = _("IDS_MSG_ACBUTTON_DONE_ABB");
 
        Evas_Object *btnCancel = setting_create_button(popup, btnCancelText,
                        NULL, _cancel_button_clicked_cb, popup);

diff --git a/setting-ringtone/src/setting-ringtone-main.c b/setting-ringtone/src/setting-ringtone-main.c
old mode 100644 (file)
new mode 100755 (executable)
index 341317e..f386867
--- a/setting-ringtone/src/setting-ringtone-main.c
+++ b/setting-ringtone/src/setting-ringtone-main.c
@@ -89,13 +89,13 @@ static int setting_ringtone_create(void *cb)
                                        ad);
 
        btn = setting_create_button(ad->md.naviframe,
-                       "cancel", "naviframe/title_cancel",
+                       _("IDS_MSG_ACBUTTON_CANCEL_ABB"), "naviframe/title_cancel",
                        _cancel_click_cb, ad);
        elm_object_item_part_content_set(ad->md.naviframe_it, "title_left_btn",
                                        btn);
 
        btn = setting_create_button(ad->md.naviframe,
-                       "done", "naviframe/title_done",
+                       _("IDS_MSG_ACBUTTON_DONE_ABB"), "naviframe/title_done",
                        _done_click_cb, ad);
        elm_object_item_part_content_set(ad->md.naviframe_it, "title_right_btn",
                                        btn);

diff --git a/setting-storage/include/setting-storage.h b/setting-storage/include/setting-storage.h
old mode 100644 (file)
new mode 100755 (executable)
index eea7e1f..6d4234a
--- a/setting-storage/include/setting-storage.h
+++ b/setting-storage/include/setting-storage.h
@@ -122,10 +122,13 @@ typedef struct _SettingStorage {
 
        /* default storage */
        Setting_GenGroupItem_Data *default_storage;
+       Setting_GenGroupItem_Data *help_bt;
        Setting_GenGroupItem_Data *data_bt;
        Setting_GenGroupItem_Data *data_nfc;
        Setting_GenGroupItem_Data *data_wifidirect;
+       Setting_GenGroupItem_Data *help_installapp;
        Setting_GenGroupItem_Data *data_installapp;
+       Evas_Object *default_genlist;
 
        /* Miscellaneous files module: */
        Elm_Object_Item *misces_navi_it;

diff --git a/setting-storage/src/setting-storage-default.c b/setting-storage/src/setting-storage-default.c
old mode 100644 (file)
new mode 100755 (executable)
index 7ecbc37..bdbb905
--- a/setting-storage/src/setting-storage-default.c
+++ b/setting-storage/src/setting-storage-default.c
@@ -232,9 +232,9 @@ static Elm_Object_Item *_create_genlist(SettingStorage *ad,
        evas_object_smart_callback_add(*genlist, "realized", __gl_realized_cb,
                        NULL);
 
-       btn_left = setting_create_button(ad->md.naviframe, "CANCEL",
+       btn_left = setting_create_button(ad->md.naviframe, _("IDS_MSG_ACBUTTON_CANCEL_ABB"),
                        "naviframe/title_left", _cancel_btn_clicked_cb, ad);
-       btn_right = setting_create_button(ad->md.naviframe, "DONE",
+       btn_right = setting_create_button(ad->md.naviframe, _("IDS_MSG_ACBUTTON_DONE_ABB"),
                        "naviframe/title_right", _done_btn_clicked_cb, ad);
 
        it = elm_naviframe_item_push(ad->md.naviframe,
@@ -270,15 +270,23 @@ static int storage_default_create(void *data)
                                storage_MMC_stat);
        }
 
+
        _create_genlist(ad, &genlist);
+       ad->default_genlist = genlist;
+       
 
        /*Shared contents */
        it = setting_create_Gendial_field_titleItem(genlist, &itc_group_item,
                        STORAGE_STR_SHARED_CONTENTS, NULL);
-
        elm_genlist_item_select_mode_set(it->item, ELM_OBJECT_SELECT_MODE_NONE);
-       ADD_GL_HELP(genlist,
-                       _("IDS_SM_BODY_SELECT_THE_DEFAULT_STORAGE_LOCATION_FOR_CONTENT_SHARED_VIA_BLUETOOTH_OR_WI_FI_DIRECT"));
+
+       it =    setting_create_Gendial_field_def(genlist, &itc_multiline_text,
+                       NULL, NULL, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, 
+                       _("IDS_SM_BODY_SELECT_THE_DEFAULT_STORAGE_LOCATION_FOR_CONTENT_SHARED_VIA_BLUETOOTH_OR_WI_FI_DIRECT"),
+                       NULL, NULL);
+       setting_retvm_if(NULL == it, SETTING_RETURN_FAIL, "item_data is NULL");
+       elm_genlist_item_select_mode_set(it->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+       ad->help_bt = it;
 
        ad->data_bt = storage_default_items_create(ad, genlist,
                        INT_SLP_SETTING_DEFAULT_MEM_BLUETOOTH);
@@ -288,10 +296,15 @@ static int storage_default_create(void *data)
 
        it = setting_create_Gendial_field_titleItem(genlist, &itc_group_item,
                        grp_title, NULL);
-
        elm_genlist_item_select_mode_set(it->item, ELM_OBJECT_SELECT_MODE_NONE);
-       ADD_GL_HELP(genlist,
-                       _("IDS_SM_BODY_SELECT_THE_DEFAULT_LOCATION_FOR_INSTALLING_APPS_WHERE_APPS_CAN_BE_SAVED_DEPENDS_ON_THE_TYPE_OF_APP_AND_THE_AVAILABILITY_OF_THE_LOCATION"));
+
+       it =    setting_create_Gendial_field_def(genlist, &itc_multiline_text,
+                       NULL, NULL, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, 
+                       _("IDS_SM_BODY_SELECT_THE_DEFAULT_LOCATION_FOR_INSTALLING_APPS_WHERE_APPS_CAN_BE_SAVED_DEPENDS_ON_THE_TYPE_OF_APP_AND_THE_AVAILABILITY_OF_THE_LOCATION"),
+                       NULL, NULL);
+       setting_retvm_if(NULL == it, SETTING_RETURN_FAIL, "item_data is NULL");
+       elm_genlist_item_select_mode_set(it->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+       ad->help_installapp = it;
 
        ret = vconf_notify_key_changed(storage_MMC_stat,
                        storage_default_mmc_changed_cb, ad);
@@ -324,6 +337,41 @@ static int storage_default_destroy(void *data)
        return SETTING_RETURN_SUCCESS;
 }
 
+static int storage_default_update(void *data)
+{
+       SETTING_TRACE_BEGIN;
+       
+       SettingStorage *ad = data;
+
+       retv_if(data == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
+
+       if(ad->default_genlist)
+               elm_genlist_realized_items_update(ad->default_genlist);
+
+       if(ad->help_bt) {
+               ad->help_bt->keyStr = _("IDS_SM_BODY_SELECT_THE_DEFAULT_STORAGE_LOCATION_FOR_CONTENT_SHARED_VIA_BLUETOOTH_OR_WI_FI_DIRECT");
+               elm_genlist_item_update(ad->help_bt->item);
+       }
+       if(ad->help_installapp) {
+               ad->help_installapp->keyStr = _("IDS_SM_BODY_SELECT_THE_DEFAULT_LOCATION_FOR_INSTALLING_APPS_WHERE_APPS_CAN_BE_SAVED_DEPENDS_ON_THE_TYPE_OF_APP_AND_THE_AVAILABILITY_OF_THE_LOCATION");
+               elm_genlist_item_update(ad->help_installapp->item);
+       }
+
+       Elm_Object_Item *it = elm_naviframe_top_item_get (ad->md.naviframe);
+       if(it) {
+               Evas_Object *btn;
+               btn = elm_object_item_part_content_get(it, "title_left_btn");
+               if(btn)
+                       elm_object_part_text_set(btn, NULL, _("IDS_MSG_ACBUTTON_CANCEL_ABB"));
+
+               btn = elm_object_item_part_content_get(it, "title_right_btn");
+               if(btn)
+                       elm_object_part_text_set(btn, NULL, _("IDS_MSG_ACBUTTON_DONE_ABB"));
+       }
+
+       return SETTING_RETURN_SUCCESS;
+}
+
 static int storage_default_cleanup(void *data)
 {
        return storage_default_destroy(data);
@@ -336,7 +384,7 @@ void storage_default_init(SettingStorage *ad)
 
        setting_view_storage_default.create = storage_default_create;
        setting_view_storage_default.destroy = storage_default_destroy;
-       setting_view_storage_default.update = NULL;
+       setting_view_storage_default.update = storage_default_update;
        setting_view_storage_default.cleanup = storage_default_cleanup;
 
        ad->default_view = &setting_view_storage_default;

diff --git a/setting-storage/src/setting-storage.c b/setting-storage/src/setting-storage.c
index 89ff1b36a605f0e1bcc867d6db9617e4f3eeb569..ad41b199b74919033ff486b30d6e21384aa979b8 100755 (executable)
--- a/setting-storage/src/setting-storage.c
+++ b/setting-storage/src/setting-storage.c
@@ -251,6 +251,13 @@ static void _setting_storage_app_on_resume(void *data)
 
        if (ad->main_view->is_create)
                setting_view_update(ad->main_view, ad);
+       if (ad->default_view->is_create)
+               setting_view_update(ad->default_view, ad);
+       if (ad->misces_view->is_create)
+               setting_view_update(ad->misces_view, ad);
+       if (ad->apps_view->is_create)
+               setting_view_update(ad->apps_view, ad);
+
 }
 
 int main(int argc, char *argv[])