TSAM-2564 Text not translate on Change wallpaper

Change-Id: Id5b88533ebc512cae3029f11ce6485d4cd031fca
Signed-off-by: Oleksander Kostenko <o.kostenko@samsung.com>

diff --git a/src/wallpaper-ui-service-main.c b/src/wallpaper-ui-service-main.c
index e4ee92b..9a2d8f5 100644 (file)
--- a/src/wallpaper-ui-service-main.c
+++ b/src/wallpaper-ui-service-main.c
@@ -1310,7 +1310,7 @@ HAPI void wallpaper_main_create_view(void *data)
        ad->preview_image = image;
 
        /* preview text */
-       elm_object_translatable_part_text_set(preveiw_main_layout, "text_tap", APP_STRING("IDS_LCKSCN_NPBODY_TAP_TO_PREVIEW"));
+       elm_object_domain_translatable_part_text_set(preveiw_main_layout, "text_tap", PKGNAME, "IDS_LCKSCN_NPBODY_TAP_TO_PREVIEW");
 /*     elm_object_signal_emit(preveiw_main_layout, "hide_preview", "preview_image"); */
 
        /* gallery last image */
@@ -1326,8 +1326,7 @@ HAPI void wallpaper_main_create_view(void *data)
 
        eext_object_event_callback_add(navi_bar, EEXT_CALLBACK_BACK, _wallpaper_back_key_cb, (void *)ad);
        nf_it = elm_naviframe_item_push(navi_bar, APP_STRING("IDS_LCKSCN_MBODY_WALLPAPERS"), NULL , NULL, preveiw_main_layout, NULL);
-
-       elm_object_translatable_part_text_set(preveiw_main_layout, "elm.text.title", APP_STRING("IDS_LCKSCN_MBODY_WALLPAPERS"));
+       elm_object_domain_translatable_part_text_set(preveiw_main_layout, "elm.text.title", PKGNAME, "IDS_LCKSCN_MBODY_WALLPAPERS");
        elm_object_signal_emit(navi_bar, "elm,state,title,hide", "elm");
 
        /* Title Cancel Button */
@@ -1342,7 +1341,7 @@ HAPI void wallpaper_main_create_view(void *data)
        Evas_Object *done_btn = elm_button_add(preveiw_main_layout);
        elm_object_style_set(done_btn, "naviframe/title_right_custom");
        evas_object_smart_callback_add(done_btn, "clicked", _main_done_button_cb, NULL);
-       elm_object_translatable_part_text_set(done_btn, "elm.text", APP_STRING("IDS_TPLATFORM_ACBUTTON_DONE_ABB"));
+       elm_object_domain_translatable_part_text_set(done_btn, "elm.text", PKGNAME, "IDS_TPLATFORM_ACBUTTON_DONE_ABB");
        elm_object_part_content_set(preveiw_main_layout, "title_right_btn", done_btn);
        evas_object_show(done_btn);
        elm_object_signal_emit(preveiw_main_layout, "elm,state,title_right_btn,show", "elm");
@@ -1382,7 +1381,7 @@ static Evas_Object *_preview_create_edje_content(Evas_Object *parent, const char
        evas_object_show(image);
 
        if (thm->title) {
-               elm_object_translatable_part_text_set(layout, "text", thm->title);
+           elm_object_domain_translatable_part_text_set(layout, "text", PKGNAME, thm->title);
        }
 
        WALLPAPERUI_TRACE_END;
@@ -1561,7 +1560,7 @@ static Evas_Object *main_gengrid_add(Evas_Object *parent, void *data)
                s_item->type = WALLPAPER_TYPE_GALLERY;
                s_item->index = index++;
                s_item->item = elm_gengrid_item_append(ad->gengrid, gic_for_main, s_item, _gallery_clicked_cb, s_item);
-               s_item->title = strdup(APP_STRING("IDS_LCKSCN_BODY_GALLERY"));
+               s_item->title = strdup("IDS_LCKSCN_BODY_GALLERY");
        }
 
        const char* defaultImageDir = wallpaper_ui_service_get_settings_wallpapers_path();

diff --git a/src/wallpaper-ui-service.c b/src/wallpaper-ui-service.c
index faabd79..94aef84 100644 (file)
--- a/src/wallpaper-ui-service.c
+++ b/src/wallpaper-ui-service.c
@@ -366,7 +366,7 @@ void *_register_view(app_control_h service, void *data)
        WALLPAPERUI_ERR("from %s", from);
 
        if (from != NULL) {
-               if (strcmp(from, "Homescreen") == 0) {
+               if (strcmp(from, "Homescreen-efl") == 0) {
                        ad->sel_popup_data.launch_from = WALLPAPER_POPUP_FROM_HOME_SCREEN;
                } else if (strcmp(from, "Setting") == 0) {
                        ad->sel_popup_data.launch_from = WALLPAPER_POPUP_FROM_SETTING;
@@ -670,7 +670,7 @@ HAPI int main(int argc, char *argv[])
                .app_control = _app_control,
        };
 
-       ui_app_add_event_handler(&handlers[APP_EVENT_LANGUAGE_CHANGED], APP_EVENT_LANGUAGE_CHANGED, _app_lang_changed, NULL);
+       ui_app_add_event_handler(&handlers[APP_EVENT_LANGUAGE_CHANGED], APP_EVENT_LANGUAGE_CHANGED, _app_lang_changed, &ad);
 
        memset(&ad, 0x00, sizeof(wallpaper_ui_service_appdata));