Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : echo
Dir : e_modules/echo/src
Modified Files:
e_mod_config.c e_mod_main.c e_mod_main.h
Log Message:
Update for gettext support
===================================================================
RCS file: /cvs/e/e_modules/echo/src/e_mod_config.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_config.c 9 Jan 2008 23:07:58 -0000 1.1
+++ e_mod_config.c 10 Jan 2008 20:32:37 -0000 1.2
@@ -32,7 +32,7 @@
v->basic.apply_cfdata = _basic_apply;
snprintf(buf, sizeof(buf), "%s/e-module-echo.edj", echo_mod->dir);
- cfd = e_config_dialog_new(con, "Echo Configuration", "Echo",
+ cfd = e_config_dialog_new(con, D_("Echo Configuration"), "Echo",
"_echo_cfg_dlg", buf, 0, v, NULL);
echo_cfg->cfd = cfd;
return cfd;
@@ -74,12 +74,12 @@
int i = 0;
o = e_widget_list_add(evas, 0, 0);
- of = e_widget_framelist_add(evas, _("General Settings"), 0);
- ow = e_widget_check_add(evas, _("Lock Sliders"), &(cfdata->lock));
+ of = e_widget_framelist_add(evas, D_("General Settings"), 0);
+ ow = e_widget_check_add(evas, D_("Lock Sliders"), &(cfdata->lock));
e_widget_framelist_object_append(of, ow);
e_widget_list_object_append(o, of, 1, 1, 0.5);
- of = e_widget_framelist_add(evas, _("Sound Cards"), 0);
+ of = e_widget_framelist_add(evas, D_("Sound Cards"), 0);
rg = e_widget_radio_group_new(&(cfdata->card));
for (i = 0, l = echo_sys->get_cards(); l; l = l->next, i++)
{
@@ -91,7 +91,7 @@
}
e_widget_list_object_append(o, of, 1, 1, 0.5);
- of = e_widget_frametable_add(evas, _("Channels"), 0);
+ of = e_widget_frametable_add(evas, D_("Channels"), 0);
rg = e_widget_radio_group_new(&(cfdata->channel));
for (i = 0, l = echo_sys->get_channels(); l; l = l->next, i++)
{
===================================================================
RCS file: /cvs/e/e_modules/echo/src/e_mod_main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_mod_main.c 10 Jan 2008 19:49:59 -0000 1.5
+++ e_mod_main.c 10 Jan 2008 20:32:37 -0000 1.6
@@ -147,7 +147,7 @@
static char *
_gc_label(void)
{
- return "Echo";
+ return D_("Echo");
}
static Evas_Object *
@@ -196,33 +196,33 @@
{
_echo_cfg_free();
ecore_timer_add(1.0, _echo_cfg_timer,
- "Echo 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 "
- "development, so don't report a<br>bug. "
- "This simply means the Echo module needs "
- "new configuration<br>data by default for "
- "usable functionality that your old<br>"
- "configuration simply lacks. This new set of "
- "defaults will fix<br>that by adding it in. "
- "You can re-configure things now to your<br>"
- "liking. Sorry for the inconvenience.<br>");
+ D_("Echo 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 "
+ "development, so don't report a<br>bug. "
+ "This simply means the Echo module needs "
+ "new configuration<br>data by default for "
+ "usable functionality that your old<br>"
+ "configuration simply lacks. This new set of "
+ "defaults will fix<br>that by adding it in. "
+ "You can re-configure things now to your<br>"
+ "liking. Sorry for the inconvenience.<br>"));
}
else if (echo_cfg->version > MOD_CFG_FILE_VERSION)
{
_echo_cfg_free();
ecore_timer_add(1.0, _echo_cfg_timer,
- "Your Echo Module configuration is NEWER "
- "than the Echo Module version. This is "
- "very<br>strange. This should not happen unless"
- " you downgraded<br>the Echo Module or "
- "copied the configuration from a place where"
- "<br>a newer version of the Echo Module "
- "was running. This is bad and<br>as a "
- "precaution your configuration has been now "
- "restored to<br>defaults. Sorry for the "
- "inconvenience.<br>");
+ D_("Your Echo Module configuration is NEWER "
+ "than the Echo Module version. This is "
+ "very<br>strange. This should not happen
unless"
+ " you downgraded<br>the Echo Module or "
+ "copied the configuration from a place where"
+ "<br>a newer version of the Echo Module "
+ "was running. This is bad and<br>as a "
+ "precaution your configuration has been now "
+ "restored to<br>defaults. Sorry for the "
+ "inconvenience.<br>"));
}
}
if (!echo_cfg) _echo_cfg_new();
@@ -309,7 +309,7 @@
static int
_echo_cfg_timer(void *data)
{
- e_util_dialog_show("Echo Configuration Updated", data);
+ e_util_dialog_show(D_("Echo Configuration Updated"), data);
return 0;
}
@@ -334,7 +334,7 @@
inst->menu = mn;
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, "Configuration");
+ e_menu_item_label_set(mi, D_("Configuration"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
e_menu_item_callback_set(mi, _echo_cb_menu_cfg, inst);
@@ -431,7 +431,7 @@
if ((echo_sys->can_mute) && (echo_sys->can_mute(echo_cfg->channel.name)))
{
- ow = e_widget_check_add(evas, "Mute", &(inst->mute));
+ ow = e_widget_check_add(evas, D_("Mute"), &(inst->mute));
evas_object_show(ow);
e_widget_frametable_object_append(of, ow, 0, 6, 2, 1, 1, 1, 1, 0);
evas_object_smart_callback_add(ow, "changed",
===================================================================
RCS file: /cvs/e/e_modules/echo/src/e_mod_main.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_main.h 9 Jan 2008 23:07:58 -0000 1.1
+++ e_mod_main.h 10 Jan 2008 20:32:37 -0000 1.2
@@ -1,3 +1,5 @@
+#define D_(str) dgettext(PACKAGE, str)
+
#ifndef E_MOD_MAIN_H
#define E_MOD_MAIN_H
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
