nikawhite pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=c6ec131b8d863479800ab6f9b607150f7eb1c41e
commit c6ec131b8d863479800ab6f9b607150f7eb1c41e Author: Mykyta Biliavskyi <m.biliavs...@samsung.com> Date: Tue Nov 17 17:39:22 2015 +0000 Multilanguage: apply gettext macro to bin/. Cover all strings with _() macro. --- src/bin/base_gui.c | 2 +- src/bin/config_data.c | 12 +++++------ src/bin/file_mgr.c | 16 +++++++-------- src/bin/goto.c | 14 ++++++------- src/bin/live_edit.c | 6 +++--- src/bin/main.c | 25 +++++++++++----------- src/bin/menu.c | 56 +++++++++++++++++++++++++------------------------- src/bin/newfile.c | 8 ++++---- src/bin/panes.c | 2 +- src/bin/search.c | 26 +++++++++++------------ src/bin/setting.c | 26 +++++++++++------------ src/bin/statusbar.c | 2 +- src/bin/text_setting.c | 22 ++++++++++---------- src/bin/tools.c | 42 ++++++++++++++++++------------------- 14 files changed, 129 insertions(+), 130 deletions(-) diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c index 8bb35d6..6c4e803 100644 --- a/src/bin/base_gui.c +++ b/src/bin/base_gui.c @@ -58,7 +58,7 @@ base_title_set(const char *path) base_data *bd = g_bd; assert(bd); char buf[PATH_MAX]; - snprintf(buf, sizeof(buf), "%s - Enventor", path); + snprintf(buf, sizeof(buf), _("%s - Enventor"), path); elm_win_title_set(bd->win, buf); } diff --git a/src/bin/config_data.c b/src/bin/config_data.c index 51f53e0..3205b27 100644 --- a/src/bin/config_data.c +++ b/src/bin/config_data.c @@ -63,7 +63,7 @@ config_edj_path_update(config_data *cd) if (!eina_file_mkstemp(buf, &tmp_path)) { - EINA_LOG_ERR("Failed to generate tmp folder!"); + EINA_LOG_ERR(_("Failed to generate tmp folder!")); return; } @@ -82,7 +82,7 @@ config_save(config_data *cd) Eina_Bool success = ecore_file_mkdir(efreet_config_home_get()); if (!success) { - EINA_LOG_ERR("Cannot create a config folder \"%s\"", efreet_config_home_get()); + EINA_LOG_ERR(_("Cannot create a config folder \"%s\""), efreet_config_home_get()); return; } } @@ -95,7 +95,7 @@ config_save(config_data *cd) Eina_Bool success = ecore_file_mkdir(buf); if (!success) { - EINA_LOG_ERR("Cannot create a config folder \"%s\"", buf); + EINA_LOG_ERR(_("Cannot create a config folder \"%s\""), buf); return; } } @@ -106,7 +106,7 @@ config_save(config_data *cd) Eet_File *ef = eet_open(buf, EET_FILE_MODE_WRITE); if (!ef) { - EINA_LOG_ERR("Cannot save a config file \"%s\"", buf); + EINA_LOG_ERR(_("Cannot save a config file \"%s\""), buf); return; } @@ -145,7 +145,7 @@ config_load(void) cd = eet_data_read(ef, edd_base, "config"); eet_close(ef); } - else EINA_LOG_WARN("Cannot load a config file \"%s\"", buf); + else EINA_LOG_WARN(_("Cannot load a config file \"%s\""), buf); //failed to load config file, create default structure. if (!cd) @@ -153,7 +153,7 @@ config_load(void) cd = calloc(1, sizeof(config_data)); if (!cd) { - EINA_LOG_ERR("Failed to allocate Memory!"); + EINA_LOG_ERR(_("Failed to allocate Memory!")); return NULL; } } diff --git a/src/bin/file_mgr.c b/src/bin/file_mgr.c index 60cf5b6..530b037 100644 --- a/src/bin/file_mgr.c +++ b/src/bin/file_mgr.c @@ -67,9 +67,9 @@ warning_open(file_mgr_data *fmd) Evas_Object *layout = elm_layout_add(base_win_get()); elm_layout_file_set(layout, EDJE_PATH, "warning_layout"); elm_object_part_text_set(layout, "elm.text.desc", - "EDC has been changed on the file system."); + _("EDC has been changed on the file system.")); elm_object_part_text_set(layout, "elm.text.question", - "Do you want to replace the contents?"); + _("Do you want to replace the contents?")); elm_object_signal_callback_add(layout, "elm,state,dismiss,done", "", warning_dismiss_done, fmd); evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -80,7 +80,7 @@ warning_open(file_mgr_data *fmd) //Save As Button btn = elm_button_add(layout); - elm_object_text_set(btn, "Save As"); + elm_object_text_set(btn, _("Save As")); evas_object_smart_callback_add(btn, "clicked", warning_save_as_btn_cb, fmd); elm_object_part_content_set(layout, "elm.swallow.btn1", btn); evas_object_show(btn); @@ -88,13 +88,13 @@ warning_open(file_mgr_data *fmd) //Replace Button btn = elm_button_add(layout); - elm_object_text_set(btn, "Replace"); + elm_object_text_set(btn, _("Replace")); evas_object_smart_callback_add(btn, "clicked", warning_replace_btn_cb, fmd); elm_object_part_content_set(layout, "elm.swallow.btn2", btn); //Igrore Button btn = elm_button_add(layout); - elm_object_text_set(btn, "Ignore"); + elm_object_text_set(btn, _("Ignore")); evas_object_smart_callback_add(btn, "clicked", warning_ignore_btn_cb, fmd); elm_object_part_content_set(layout, "elm.swallow.btn3", btn); @@ -154,9 +154,9 @@ file_mgr_edc_save(void) if (!config_stats_bar_get()) return; if (save_success) - snprintf(buf, sizeof(buf), "File saved. \"%s\"", config_input_path_get()); + snprintf(buf, sizeof(buf), _("File saved. \"%s\""), config_input_path_get()); else - snprintf(buf, sizeof(buf), "Already saved. \"%s\"", config_input_path_get()); + snprintf(buf, sizeof(buf), _("Already saved. \"%s\""), config_input_path_get()); stats_info_msg_update(buf); } @@ -190,7 +190,7 @@ file_mgr_init(Evas_Object *enventor) file_mgr_data *fmd = calloc(1, sizeof(file_mgr_data)); if (!fmd) { - EINA_LOG_ERR("Failed to allocate Memory!"); + EINA_LOG_ERR(_("Failed to allocate Memory!")); return; } g_fmd = fmd; diff --git a/src/bin/goto.c b/src/bin/goto.c index 80bcc04..ea08885 100644 --- a/src/bin/goto.c +++ b/src/bin/goto.c @@ -86,7 +86,7 @@ entry_changed_cb(void *data, Evas_Object *obj, void* event_info EINA_UNUSED) if ((line < 1) || (line > enventor_object_max_line_get(gd->enventor))) { elm_object_part_text_set(gd->layout, "elm.text.msg", - "Invalid line number"); + _("Invalid line number")); elm_object_disabled_set(gd->btn, EINA_TRUE); } else @@ -129,17 +129,17 @@ goto_open(Evas_Object *enventor) gd = calloc(1, sizeof(goto_data)); if (!gd) { - EINA_LOG_ERR("Failed to allocate Memory!"); + EINA_LOG_ERR(_("Failed to allocate Memory!")); return; } g_gd = gd; //Win - Evas_Object *win = elm_win_add(base_win_get(), "Enventor Goto Line", + Evas_Object *win = elm_win_add(base_win_get(), _("Enventor Goto Line"), ELM_WIN_DIALOG_BASIC); elm_win_focus_highlight_enabled_set(win, EINA_TRUE); - elm_win_title_set(win, "Go to Line"); + elm_win_title_set(win, _("Go to Line")); win_w = (Evas_Coord) ((double) win_w * elm_config_scale_get()); win_h = (Evas_Coord) ((double) win_h * elm_config_scale_get()); evas_object_resize(win, win_w, win_h); @@ -161,7 +161,7 @@ goto_open(Evas_Object *enventor) elm_win_resize_object_add(win, layout); char buf[256]; - snprintf(buf, sizeof(buf), "Enter line number [1..%d]:", + snprintf(buf, sizeof(buf), _("Enter line number [1..%d]:"), enventor_object_max_line_get(enventor)); elm_object_part_text_set(layout, "elm.text.goto", buf); @@ -185,7 +185,7 @@ goto_open(Evas_Object *enventor) //Button (ok) Evas_Object *btn = elm_button_add(layout); - elm_object_text_set(btn, "Ok"); + elm_object_text_set(btn, _("Ok")); evas_object_smart_callback_add(btn, "clicked", btn_clicked_cb, gd); elm_object_part_content_set(layout, "elm.swallow.btn", btn); @@ -197,7 +197,7 @@ goto_open(Evas_Object *enventor) evas_object_event_callback_add(keygrabber, EVAS_CALLBACK_KEY_DOWN, keygrabber_key_down_cb, gd); if (!evas_object_key_grab(keygrabber, "Escape", 0, 0, EINA_TRUE)) - EINA_LOG_ERR("Failed to grab key - Escape"); + EINA_LOG_ERR(_("Failed to grab key - Escape")); tools_goto_update(enventor, EINA_FALSE); diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c index c548442..c7d2bfc 100644 --- a/src/bin/live_edit.c +++ b/src/bin/live_edit.c @@ -915,7 +915,7 @@ ctxpopup_it_selected_cb(void *data, Evas_Object *obj, elm_ctxpopup_dismiss(obj); - stats_info_msg_update("Double click the part to confirm."); + stats_info_msg_update(_("Double click the part to confirm.")); } static void @@ -985,7 +985,7 @@ live_edit_toggle(void) enventor_object_disabled_set(ld->enventor, EINA_TRUE); ld->live_view = enventor_object_live_view_get(ld->enventor); ld->ctxpopup = ctxpopup_create(ld); - stats_info_msg_update("Select a part to add in Live View."); + stats_info_msg_update(_("Select a part to add in Live View.")); tools_live_update(EINA_TRUE); } else @@ -1060,7 +1060,7 @@ live_edit_init(Evas_Object *enventor, Evas_Object *trigger) live_data *ld = calloc(1, sizeof(live_data)); if (!ld) { - EINA_LOG_ERR("Faild to allocate Memory!"); + EINA_LOG_ERR(_("Faild to allocate Memory!")); return; } g_ld = ld; diff --git a/src/bin/main.c b/src/bin/main.c index a3bcb25..3e05691 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -21,8 +21,8 @@ auto_comp_toggle(app_data *ad) { Eina_Bool toggle = !config_auto_complete_get(); enventor_object_auto_complete_set(ad->enventor, toggle); - if (toggle) stats_info_msg_update("Auto Completion Enabled."); - else stats_info_msg_update("Auto Completion Disabled."); + if (toggle) stats_info_msg_update(_("Auto Completion Enabled.")); + else stats_info_msg_update(_("Auto Completion Disabled.")); config_auto_complete_set(toggle); } @@ -31,8 +31,8 @@ auto_indent_toggle(app_data *ad) { Eina_Bool toggle = !config_auto_indent_get(); enventor_object_auto_indent_set(ad->enventor, toggle); - if (toggle) stats_info_msg_update("Auto Indentation Enabled."); - else stats_info_msg_update("Auto Indentation Disabled."); + if (toggle) stats_info_msg_update(_("Auto Indentation Enabled.")); + else stats_info_msg_update(_("Auto Indentation Disabled.")); config_auto_indent_set(toggle); } @@ -176,7 +176,7 @@ main_mouse_wheel_cb(void *data, int type EINA_UNUSED, void *ev) live_edit_update(); char buf[256]; - snprintf(buf, sizeof(buf), "Live View Scale: %2.2fx", scale); + snprintf(buf, sizeof(buf), _("Live View Scale: %2.2fx"), scale); stats_info_msg_update(buf); return ECORE_CALLBACK_PASS_ON; @@ -202,7 +202,7 @@ main_mouse_wheel_cb(void *data, int type EINA_UNUSED, void *ev) } char buf[128]; - snprintf(buf, sizeof(buf), "Font Size: %1.1fx", + snprintf(buf, sizeof(buf), _("Font Size: %1.1fx"), config_font_scale_get()); stats_info_msg_update(buf); @@ -455,7 +455,7 @@ enventor_program_run_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, if (!config_stats_bar_get()) return; const char *program = event_info; char buf[256]; - snprintf(buf, sizeof(buf), "Program Run: \"%s\"", program); + snprintf(buf, sizeof(buf),_("Program Run: \"%s\""), program); stats_info_msg_update(buf); } @@ -554,8 +554,7 @@ default_template_insert(app_data *ad) { if (live_edit_get()) { - stats_info_msg_update("Insertion of template code is disabled " - "while in Live Edit mode"); + stats_info_msg_update(_("Insertion of template code is disabled while in Live Edit mode")); return; } @@ -563,15 +562,15 @@ default_template_insert(app_data *ad) if (enventor_object_template_insert(ad->enventor, ENVENTOR_TEMPLATE_INSERT_DEFAULT, syntax, sizeof(syntax))) { char msg[64]; - snprintf(msg, sizeof(msg), "Template code inserted, (%s)", syntax); + snprintf(msg, sizeof(msg), _("Template code inserted, (%s)"), syntax); stats_info_msg_update(msg); enventor_object_save(ad->enventor, config_input_path_get()); } else { - stats_info_msg_update("Can't insert template code here. Move the " + stats_info_msg_update(_("Can't insert template code here. Move the " "cursor inside the \"Collections,Images,Parts," - "Part,Programs\" scope."); + "Part,Programs\" scope.")); } } @@ -822,7 +821,7 @@ keygrabber_init(app_data *ad) keygrabber_key_down_cb, ad); #define GRAB_ADD(key, modifier) \ if (!evas_object_key_grab(ad->keygrabber, (key), (modifier), 0, EINA_TRUE)) \ - EINA_LOG_ERR("Failed to grab key - %s", (key)) + EINA_LOG_ERR(_("Failed to grab key - %s"), (key)) GRAB_ADD("Escape", 0); GRAB_ADD("F1", 0); diff --git a/src/bin/menu.c b/src/bin/menu.c index 10b7ac4..f7fc868 100644 --- a/src/bin/menu.c +++ b/src/bin/menu.c @@ -146,7 +146,7 @@ newfile_open(menu_data *md) Evas_Object *layout = elm_layout_add(base_win_get()); elm_layout_file_set(layout, EDJE_PATH, "newfile_layout"); - elm_object_part_text_set(layout, "elm.text.title", "New File: Choose a template"); + elm_object_part_text_set(layout, "elm.text.title", _("New File: Choose a template")); elm_object_signal_callback_add(layout, "elm,state,dismiss,done", "", newfile_dismiss_done, md); evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -159,13 +159,13 @@ newfile_open(menu_data *md) //Ok Button btn = elm_button_add(layout); - elm_object_text_set(btn, "Ok"); + elm_object_text_set(btn, _("Ok")); evas_object_smart_callback_add(btn, "clicked", newfile_ok_btn_cb, md); elm_object_part_content_set(layout, "elm.swallow.ok_btn", btn); //Cancel Button btn = elm_button_add(layout); - elm_object_text_set(btn, "Cancel"); + elm_object_text_set(btn, _("Cancel")); evas_object_smart_callback_add(btn, "clicked", newfile_cancel_btn_cb, md); elm_object_part_content_set(layout, "elm.swallow.cancel_btn", btn); @@ -182,9 +182,9 @@ warning_open(menu_data *md, Evas_Smart_Cb yes_cb, Evas_Smart_Cb save_cb) Evas_Object *layout = elm_layout_add(base_win_get()); elm_layout_file_set(layout, EDJE_PATH, "warning_layout"); elm_object_part_text_set(layout, "elm.text.desc", - "Without save, you will lose last changes!"); + _("Without save, you will lose last changes!")); elm_object_part_text_set(layout, "elm.text.question", - "Will you save changes?"); + _("Will you save changes?")); elm_object_signal_callback_add(layout, "elm,state,dismiss,done", "", warning_dismiss_done, md); evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -195,7 +195,7 @@ warning_open(menu_data *md, Evas_Smart_Cb yes_cb, Evas_Smart_Cb save_cb) //Save Button btn = elm_button_add(layout); - elm_object_text_set(btn, "Save"); + elm_object_text_set(btn, _("Save")); evas_object_smart_callback_add(btn, "clicked", save_cb, md); evas_object_show(btn); elm_object_focus_set(btn, EINA_TRUE); @@ -203,13 +203,13 @@ warning_open(menu_data *md, Evas_Smart_Cb yes_cb, Evas_Smart_Cb save_cb) //Discard Button btn = elm_button_add(layout); - elm_object_text_set(btn, "Discard"); + elm_object_text_set(btn, _("Discard")); evas_object_smart_callback_add(btn, "clicked", yes_cb, md); elm_object_part_content_set(layout, "elm.swallow.btn2", btn); //Cancel Button btn = elm_button_add(layout); - elm_object_text_set(btn, "Cancel"); + elm_object_text_set(btn, _("Cancel")); evas_object_smart_callback_add(btn, "clicked", warning_no_btn_cb, md); elm_object_part_content_set(layout, "elm.swallow.btn3", btn); @@ -409,7 +409,7 @@ fileselector_save_done_cb(void *data, Evas_Object *obj, void *event_info) else if (ecore_file_is_dir(selected)) { elm_object_part_text_set(md->fileselector_layout, - "elm.text.msg", "Choose a file to save"); + "elm.text.msg", _("Choose a file to save")); elm_object_signal_emit(md->fileselector_layout, "elm,action,msg,show", ""); return; @@ -433,7 +433,7 @@ fileselector_save_done_cb(void *data, Evas_Object *obj, void *event_info) if (!enventor_object_save(md->enventor, selected)) { char buf[PATH_MAX]; - snprintf(buf, sizeof(buf), "Failed to save: %s.", selected); + snprintf(buf, sizeof(buf), _("Failed to save: %s."), selected); elm_object_part_text_set(md->fileselector_layout, "elm.text.msg", buf); elm_object_signal_emit(md->fileselector_layout, @@ -488,7 +488,7 @@ fileselector_load_done_cb(void *data, Evas_Object *obj, void *event_info) { elm_object_part_text_set(md->fileselector_layout, "elm.text.msg", - "Support only .edc file."); + _("Support only .edc file.")); elm_object_signal_emit(md->fileselector_layout, "elm,action,msg,show", ""); return; @@ -498,7 +498,7 @@ fileselector_load_done_cb(void *data, Evas_Object *obj, void *event_info) if (ecore_file_is_dir(selected)) { elm_object_part_text_set(md->fileselector_layout, - "elm.text.msg", "Choose a file to load."); + "elm.text.msg", _("Choose a file to load.")); elm_object_signal_emit(md->fileselector_layout, "elm,action,msg,show", ""); return; @@ -509,7 +509,7 @@ fileselector_load_done_cb(void *data, Evas_Object *obj, void *event_info) { char buf[PATH_MAX]; const char *filename = ecore_file_file_get(selected); - snprintf(buf, sizeof(buf), "Failed to load: %s.", filename); + snprintf(buf, sizeof(buf), _("Failed to load: %s."), filename); elm_object_part_text_set(md->fileselector_layout, "elm.text.msg", buf); elm_object_signal_emit(md->fileselector_layout, @@ -537,7 +537,7 @@ edc_file_save(menu_data *md) Evas_Object *layout = elm_layout_add(base_win_get()); elm_layout_file_set(layout, EDJE_PATH, "fileselector_layout"); elm_object_part_text_set(layout, "elm.text.title", - "Save File: Choose a EDC"); + _("Save File: Choose a EDC")); elm_object_signal_callback_add(layout, "elm,state,dismiss,done", "", fileselector_dismiss_done, md); evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -545,8 +545,8 @@ edc_file_save(menu_data *md) base_win_resize_object_add(layout); Evas_Object *fs = elm_fileselector_add(layout); - elm_object_part_text_set(fs, "ok", "Save"); - elm_object_part_text_set(fs, "cancel", "Close"); + elm_object_part_text_set(fs, "ok", _("Save")); + elm_object_part_text_set(fs, "cancel", _("Close")); elm_fileselector_path_set(fs, md->last_accessed_path ? md->last_accessed_path : eina_environment_home_get()); elm_fileselector_expandable_set(fs, EINA_FALSE); elm_fileselector_is_save_set(fs, EINA_TRUE); @@ -571,7 +571,7 @@ edc_file_load(menu_data *md) Evas_Object *layout = elm_layout_add(base_win_get()); elm_layout_file_set(layout, EDJE_PATH, "fileselector_layout"); elm_object_part_text_set(layout, "elm.text.title", - "Load File: Choose a EDC"); + _("Load File: Choose a EDC")); elm_object_signal_callback_add(layout, "elm,state,dismiss,done", "", fileselector_dismiss_done, md); evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -580,8 +580,8 @@ edc_file_load(menu_data *md) Evas_Object *fs = elm_fileselector_add(layout); elm_fileselector_path_set(fs, md->last_accessed_path ? md->last_accessed_path : eina_environment_home_get()); - elm_object_part_text_set(fs, "ok", "Load"); - elm_object_part_text_set(fs, "cancel", "Close"); + elm_object_part_text_set(fs, "ok", _("Load")); + elm_object_part_text_set(fs, "cancel", _("Close")); elm_fileselector_expandable_set(fs, EINA_FALSE); elm_fileselector_is_save_set(fs, EINA_TRUE); evas_object_smart_callback_add(fs, "done", fileselector_load_done_cb, md); @@ -640,36 +640,36 @@ menu_open(menu_data *md) Evas_Object *btn; //Button(New) - btn = btn_create(layout, "New", new_btn_cb, md); + btn = btn_create(layout, _("New"), new_btn_cb, md); elm_object_focus_set(btn, EINA_TRUE); elm_object_part_content_set(layout, "elm.swallow.new_btn", btn); //Button(Save) - btn = btn_create(layout, "Save", save_btn_cb, md); + btn = btn_create(layout, _("Save"), save_btn_cb, md); elm_object_part_content_set(layout, "elm.swallow.save_btn", btn); //Button(Load) - btn = btn_create(layout, "Load", load_btn_cb, md); + btn = btn_create(layout, _("Load"), load_btn_cb, md); elm_object_part_content_set(layout, "elm.swallow.load_btn", btn); //Button(Setting) - btn = btn_create(layout, "Settings", setting_btn_cb, md); + btn = btn_create(layout, _("Settings"), setting_btn_cb, md); elm_object_part_content_set(layout, "elm.swallow.setting_btn", btn); //Button(About) - btn = btn_create(layout, "About", about_btn_cb, md); + btn = btn_create(layout, _("About"), about_btn_cb, md); elm_object_part_content_set(layout, "elm.swallow.about_btn", btn); //Button(Exit) - btn = btn_create(layout, "Exit", exit_btn_cb, md); + btn = btn_create(layout, _("Exit"), exit_btn_cb, md); elm_object_part_content_set(layout, "elm.swallow.exit_btn", btn); //Button(Prev) btn = elm_button_add(layout); elm_object_style_set(btn, "anchor"); evas_object_smart_callback_add(btn, "clicked", prev_btn_cb, md); - elm_object_tooltip_text_set(btn, "Close Enventor Menu (Esc)"); - elm_object_text_set(btn, "Back"); + elm_object_tooltip_text_set(btn, _("Close Enventor Menu (Esc)")); + elm_object_text_set(btn, _("Back")); elm_object_part_content_set(layout, "elm.swallow.prev_btn", btn); tools_menu_update(EINA_TRUE); @@ -684,7 +684,7 @@ menu_init(Evas_Object *enventor) menu_data *md = calloc(1, sizeof(menu_data)); if (!md) { - EINA_LOG_ERR("Failed to allocate Memory!"); + EINA_LOG_ERR(_("Failed to allocate Memory!")); return; } g_md = md; diff --git a/src/bin/newfile.c b/src/bin/newfile.c index b659261..e214d57 100644 --- a/src/bin/newfile.c +++ b/src/bin/newfile.c @@ -53,7 +53,7 @@ newfile_set(Evas_Object *enventor, Eina_Bool template_new) EINA_FILE_COPY_DATA, NULL, NULL); if (!success) { - EINA_LOG_ERR("Cannot find file! \"%s\"", buf); + EINA_LOG_ERR(_("Cannot find file! \"%s\""), buf); return; } enventor_object_file_set(enventor, path); @@ -75,7 +75,7 @@ newfile_default_set(Eina_Bool default_edc) EINA_FILE_COPY_DATA, NULL, NULL); if (!success) { - EINA_LOG_ERR("Cannot find file! \"%s\"", buf); + EINA_LOG_ERR(_("Cannot find file! \"%s\""), buf); return; } } @@ -121,7 +121,7 @@ templates_get(new_data *nd) if (!ecore_file_path_dir_exists(buf)) { - EINA_LOG_ERR("Cannot find templates folder! \"%s\"", buf); + EINA_LOG_ERR(_("Cannot find templates folder! \"%s\""), buf); return; } @@ -137,7 +137,7 @@ newfile_create(Evas_Object *parent, Evas_Smart_Cb selected_cb, void *data) nd = calloc(1, sizeof(new_data)); if (!nd) { - EINA_LOG_ERR("Failed to allocate Memory!"); + EINA_LOG_ERR(_("Failed to allocate Memory!")); return NULL; } g_nd = nd; diff --git a/src/bin/panes.c b/src/bin/panes.c index 59e9c3b..e5a8cf8 100644 --- a/src/bin/panes.c +++ b/src/bin/panes.c @@ -278,7 +278,7 @@ panes_init(Evas_Object *parent) panes_data *pd = malloc(sizeof(panes_data)); if (!pd) { - EINA_LOG_ERR("Failed to allocate Memory!"); + EINA_LOG_ERR(_("Failed to allocate Memory!")); return NULL; } g_pd = pd; diff --git a/src/bin/search.c b/src/bin/search.c index 1450093..510d2cb 100644 --- a/src/bin/search.c +++ b/src/bin/search.c @@ -78,7 +78,7 @@ replace_all_proc(search_data *sd) s++; } - snprintf(buf, sizeof(buf), "%d matches replaced", replace_cnt); + snprintf(buf, sizeof(buf), _("%d matches replaced"), replace_cnt); stats_info_msg_update(buf); free(utf8); @@ -127,7 +127,7 @@ find_forward_proc(search_data *sd) //There are no searched words in the text else { - snprintf(buf, sizeof(buf), "No \"%s\" in the text", find); + snprintf(buf, sizeof(buf), _("No \"%s\" in the text"), find); stats_info_msg_update(buf); sd->pos = -1; } @@ -187,7 +187,7 @@ find_backward_proc(search_data *sd) } else { - snprintf(buf, sizeof(buf), "No \"%s\" in the text", find); + snprintf(buf, sizeof(buf), _("No \"%s\" in the text"), find); stats_info_msg_update(buf); sd->pos = -1; } @@ -225,7 +225,7 @@ backward_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, search_data *sd = data; find_backward_proc(sd); sd->forward = EINA_FALSE; - elm_object_part_text_set(sd->layout, "elm.text.dir", "Backward"); + elm_object_part_text_set(sd->layout, "elm.text.dir", _("Backward")); } static void @@ -257,7 +257,7 @@ forward_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, search_data *sd = data; find_forward_proc(sd); sd->forward = EINA_TRUE; - elm_object_part_text_set(sd->layout, "elm.text.dir", "Forward"); + elm_object_part_text_set(sd->layout, "elm.text.dir", _("Forward")); } static void @@ -329,16 +329,16 @@ search_open(Evas_Object *enventor) sd = calloc(1, sizeof(search_data)); if (!sd) { - EINA_LOG_ERR("Failed to allocate Memory!"); + EINA_LOG_ERR(_("Failed to allocate Memory!")); return; } g_sd = sd; //Win - Evas_Object *win = elm_win_add(base_win_get(), "Enventor Search", + Evas_Object *win = elm_win_add(base_win_get(), _("Enventor Search"), ELM_WIN_DIALOG_BASIC); elm_win_focus_highlight_enabled_set(win, EINA_TRUE); - elm_win_title_set(win, "Find/Replace"); + elm_win_title_set(win, _("Find/Replace")); win_w = (Evas_Coord) ((double) win_w * elm_config_scale_get()); win_h = (Evas_Coord) ((double) win_h * elm_config_scale_get()); evas_object_resize(win, win_w, win_h); @@ -384,14 +384,14 @@ search_open(Evas_Object *enventor) entry_replace); //Button (forward) Evas_Object *btn_forward = elm_button_add(layout); - elm_object_text_set(btn_forward, "Forward"); + elm_object_text_set(btn_forward, _("Forward")); evas_object_smart_callback_add(btn_forward, "clicked", forward_clicked_cb, sd); elm_object_part_content_set(layout, "elm.swallow.forward", btn_forward); //Button (backward) Evas_Object *btn_backward = elm_button_add(layout); - elm_object_text_set(btn_backward, "Backward"); + elm_object_text_set(btn_backward, _("Backward")); evas_object_smart_callback_add(btn_backward, "clicked", backward_clicked_cb, sd); elm_object_part_content_set(layout, "elm.swallow.backward", @@ -399,14 +399,14 @@ search_open(Evas_Object *enventor) //Button (replace) Evas_Object *btn_replace = elm_button_add(layout); - elm_object_text_set(btn_replace, "Replace"); + elm_object_text_set(btn_replace, _("Replace")); evas_object_smart_callback_add(btn_replace, "clicked", replace_clicked_cb, sd); elm_object_part_content_set(layout, "elm.swallow.replace", btn_replace); //Button (replace all) Evas_Object *btn_replace_all = elm_button_add(layout); - elm_object_text_set(btn_replace_all, "Replace All"); + elm_object_text_set(btn_replace_all, _("Replace All")); evas_object_smart_callback_add(btn_replace_all, "clicked", replace_all_clicked_cb, sd); elm_object_part_content_set(layout, "elm.swallow.replace_all", @@ -421,7 +421,7 @@ search_open(Evas_Object *enventor) evas_object_event_callback_add(keygrabber, EVAS_CALLBACK_KEY_DOWN, keygrabber_key_down_cb, sd); if (!evas_object_key_grab(keygrabber, "Escape", 0, 0, EINA_TRUE)) - EINA_LOG_ERR("Failed to grab key - Escape"); + EINA_LOG_ERR(_("Failed to grab key - Escape")); sd->win = win; sd->enventor = enventor; diff --git a/src/bin/setting.c b/src/bin/setting.c index 77ca933..a299977 100644 --- a/src/bin/setting.c +++ b/src/bin/setting.c @@ -285,7 +285,7 @@ general_layout_create(setting_data *sd, Evas_Object *parent) elm_slider_unit_format_set(slider_view, "%1.2fx"); elm_slider_min_max_set(slider_view, MIN_VIEW_SCALE, MAX_VIEW_SCALE); elm_slider_value_set(slider_view, (double) config_view_scale_get()); - elm_object_text_set(slider_view, "Live View Scale"); + elm_object_text_set(slider_view, _("Live View Scale")); evas_object_show(slider_view); elm_box_pack_end(box, slider_view); @@ -312,7 +312,7 @@ general_layout_create(setting_data *sd, Evas_Object *parent) elm_box_pack_end(box2, layout_padding3); - Evas_Object *label_view_size = label_create(layout_padding3, "Fixed Live View Size"); + Evas_Object *label_view_size = label_create(layout_padding3, _("Fixed Live View Size")); elm_object_part_content_set(layout_padding3, "elm.swallow.content", label_view_size); @@ -373,27 +373,27 @@ general_layout_create(setting_data *sd, Evas_Object *parent) elm_box_pack_end(box2, toggle_view_size); //Toggle (Part Highlighting) - Evas_Object *toggle_highlight = toggle_create(box, "Part Highlighting", + Evas_Object *toggle_highlight = toggle_create(box, _("Part Highlighting"), config_part_highlight_get()); elm_box_pack_end(box, toggle_highlight); //Toggle (Dummy Swallow) - Evas_Object *toggle_swallow = toggle_create(box, "Dummy Swallow", + Evas_Object *toggle_swallow = toggle_create(box, _("Dummy Swallow"), config_dummy_swallow_get()); elm_box_pack_end(box, toggle_swallow); //Toggle (Status) - Evas_Object *toggle_stats = toggle_create(box, "Status", + Evas_Object *toggle_stats = toggle_create(box, _("Status"), config_stats_bar_get()); elm_box_pack_end(box, toggle_stats); //Toggle (Tools) - Evas_Object *toggle_tools = toggle_create(box, "Tools", + Evas_Object *toggle_tools = toggle_create(box, _("Tools"), config_tools_get()); elm_box_pack_end(box, toggle_tools); //Toggle (Console) - Evas_Object *toggle_console = toggle_create(box, "Auto Hiding Console", + Evas_Object *toggle_console = toggle_create(box, _("Auto Hiding Console"), config_console_get()); elm_box_pack_end(box, toggle_console); @@ -464,7 +464,7 @@ setting_open(void) sd = calloc(1, sizeof(setting_data)); if (!sd) { - EINA_LOG_ERR("Failed to allocate Memory!"); + EINA_LOG_ERR(_("Failed to allocate Memory!")); return; } g_sd = sd; @@ -489,8 +489,8 @@ setting_open(void) elm_toolbar_select_mode_set(tabbar, ELM_OBJECT_SELECT_MODE_ALWAYS); evas_object_size_hint_weight_set(tabbar, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_toolbar_item_append(tabbar, NULL, "General", general_tab_cb, sd); - elm_toolbar_item_append(tabbar, NULL, "Text Editor", text_setting_tab_cb, sd); + elm_toolbar_item_append(tabbar, NULL, _("General"), general_tab_cb, sd); + elm_toolbar_item_append(tabbar, NULL, _("Text Editor"), text_setting_tab_cb, sd); elm_object_part_content_set(layout, "elm.swallow.tabbar", tabbar); @@ -505,21 +505,21 @@ setting_open(void) //Apply Button Evas_Object *apply_btn = elm_button_add(layout); - elm_object_text_set(apply_btn, "Apply"); + elm_object_text_set(apply_btn, _("Apply")); evas_object_smart_callback_add(apply_btn, "clicked", setting_apply_btn_cb, sd); elm_object_part_content_set(layout, "elm.swallow.apply_btn", apply_btn); //Reset Button Evas_Object *reset_btn = elm_button_add(layout); - elm_object_text_set(reset_btn, "Reset"); + elm_object_text_set(reset_btn, _("Reset")); evas_object_smart_callback_add(reset_btn, "clicked", setting_reset_btn_cb, sd); elm_object_part_content_set(layout, "elm.swallow.reset_btn", reset_btn); //Cancel Button Evas_Object *cancel_btn = elm_button_add(layout); - elm_object_text_set(cancel_btn, "Cancel"); + elm_object_text_set(cancel_btn, _("Cancel")); evas_object_smart_callback_add(cancel_btn, "clicked", setting_cancel_btn_cb, sd); elm_object_part_content_set(layout, "elm.swallow.cancel_btn", cancel_btn); diff --git a/src/bin/statusbar.c b/src/bin/statusbar.c index f90f797..b7fc2b0 100644 --- a/src/bin/statusbar.c +++ b/src/bin/statusbar.c @@ -39,7 +39,7 @@ stats_init(Evas_Object *parent) stats_data *sd = calloc(1, sizeof(stats_data)); if (!sd) { - EINA_LOG_ERR("Failed to allocate Memory!"); + EINA_LOG_ERR(_("Failed to allocate Memory!")); return NULL; } g_sd = sd; diff --git a/src/bin/text_setting.c b/src/bin/text_setting.c index e19f56f..111916a 100644 --- a/src/bin/text_setting.c +++ b/src/bin/text_setting.c @@ -484,7 +484,7 @@ color_keyword_list_create(char *syntax_template_str) sizeof(color_keyword)); if (!color_keyword_list) { - EINA_LOG_ERR("Failed to allocate Memory!"); + EINA_LOG_ERR(_("Failed to allocate Memory!")); return NULL; } @@ -519,7 +519,7 @@ syntax_template_format_create(void) file = eina_file_open(file_path, EINA_FALSE); if (!file) { - EINA_LOG_ERR("Failed to open file \"%s\"", file_path); + EINA_LOG_ERR(_("Failed to open file \"%s\""), file_path); return NULL; } @@ -537,7 +537,7 @@ syntax_template_format_create(void) return tsd->syntax_template_format; err: - EINA_LOG_ERR("Failed to allocate Memory!"); + EINA_LOG_ERR(_("Failed to allocate Memory!")); if (utf8) free(utf8); eina_file_close(file); @@ -568,7 +568,7 @@ syntax_template_create(double font_scale) return tsd->syntax_template_str; err: - EINA_LOG_ERR("Failed to allocate Memory!"); + EINA_LOG_ERR(_("Failed to allocate Memory!")); if (syntax_template_format) { free(syntax_template_format); @@ -841,7 +841,7 @@ text_setting_layout_create(Evas_Object *parent) elm_slider_unit_format_set(slider_font, "%1.1fx"); elm_slider_min_max_set(slider_font, MIN_FONT_SCALE, MAX_FONT_SCALE); elm_slider_value_set(slider_font, tsd->font_scale); - elm_object_text_set(slider_font, "Font Size "); + elm_object_text_set(slider_font, _("Font Size ")); evas_object_smart_callback_add(slider_font, "changed", font_scale_slider_changed_cb, tsd); evas_object_show(slider_font); @@ -850,17 +850,17 @@ text_setting_layout_create(Evas_Object *parent) elm_box_pack_end(box2, slider_font); //Toggle (Line Number) - Evas_Object *toggle_linenum = toggle_create(box, "Line Number", + Evas_Object *toggle_linenum = toggle_create(box, _("Line Number"), config_linenumber_get()); elm_box_pack_end(box, toggle_linenum); //Toggle (Auto Indentation) - Evas_Object *toggle_indent = toggle_create(box, "Auto Indentation", + Evas_Object *toggle_indent = toggle_create(box, _("Auto Indentation"), config_auto_indent_get()); elm_box_pack_end(box, toggle_indent); //Toggle (Auto Completion) - Evas_Object *toggle_autocomp = toggle_create(box, "Auto Completion", + Evas_Object *toggle_autocomp = toggle_create(box, _("Auto Completion"), config_auto_complete_get()); elm_box_pack_end(box, toggle_autocomp); @@ -888,7 +888,7 @@ text_setting_layout_create(Evas_Object *parent) elm_box_pack_end(box2, layout_padding3); - Evas_Object *label_font_name = label_create(layout_padding3, "Font Name"); + Evas_Object *label_font_name = label_create(layout_padding3, _("Font Name")); elm_object_part_content_set(layout_padding3, "elm.swallow.content", label_font_name); @@ -914,7 +914,7 @@ text_setting_layout_create(Evas_Object *parent) elm_box_pack_end(box2, layout_padding3); - Evas_Object *label_font_style = label_create(layout_padding3, "Font Style"); + Evas_Object *label_font_style = label_create(layout_padding3, _("Font Style")); elm_object_part_content_set(layout_padding3, "elm.swallow.content", label_font_style); @@ -1067,7 +1067,7 @@ text_setting_init(void) tsd = calloc(1, sizeof(text_setting_data)); if (!tsd) { - EINA_LOG_ERR("Failed to allocate Memory!"); + EINA_LOG_ERR(_("Failed to allocate Memory!")); return; } g_tsd = tsd; diff --git a/src/bin/tools.c b/src/bin/tools.c index d251d06..52cdd11 100644 --- a/src/bin/tools.c +++ b/src/bin/tools.c @@ -114,9 +114,9 @@ redo_cb(void *data, Evas_Object *obj EINA_UNUSED, { Evas_Object *enventor = data; if (enventor_object_redo(enventor)) - stats_info_msg_update("Redo text."); + stats_info_msg_update(_("Redo text.")); else - stats_info_msg_update("No text to be redo."); + stats_info_msg_update(_("No text to be redo.")); } static void @@ -125,9 +125,9 @@ undo_cb(void *data, Evas_Object *obj EINA_UNUSED, { Evas_Object *enventor = data; if (enventor_object_undo(enventor)) - stats_info_msg_update("Undo text."); + stats_info_msg_update(_("Undo text.")); else - stats_info_msg_update("No text to be undo."); + stats_info_msg_update(_("No text to be undo.")); } static Evas_Object * @@ -167,7 +167,7 @@ tools_init(Evas_Object *parent, Evas_Object *enventor) td = calloc(1, sizeof(tools_data)); if (!td) { - EINA_LOG_ERR("Failed to allocate Memory!"); + EINA_LOG_ERR(_("Failed to allocate Memory!")); return NULL; } g_td = td; @@ -180,7 +180,7 @@ tools_init(Evas_Object *parent, Evas_Object *enventor) evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL); Evas_Object *btn; - btn = tools_btn_create(box, "menu", "Enventor Menu (Esc)", + btn = tools_btn_create(box, "menu", _("Enventor Menu (Esc)"), menu_cb, enventor); elm_object_tooltip_orient_set(btn, ELM_TOOLTIP_ORIENT_BOTTOM_RIGHT); evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); @@ -193,39 +193,39 @@ tools_init(Evas_Object *parent, Evas_Object *enventor) evas_object_show(sp); elm_box_pack_end(box, sp); - btn = tools_btn_create(box, "save","Save File (Ctrl + S)", + btn = tools_btn_create(box, "save",_("Save File (Ctrl + S)"), save_cb, enventor); evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(btn, 0.0, EVAS_HINT_FILL); elm_box_pack_end(box, btn); - btn = tools_btn_create(box, "undo", "Undo Text (Ctrl + Z)", + btn = tools_btn_create(box, "undo", _("Undo Text (Ctrl + Z)"), undo_cb, enventor); evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(btn, 0.0, EVAS_HINT_FILL); elm_box_pack_end(box, btn); - btn = tools_btn_create(box, "redo", "Redo Text (Ctrl + R)", + btn = tools_btn_create(box, "redo", _("Redo Text (Ctrl + R)"), redo_cb, enventor); evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(btn, 0.0, EVAS_HINT_FILL); elm_box_pack_end(box, btn); - btn = tools_btn_create(box, "find", "Find/Replace (Ctrl + F)", + btn = tools_btn_create(box, "find", _("Find/Replace (Ctrl + F)"), find_cb, enventor); evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(btn, 0.0, EVAS_HINT_FILL); elm_box_pack_end(box, btn); td->find_btn = btn; - btn = tools_btn_create(box, "goto", "Goto Lines (Ctrl + L)", + btn = tools_btn_create(box, "goto", _("Goto Lines (Ctrl + L)"), goto_cb, enventor); evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(btn, 0.0, EVAS_HINT_FILL); elm_box_pack_end(box, btn); td->goto_btn = btn; - btn = tools_btn_create(box, "lines", "Line Numbers (F5)", + btn = tools_btn_create(box, "lines", _("Line Numbers (F5)"), lines_cb, enventor); evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(btn, 0.0, EVAS_HINT_FILL); @@ -236,21 +236,21 @@ tools_init(Evas_Object *parent, Evas_Object *enventor) evas_object_show(sp); elm_box_pack_end(box, sp); - btn = tools_btn_create(box, "highlight", "Part Highlighting (Ctrl + H)", + btn = tools_btn_create(box, "highlight", _("Part Highlighting (Ctrl + H)"), highlight_cb, enventor); evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(btn, 0.0, EVAS_HINT_FILL); elm_box_pack_end(box, btn); td->highlight_btn = btn; - btn = tools_btn_create(box, "swallow_s", "Dummy Swallow (Ctrl + W)", + btn = tools_btn_create(box, "swallow_s", _("Dummy Swallow (Ctrl + W)"), swallow_cb, enventor); evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(btn, 0.0, EVAS_HINT_FILL); elm_box_pack_end(box, btn); td->swallow_btn = btn; - btn = tools_btn_create(box, "live_edit", "Live View Edit (Ctrl + E)", + btn = tools_btn_create(box, "live_edit", _("Live View Edit (Ctrl + E)"), live_edit_cb, enventor); evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(btn, 0.0, EVAS_HINT_FILL); @@ -262,7 +262,7 @@ tools_init(Evas_Object *parent, Evas_Object *enventor) evas_object_show(sp); elm_box_pack_end(box, sp); - btn = tools_btn_create(box, "console", "Console Box (Alt + Down)", + btn = tools_btn_create(box, "console", _("Console Box (Alt + Down)"), console_cb, NULL); elm_object_tooltip_orient_set(btn, ELM_TOOLTIP_ORIENT_BOTTOM_LEFT); evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); @@ -270,7 +270,7 @@ tools_init(Evas_Object *parent, Evas_Object *enventor) elm_box_pack_end(box, btn); td->console_btn = btn; - btn = tools_btn_create(box, "status", "Status (F11)", status_cb, NULL); + btn = tools_btn_create(box, "status", _("Status (F11)"), status_cb, NULL); elm_object_tooltip_orient_set(btn, ELM_TOOLTIP_ORIENT_BOTTOM_LEFT); evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(btn, 1.0, EVAS_HINT_FILL); @@ -306,9 +306,9 @@ tools_highlight_update(Evas_Object *enventor, Eina_Bool toggle) if (toggle) { if (config_part_highlight_get()) - stats_info_msg_update("Part Highlighting Enabled."); + stats_info_msg_update(_("Part Highlighting Enabled.")); else - stats_info_msg_update("Part Highlighting Disabled."); + stats_info_msg_update(_("Part Highlighting Disabled.")); } //Toggle on/off @@ -346,9 +346,9 @@ tools_swallow_update(Evas_Object *enventor, Eina_Bool toggle) if (toggle) { if (config_dummy_swallow_get()) - stats_info_msg_update("Dummy Swallow Enabled."); + stats_info_msg_update(_("Dummy Swallow Enabled.")); else - stats_info_msg_update("Dummy Swallow Disabled."); + stats_info_msg_update(_("Dummy Swallow Disabled.")); } //Toggle on/off if (config_dummy_swallow_get()) --