Hello, >> -#define _(str) dgettext(PACKAGE, str) >> +#define D_(str) dgettext(PACKAGE, str)
According to that change, I have a question. elementary uses E_(string) for dgettext. #define E_(string) dgettext(PACKAGE, string) Is there a recommended way to use dgettext? _(str), E_(str), D_(str) ? Thanks. Daniel Juyung Seo (SeoZ) On Thu, Apr 21, 2011 at 2:38 AM, Enlightenment SVN < [email protected]> wrote: > Log: > it didn't build due to i18n issues: fixed > > Author: maxerba > Date: 2011-04-20 10:38:25 -0700 (Wed, 20 Apr 2011) > New Revision: 58765 > Trac: http://trac.enlightenment.org/e/changeset/58765 > > Modified: > trunk/E-MODULES-EXTRA/exebuf/src/e_mod_main.c > trunk/E-MODULES-EXTRA/exebuf/src/e_mod_main.h > trunk/E-MODULES-EXTRA/exebuf/src/exebuf_config.c > > Modified: trunk/E-MODULES-EXTRA/exebuf/src/e_mod_main.c > =================================================================== > --- trunk/E-MODULES-EXTRA/exebuf/src/e_mod_main.c 2011-04-20 17:20:15 > UTC (rev 58764) > +++ trunk/E-MODULES-EXTRA/exebuf/src/e_mod_main.c 2011-04-20 17:38:25 > UTC (rev 58765) > @@ -82,7 +82,7 @@ > /* config too old */ > _exebuf_conf_free(); > ecore_timer_add(1.0, _exebuf_conf_timer, > - _("Exebuf Module Configuration data needed " > + D_("Exebuf Module Configuration data needed " > "upgrading. Your old configuration<br> has > been" > " wiped and a new set of defaults initialized. > " > "This<br>will happen regularly during " > @@ -102,7 +102,7 @@ > /* config too new...wtf ? */ > _exebuf_conf_free(); > ecore_timer_add(1.0, _exebuf_conf_timer, > - _("Your Exebuf Module configuration is NEWER " > + D_("Your Exebuf Module configuration is NEWER > " > "than the module version. This is " > "very<br>strange. This should not happen > unless" > " you downgraded<br>the module or " > @@ -129,14 +129,14 @@ > if (act) > { > act->func.go = _exebuf_action_exebuf_cb; > - e_action_predef_name_set(_("Launch"), _("Run Command Dialog"), > "exebuf", > + e_action_predef_name_set(D_("Launch"), D_("Run Command Dialog"), > "exebuf", > NULL, NULL, 0); > } > maug = e_int_menus_menu_augmentation_add_sorted > - ("main/1", _("Run Command"), _exebuf_menu_add, NULL, NULL, NULL); > + ("main/1", D_("Run Command"), _exebuf_menu_add, NULL, NULL, NULL); > > - e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, > "preferences-advanced"); > - e_configure_registry_item_add("advanced/run_command", 40, _("Run > Command"), NULL, "system-run", exebuf_config_dialog); > + e_configure_registry_category_add("advanced", 80, D_("Advanced"), NULL, > "preferences-advanced"); > + e_configure_registry_item_add("advanced/run_command", 40, D_("Run > Command"), NULL, "system-run", exebuf_config_dialog); > > /* Give E the module */ > return m; > @@ -157,7 +157,7 @@ > /* remove module-supplied action */ > if (act) > { > - e_action_predef_name_del(_("Launch"), _("Run Command Dialog")); > + e_action_predef_name_del(D_("Launch"), D_("Run Command Dialog")); > e_action_del("exebuf"); > act = NULL; > } > @@ -246,7 +246,7 @@ > static Eina_Bool > _exebuf_conf_timer(void *data) > { > - e_util_dialog_internal(_("Exebuf Configuration Updated"), data); > + e_util_dialog_internal(D_("Exebuf Configuration Updated"), data); > > return EINA_FALSE; > } > @@ -296,7 +296,7 @@ > E_Menu_Item *mi; > > mi = e_menu_item_new(m); > - e_menu_item_label_set(mi, _("Run Command")); > + e_menu_item_label_set(mi, D_("Run Command")); > e_util_menu_item_theme_icon_set(mi, "system-run"); > e_menu_item_callback_set(mi, _exebuf_run_cb, NULL); > } > > Modified: trunk/E-MODULES-EXTRA/exebuf/src/e_mod_main.h > =================================================================== > --- trunk/E-MODULES-EXTRA/exebuf/src/e_mod_main.h 2011-04-20 17:20:15 > UTC (rev 58764) > +++ trunk/E-MODULES-EXTRA/exebuf/src/e_mod_main.h 2011-04-20 17:38:25 > UTC (rev 58765) > @@ -18,7 +18,7 @@ > > /* Gettext: you need to use the D_ prefix for all your messages, > * like printf D_("Hello World\n"); so can be replaced by gettext */ > -#define _(str) dgettext(PACKAGE, str) > +#define D_(str) dgettext(PACKAGE, str) > > /* We create a structure config for our module, and also a config > structure > * for every item element (you can have multiple gadgets for the same > module) */ > > Modified: trunk/E-MODULES-EXTRA/exebuf/src/exebuf_config.c > =================================================================== > --- trunk/E-MODULES-EXTRA/exebuf/src/exebuf_config.c 2011-04-20 17:20:15 > UTC (rev 58764) > +++ trunk/E-MODULES-EXTRA/exebuf/src/exebuf_config.c 2011-04-20 17:38:25 > UTC (rev 58765) > @@ -47,7 +47,7 @@ > v->advanced.apply_cfdata = _adv_apply; > v->advanced.check_changed = _adv_check_changed; > > - cfd = e_config_dialog_new(con, _("Run Command Settings"), "E", > + cfd = e_config_dialog_new(con, D_("Run Command Settings"), "E", > "advanced/run_command", "system-run", 0, v, > NULL); > return cfd; > } > @@ -108,26 +108,26 @@ > > o = e_widget_list_add(evas, 0, 0); > > - of = e_widget_framelist_add(evas, _("General"), 0); > - ow = e_widget_label_add(evas, _("Maximum Apps to List")); > + of = e_widget_framelist_add(evas, D_("General"), 0); > + ow = e_widget_label_add(evas, D_("Maximum Apps to List")); > e_widget_framelist_object_append(of, ow); > - ow = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 10, 50, 5, 0, NULL, > + ow = e_widget_slider_add(evas, 1, 0, D_("%1.0f"), 10, 50, 5, 0, NULL, > &(cfdata->max_eap_list), 100); > e_widget_framelist_object_append(of, ow); > - ow = e_widget_label_add(evas, _("Maximum Exes to List")); > + ow = e_widget_label_add(evas, D_("Maximum Exes to List")); > e_widget_framelist_object_append(of, ow); > - ow = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 10, 50, 5, 0, NULL, > + ow = e_widget_slider_add(evas, 1, 0, D_("%1.0f"), 10, 50, 5, 0, NULL, > &(cfdata->max_exe_list), 100); > e_widget_framelist_object_append(of, ow); > - ow = e_widget_label_add(evas, _("Maximum History to List")); > + ow = e_widget_label_add(evas, D_("Maximum History to List")); > e_widget_framelist_object_append(of, ow); > - ow = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 10, 200, 5, 0, NULL, > + ow = e_widget_slider_add(evas, 1, 0, D_("%1.0f"), 10, 200, 5, 0, NULL, > &(cfdata->max_hist_list), 100); > e_widget_framelist_object_append(of, ow); > e_widget_list_object_append(o, of, 1, 0, 0.5); > > - of = e_widget_framelist_add(evas, _("Animations"), 0); > - ow = e_widget_check_add(evas, _("Animate"), &(cfdata->scroll_animate)); > + of = e_widget_framelist_add(evas, D_("Animations"), 0); > + ow = e_widget_check_add(evas, D_("Animate"), > &(cfdata->scroll_animate)); > e_widget_framelist_object_append(of, ow); > e_widget_list_object_append(o, of, 1, 0, 0.5); > > @@ -178,81 +178,81 @@ > > /* General Page */ > ol = e_widget_list_add(evas, 0, 0); > - ow = e_widget_label_add(evas, _("Maximum Apps to List")); > + ow = e_widget_label_add(evas, D_("Maximum Apps to List")); > e_widget_list_object_append(ol, ow, 1, 0, 0.5); > - ow = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 10, 50, 5, 0, NULL, > + ow = e_widget_slider_add(evas, 1, 0, D_("%1.0f"), 10, 50, 5, 0, NULL, > &(cfdata->max_eap_list), 100); > e_widget_list_object_append(ol, ow, 1, 0, 0.5); > - ow = e_widget_label_add(evas, _("Maximum Exes to List")); > + ow = e_widget_label_add(evas, D_("Maximum Exes to List")); > e_widget_list_object_append(ol, ow, 1, 0, 0.5); > - ow = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 10, 50, 5, 0, NULL, > + ow = e_widget_slider_add(evas, 1, 0, D_("%1.0f"), 10, 50, 5, 0, NULL, > &(cfdata->max_exe_list), 100); > e_widget_list_object_append(ol, ow, 1, 0, 0.5); > - ow = e_widget_label_add(evas, _("Maximum History to List")); > + ow = e_widget_label_add(evas, D_("Maximum History to List")); > e_widget_list_object_append(ol, ow, 1, 0, 0.5); > - ow = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 10, 200, 5, 0, NULL, > + ow = e_widget_slider_add(evas, 1, 0, D_("%1.0f"), 10, 200, 5, 0, NULL, > &(cfdata->max_hist_list), 100); > e_widget_list_object_append(ol, ow, 1, 0, 0.5); > - e_widget_toolbook_page_append(otb, NULL, _("General"), ol, 1, 0, 1, 0, > + e_widget_toolbook_page_append(otb, NULL, D_("General"), ol, 1, 0, 1, 0, > 0.5, 0.0); > > /* Scroll Page */ > ol = e_widget_list_add(evas, 0, 0); > - ow = e_widget_check_add(evas, _("Animate"), &(cfdata->scroll_animate)); > + ow = e_widget_check_add(evas, D_("Animate"), > &(cfdata->scroll_animate)); > e_widget_on_change_hook_set(ow, _cb_animate_changed, cfdata); > e_widget_list_object_append(ol, ow, 1, 0, 0.5); > - ow = e_widget_label_add(evas, _("Speed")); > + ow = e_widget_label_add(evas, D_("Speed")); > cfdata->gui.scroll_speed_lbl = ow; > e_widget_list_object_append(ol, ow, 1, 0, 0.5); > - ow = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0, > + ow = e_widget_slider_add(evas, 1, 0, D_("%1.2f"), 0.0, 1.0, 0.01, 0, > &(cfdata->scroll_speed), NULL, 100); > cfdata->gui.scroll_speed_slider = ow; > e_widget_list_object_append(ol, ow, 1, 0, 0.5); > - e_widget_toolbook_page_append(otb, NULL, _("Animations"), ol, 1, 0, 1, > 0, > + e_widget_toolbook_page_append(otb, NULL, D_("Animations"), ol, 1, 0, 1, > 0, > 0.5, 0.0); > > /* Size Page */ > ol = e_widget_list_add(evas, 0, 0); > - ow = e_widget_label_add(evas, _("Minimum Width")); > + ow = e_widget_label_add(evas, D_("Minimum Width")); > e_widget_list_object_append(ol, ow, 1, 0, 0.5); > - ow = e_widget_slider_add(evas, 1, 0, _("%4.0f"), 0, 4000, 50, 0, > + ow = e_widget_slider_add(evas, 1, 0, D_("%4.0f"), 0, 4000, 50, 0, > NULL, &(cfdata->pos_min_w), 100); > e_widget_list_object_append(ol, ow, 1, 0, 0.5); > - ow = e_widget_label_add(evas, _("Minimum Height")); > + ow = e_widget_label_add(evas, D_("Minimum Height")); > e_widget_list_object_append(ol, ow, 1, 0, 0.5); > - ow = e_widget_slider_add(evas, 1, 0, _("%4.0f"), 0, 4000, 50, 0, > + ow = e_widget_slider_add(evas, 1, 0, D_("%4.0f"), 0, 4000, 50, 0, > NULL, &(cfdata->pos_min_h), 100); > e_widget_list_object_append(ol, ow, 1, 0, 0.5); > - ow = e_widget_label_add(evas, _("Maximum Width")); > + ow = e_widget_label_add(evas, D_("Maximum Width")); > e_widget_list_object_append(ol, ow, 1, 0, 0.5); > - ow = e_widget_slider_add(evas, 1, 0, _("%4.0f"), 0, 4000, 50, 0, > + ow = e_widget_slider_add(evas, 1, 0, D_("%4.0f"), 0, 4000, 50, 0, > NULL, &(cfdata->pos_max_w), 100); > e_widget_list_object_append(ol, ow, 1, 0, 0.5); > - ow = e_widget_label_add(evas, _("Maximum Height")); > + ow = e_widget_label_add(evas, D_("Maximum Height")); > e_widget_list_object_append(ol, ow, 1, 0, 0.5); > - ow = e_widget_slider_add(evas, 1, 0, _("%4.0f"), 0, 4000, 50, 0, > + ow = e_widget_slider_add(evas, 1, 0, D_("%4.0f"), 0, 4000, 50, 0, > NULL, &(cfdata->pos_max_h), 100); > e_widget_list_object_append(ol, ow, 1, 0, 0.5); > - ow = e_widget_label_add(evas, _("X-Axis Alignment")); > + ow = e_widget_label_add(evas, D_("X-Axis Alignment")); > e_widget_list_object_append(ol, ow, 1, 0, 0.5); > - ow = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0, > + ow = e_widget_slider_add(evas, 1, 0, D_("%1.2f"), 0.0, 1.0, 0.01, 0, > &(cfdata->pos_align_x), NULL, 100); > e_widget_list_object_append(ol, ow, 1, 0, 0.5); > - ow = e_widget_label_add(evas, _("Y-Axis Alignment")); > + ow = e_widget_label_add(evas, D_("Y-Axis Alignment")); > e_widget_list_object_append(ol, ow, 1, 0, 0.5); > - ow = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0, > + ow = e_widget_slider_add(evas, 1, 0, D_("%1.2f"), 0.0, 1.0, 0.01, 0, > &(cfdata->pos_align_y), NULL, 100); > e_widget_list_object_append(ol, ow, 1, 0, 0.5); > - e_widget_toolbook_page_append(otb, NULL, _("Geometry"), ol, 1, 0, 1, 0, > + e_widget_toolbook_page_append(otb, NULL, D_("Geometry"), ol, 1, 0, 1, > 0, > 0.5, 0.0); > > /* Terminal Page */ > ol = e_widget_list_add(evas, 0, 0); > - ow = e_widget_label_add(evas, _("Command (CTRL+RETURN to utilize)")); > + ow = e_widget_label_add(evas, D_("Command (CTRL+RETURN to utilize)")); > e_widget_list_object_append(ol, ow, 1, 0, 0.5); > ow = e_widget_entry_add(evas, &(cfdata->term_cmd), NULL, NULL, NULL); > e_widget_list_object_append(ol, ow, 1, 0, 0.5); > - e_widget_toolbook_page_append(otb, NULL, _("Terminal"), ol, 1, 0, 1, 0, > + e_widget_toolbook_page_append(otb, NULL, D_("Terminal"), ol, 1, 0, 1, > 0, > 0.5, 0.0); > > e_widget_toolbook_page_show(otb, 0); > > > > ------------------------------------------------------------------------------ > Benefiting from Server Virtualization: Beyond Initial Workload > Consolidation -- Increasing the use of server virtualization is a top > priority.Virtualization can reduce costs, simplify management, and improve > application availability and disaster protection. Learn more about boosting > the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev > _______________________________________________ > enlightenment-svn mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > ------------------------------------------------------------------------------ Benefiting from Server Virtualization: Beyond Initial Workload Consolidation -- Increasing the use of server virtualization is a top priority.Virtualization can reduce costs, simplify management, and improve application availability and disaster protection. Learn more about boosting the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
