Enlightenment CVS committal
Author : kiwi
Project : e_modules
Module : eveil
Dir : e_modules/eveil
Modified Files:
Makefile.am configure.in e_mod_config.c e_mod_config_alarm.c
e_mod_main.c e_mod_main.h
Log Message:
Massimo Maiurana patch for i18n support
===================================================================
RCS file: /cvs/e/e_modules/eveil/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 1 Jun 2006 12:55:25 -0000 1.2
+++ Makefile.am 12 Jun 2006 08:54:21 -0000 1.3
@@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS =
+SUBDIRS = po
EDJE_CC = @edje_cc@
EDJE_FLAGS = -id . -fd $(srcdir)/fonts
===================================================================
RCS file: /cvs/e/e_modules/eveil/configure.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- configure.in 29 May 2006 08:42:20 -0000 1.1
+++ configure.in 12 Jun 2006 08:54:22 -0000 1.2
@@ -20,7 +20,7 @@
AM_ENABLE_SHARED
AM_PROG_LIBTOOL
-ALL_LINGUAS="fi it ja ru sv"
+ALL_LINGUAS="it"
AC_SUBST(ALL_LINGUAS)
AM_GNU_GETTEXT([external])
@@ -152,6 +152,7 @@
AC_OUTPUT([
Makefile
+po/Makefile
e_modules-eveil.spec
],[
])
===================================================================
RCS file: /cvs/e/e_modules/eveil/e_mod_config.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_config.c 1 Jun 2006 12:55:25 -0000 1.3
+++ e_mod_config.c 12 Jun 2006 08:54:22 -0000 1.4
@@ -70,7 +70,7 @@
v->advanced.create_widgets = _advanced_create_widgets;
cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()),
- _("Eveil Configuration"), NULL, 0, v, NULL);
+ D_("Eveil Configuration"), NULL, 0, v, NULL);
eveil_config->config_dialog = cfd;
}
@@ -183,9 +183,9 @@
{
Evas_Object *of, *ob;
- of = e_widget_frametable_add(evas, _("Alarm"), 0);
+ of = e_widget_frametable_add(evas, D_("Alarm"), 0);
- ob = e_widget_check_add(evas, _("Active"), &(cfdata->alarms_active));
+ ob = e_widget_check_add(evas, D_("Active"), &(cfdata->alarms_active));
e_widget_frametable_object_append(of, ob, 0, 0, 2, 1, 1, 1, 1, 10);
ob = e_widget_ilist_add(evas, 16, 16, NULL);
@@ -204,10 +204,10 @@
e_widget_table_object_append(o, of, 0, 0, 1, 1, 1, 1, 1, 1);
- of = e_widget_frametable_add(evas, _("Timer"), 0);
+ of = e_widget_frametable_add(evas, D_("Timer"), 0);
cfdata->timer_gui.slider_h =
- e_widget_slider_add(evas, 1, 0, _("%1.0f hours"),
+ e_widget_slider_add(evas, 1, 0, D_("%1.0f hours"),
(float)TIMER_TIME_MIN/3600,
(float)TIMER_TIME_MAX/3600,
1.0, 0,
NULL, &(cfdata->timer_time_h), 130);
@@ -215,7 +215,7 @@
e_widget_frametable_object_append(of, cfdata->timer_gui.slider_h,
0, 0, 3, 1, 1, 0, 1, 0);
cfdata->timer_gui.slider_m =
- e_widget_slider_add(evas, 1, 0, _("%1.0f min"),
+ e_widget_slider_add(evas, 1, 0, D_("%1.0f min"),
0.0, 59.0,
1.0, 0,
NULL, &(cfdata->timer_time_m), 130);
@@ -223,7 +223,7 @@
e_widget_frametable_object_append(of, cfdata->timer_gui.slider_m,
0, 1, 3, 1, 1, 0, 1, 0);
cfdata->timer_gui.slider_s =
- e_widget_slider_add(evas, 1, 0, _("%1.0f sec"),
+ e_widget_slider_add(evas, 1, 0, D_("%1.0f sec"),
0.0, 59.0,
1.0, 0,
NULL, &(cfdata->timer_time_s), 130);
@@ -232,17 +232,17 @@
0, 2, 3, 1, 1, 0, 1, 0);
cfdata->timer_gui.button_start =
- e_widget_button_add(evas, _("Start !"), NULL, _cb_timer_start, cfdata,
NULL);
+ e_widget_button_add(evas, D_("Start !"), NULL, _cb_timer_start, cfdata,
NULL);
e_widget_disabled_set(cfdata->timer_gui.button_start,
eveil_config->timer_state);
e_widget_frametable_object_append(of, cfdata->timer_gui.button_start,
0, 3, 1, 1, 1, 1, 1, 1);
cfdata->timer_gui.button_stop =
- e_widget_button_add(evas, _("Stop !"), NULL, _cb_timer_stop, cfdata,
NULL);
+ e_widget_button_add(evas, D_("Stop !"), NULL, _cb_timer_stop, cfdata,
NULL);
e_widget_disabled_set(cfdata->timer_gui.button_stop,
!eveil_config->timer_state);
e_widget_frametable_object_append(of, cfdata->timer_gui.button_stop,
1, 3, 1, 1, 1, 1, 1, 1);
cfdata->timer_gui.button_zero =
- e_widget_button_add(evas, _("Zero"), NULL, _cb_timer_zero, cfdata, NULL);
+ e_widget_button_add(evas, D_("Zero"), NULL, _cb_timer_zero, cfdata,
NULL);
e_widget_disabled_set(cfdata->timer_gui.button_zero,
eveil_config->timer_state);
e_widget_frametable_object_append(of, cfdata->timer_gui.button_zero,
2, 3, 1, 1, 1, 1, 1, 1);
@@ -302,78 +302,78 @@
_common_create_widgets(cfd, evas, cfdata, o);
- of = e_widget_frametable_add(evas, _("Alarm Options"), 0);
+ of = e_widget_frametable_add(evas, D_("Alarm Options"), 0);
- ob = e_widget_label_add(evas, _("Show icon"));
+ ob = e_widget_label_add(evas, D_("Show icon"));
e_widget_frametable_object_append(of, ob, 0, 0, 2, 1, 1, 1, 1, 1);
rg = e_widget_radio_group_new(&(cfdata->alarms_icon_mode));
- ob = e_widget_radio_add(evas, _("Never"), ALARMS_ICON_MODE_OFF, rg);
+ ob = e_widget_radio_add(evas, D_("Never"), ALARMS_ICON_MODE_OFF, rg);
e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1);
- ob = e_widget_radio_add(evas, _("When enabled"), ALARMS_ICON_MODE_ONGO, rg);
+ ob = e_widget_radio_add(evas, D_("When enabled"), ALARMS_ICON_MODE_ONGO,
rg);
e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1);
- ob = e_widget_radio_add(evas, _("Always"), ALARMS_ICON_MODE_ON, rg);
+ ob = e_widget_radio_add(evas, D_("Always"), ALARMS_ICON_MODE_ON, rg);
e_widget_frametable_object_append(of, ob, 2, 1, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Show details"));
+ ob = e_widget_label_add(evas, D_("Show details"));
e_widget_frametable_object_append(of, ob, 0, 2, 2, 1, 1, 1, 1, 1);
rg = e_widget_radio_group_new(&(cfdata->alarms_detail_mode));
- ob = e_widget_radio_add(evas, _("Never"), ALARMS_DETAIL_MODE_OFF, rg);
+ ob = e_widget_radio_add(evas, D_("Never"), ALARMS_DETAIL_MODE_OFF, rg);
e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 1);
- ob = e_widget_radio_add(evas, _("When enabled"), ALARMS_DETAIL_MODE_ONGO,
rg);
+ ob = e_widget_radio_add(evas, D_("When enabled"), ALARMS_DETAIL_MODE_ONGO,
rg);
e_widget_frametable_object_append(of, ob, 1, 3, 1, 1, 1, 1, 1, 1);
- ob = e_widget_radio_add(evas, _("Always"), ALARMS_DETAIL_MODE_ON, rg);
+ ob = e_widget_radio_add(evas, D_("Always"), ALARMS_DETAIL_MODE_ON, rg);
e_widget_frametable_object_append(of, ob, 2, 3, 1, 1, 1, 1, 1, 1);
- ob = e_widget_check_add(evas, _("Open popup"),
&(cfdata->alarms_open_popup_default));
+ ob = e_widget_check_add(evas, D_("Open popup"),
&(cfdata->alarms_open_popup_default));
e_widget_frametable_object_append(of, ob, 0, 4, 2, 1, 1, 1, 1, 1);
- ob = e_widget_check_add(evas, _("Run program"),
&(cfdata->alarms_run_program_default));
+ ob = e_widget_check_add(evas, D_("Run program"),
&(cfdata->alarms_run_program_default));
e_widget_frametable_object_append(of, ob, 0, 5, 1, 1, 1, 1, 1, 1);
ob = e_widget_entry_add(evas, &(cfdata->alarms_program_default));
e_widget_min_size_set(ob, 110, 25);
e_widget_frametable_object_append(of, ob, 1, 5, 2, 1, 1, 1, 1, 1);
- ob = e_widget_check_add(evas, _("Remove alarm after the date"),
&(cfdata->alarms_date_autoremove_default));
+ ob = e_widget_check_add(evas, D_("Remove alarm after the date"),
&(cfdata->alarms_date_autoremove_default));
e_widget_frametable_object_append(of, ob, 0, 6, 3, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Time format"));
+ ob = e_widget_label_add(evas, D_("Time format"));
e_widget_frametable_object_append(of, ob, 0, 7, 1, 1, 1, 1, 1, 1);
rg = e_widget_radio_group_new(&(cfdata->time_format));
- ob = e_widget_radio_add(evas, _("12h"), TIME_FORMAT_12, rg);
+ ob = e_widget_radio_add(evas, D_("12h"), TIME_FORMAT_12, rg);
e_widget_frametable_object_append(of, ob, 1, 7, 1, 1, 1, 1, 1, 1);
- ob = e_widget_radio_add(evas, _("24h"), TIME_FORMAT_24, rg);
+ ob = e_widget_radio_add(evas, D_("24h"), TIME_FORMAT_24, rg);
e_widget_frametable_object_append(of, ob, 2, 7, 1, 1, 1, 1, 1, 1);
e_widget_table_object_append(o, of, 1, 0, 1, 1, 1, 1, 1, 1);
- of = e_widget_frametable_add(evas, _("Timer Options"), 0);
+ of = e_widget_frametable_add(evas, D_("Timer Options"), 0);
- ob = e_widget_label_add(evas, _("Show icon"));
+ ob = e_widget_label_add(evas, D_("Show icon"));
e_widget_frametable_object_append(of, ob, 0, 0, 2, 1, 1, 1, 1, 1);
rg = e_widget_radio_group_new(&(cfdata->timer_icon_mode));
- ob = e_widget_radio_add(evas, _("Never"), TIMER_ICON_MODE_OFF, rg);
+ ob = e_widget_radio_add(evas, D_("Never"), TIMER_ICON_MODE_OFF, rg);
e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1);
- ob = e_widget_radio_add(evas, _("When enabled"), TIMER_ICON_MODE_ONGO, rg);
+ ob = e_widget_radio_add(evas, D_("When enabled"), TIMER_ICON_MODE_ONGO, rg);
e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1);
- ob = e_widget_radio_add(evas, _("Always"), TIMER_ICON_MODE_ON, rg);
+ ob = e_widget_radio_add(evas, D_("Always"), TIMER_ICON_MODE_ON, rg);
e_widget_frametable_object_append(of, ob, 2, 1, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Show details"));
+ ob = e_widget_label_add(evas, D_("Show details"));
e_widget_frametable_object_append(of, ob, 0, 2, 2, 1, 1, 1, 1, 1);
rg = e_widget_radio_group_new(&(cfdata->timer_detail_mode));
- ob = e_widget_radio_add(evas, _("Never"), TIMER_DETAIL_MODE_OFF, rg);
+ ob = e_widget_radio_add(evas, D_("Never"), TIMER_DETAIL_MODE_OFF, rg);
e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 1);
- ob = e_widget_radio_add(evas, _("When enabled"), TIMER_DETAIL_MODE_ONGO,
rg);
+ ob = e_widget_radio_add(evas, D_("When enabled"), TIMER_DETAIL_MODE_ONGO,
rg);
e_widget_frametable_object_append(of, ob, 1, 3, 1, 1, 1, 1, 1, 1);
- ob = e_widget_radio_add(evas, _("Always"), TIMER_DETAIL_MODE_ON, rg);
+ ob = e_widget_radio_add(evas, D_("Always"), TIMER_DETAIL_MODE_ON, rg);
e_widget_frametable_object_append(of, ob, 2, 3, 1, 1, 1, 1, 1, 1);
- ob = e_widget_check_add(evas, _("Open popup"),
&(cfdata->timer_open_popup_default));
+ ob = e_widget_check_add(evas, D_("Open popup"),
&(cfdata->timer_open_popup_default));
e_widget_frametable_object_append(of, ob, 0, 4, 2, 1, 1, 1, 1, 1);
- ob = e_widget_check_add(evas, _("Run program"),
&(cfdata->timer_run_program_default));
+ ob = e_widget_check_add(evas, D_("Run program"),
&(cfdata->timer_run_program_default));
e_widget_frametable_object_append(of, ob, 0, 5, 1, 1, 1, 1, 1, 1);
ob = e_widget_entry_add(evas, &(cfdata->timer_program_default));
===================================================================
RCS file: /cvs/e/e_modules/eveil/e_mod_config_alarm.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_config_alarm.c 1 Jun 2006 12:55:25 -0000 1.3
+++ e_mod_config_alarm.c 12 Jun 2006 08:54:22 -0000 1.4
@@ -65,7 +65,7 @@
v->advanced.create_widgets = _advanced_create_widgets;
cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()),
- _("Eveil Alarm Configuration"), NULL, 0, v, al);
+ D_("Eveil Alarm Configuration"), NULL, 0, v, al);
}
static void *
@@ -164,16 +164,16 @@
Evas_Object *of, *ob;
E_Radio_Group *rg;
- of = e_widget_frametable_add(evas, _("Informations"), 0);
+ of = e_widget_frametable_add(evas, D_("Informations"), 0);
- ob = e_widget_check_add(evas, _("Active"), &(cfdata->state));
+ ob = e_widget_check_add(evas, D_("Active"), &(cfdata->state));
e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
ob = e_widget_label_add(evas, _("Name"));
e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1);
ob = e_widget_entry_add(evas, &(cfdata->name));
e_widget_min_size_set(ob, 200, 25);
e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Description"));
+ ob = e_widget_label_add(evas, D_("Description"));
e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1);
ob = e_widget_entry_add(evas, &(cfdata->description));
e_widget_min_size_set(ob, 250, 25);
@@ -183,44 +183,44 @@
e_widget_list_object_append(o, of, 1, 1, 0.5);
- of = e_widget_frametable_add(evas, _("Schedule"), 0);
+ of = e_widget_frametable_add(evas, D_("Schedule"), 0);
- ob = e_widget_slider_add(evas, 1, 0, _("%1.0f hour"), 0.0, 23.0, 1.0, 0,
+ ob = e_widget_slider_add(evas, 1, 0, D_("%1.0f hour"), 0.0, 23.0, 1.0, 0,
NULL, &(cfdata->sched.hour), 130);
e_widget_frametable_object_append(of, ob, 0, 0, 4, 1, 1, 0, 1, 0);
- ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minute"), 0.0, 59.0, 1.0, 0,
+ ob = e_widget_slider_add(evas, 1, 0, D_("%1.0f minute"), 0.0, 59.0, 1.0, 0,
NULL, &(cfdata->sched.minute), 130);
e_widget_frametable_object_append(of, ob, 0, 1, 4, 1, 1, 0, 1, 0);
rg = e_widget_radio_group_new(&(cfdata->sched.type));
- ob = e_widget_radio_add(evas, _("Days of the week"), ALARM_SCHED_TYPE_WEEK,
rg);
+ ob = e_widget_radio_add(evas, D_("Days of the week"),
ALARM_SCHED_TYPE_WEEK, rg);
e_widget_frametable_object_append(of, ob, 0, 3, 2, 1, 1, 1, 1, 1);
- ob = e_widget_check_add(evas, _("Monday"), &(cfdata->sched.day_monday));
+ ob = e_widget_check_add(evas, D_("Monday"), &(cfdata->sched.day_monday));
e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 1, 1, 1);
- ob = e_widget_check_add(evas, _("Tuesday"), &(cfdata->sched.day_tuesday));
+ ob = e_widget_check_add(evas, D_("Tuesday"), &(cfdata->sched.day_tuesday));
e_widget_frametable_object_append(of, ob, 0, 5, 1, 1, 1, 1, 1, 1);
- ob = e_widget_check_add(evas, _("Wenesday"), &(cfdata->sched.day_wenesday));
+ ob = e_widget_check_add(evas, D_("Wenesday"),
&(cfdata->sched.day_wenesday));
e_widget_frametable_object_append(of, ob, 0, 6, 1, 1, 1, 1, 1, 1);
- ob = e_widget_check_add(evas, _("Thursday"), &(cfdata->sched.day_thursday));
+ ob = e_widget_check_add(evas, D_("Thursday"),
&(cfdata->sched.day_thursday));
e_widget_frametable_object_append(of, ob, 0, 7, 1, 1, 1, 1, 1, 1);
- ob = e_widget_check_add(evas, _("Friday"), &(cfdata->sched.day_friday));
+ ob = e_widget_check_add(evas, D_("Friday"), &(cfdata->sched.day_friday));
e_widget_frametable_object_append(of, ob, 0, 8, 1, 1, 1, 1, 1, 1);
- ob = e_widget_check_add(evas, _("Saturday"), &(cfdata->sched.day_saturday));
+ ob = e_widget_check_add(evas, D_("Saturday"),
&(cfdata->sched.day_saturday));
e_widget_frametable_object_append(of, ob, 1, 4, 1, 1, 1, 1, 1, 1);
- ob = e_widget_check_add(evas, _("Sunday"), &(cfdata->sched.day_sunday));
+ ob = e_widget_check_add(evas, D_("Sunday"), &(cfdata->sched.day_sunday));
e_widget_frametable_object_append(of, ob, 1, 5, 1, 1, 1, 1, 1, 1);
- ob = e_widget_radio_add(evas, _("One day"), ALARM_SCHED_TYPE_DAY, rg);
+ ob = e_widget_radio_add(evas, D_("One day"), ALARM_SCHED_TYPE_DAY, rg);
e_widget_frametable_object_append(of, ob, 3, 3, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Date (YYYY/MM/DD)"));
+ ob = e_widget_label_add(evas, D_("Date (YYYY/MM/DD)"));
e_widget_frametable_object_append(of, ob, 3, 4, 1, 1, 1, 1, 1, 1);
cfdata->sched_gui.date = e_widget_entry_add(evas, &(cfdata->sched.date));
e_widget_min_size_set(cfdata->sched_gui.date, 100, 25);
e_widget_frametable_object_append(of, cfdata->sched_gui.date, 3, 5, 1, 1,
1, 1, 1, 1);
- ob = e_widget_button_add(evas, _("Today"), NULL, _cb_alarm_today, cfdata,
NULL);
+ ob = e_widget_button_add(evas, D_("Today"), NULL, _cb_alarm_today, cfdata,
NULL);
e_widget_frametable_object_append(of, ob, 3, 6, 1, 1, 1, 1, 1, 1);
- ob = e_widget_button_add(evas, _("Tomorrow"), NULL, _cb_alarm_tomorrow,
cfdata, NULL);
+ ob = e_widget_button_add(evas, D_("Tomorrow"), NULL, _cb_alarm_tomorrow,
cfdata, NULL);
e_widget_frametable_object_append(of, ob, 3, 7, 1, 1, 1, 1, 1, 1);
e_widget_list_object_append(o, of, 1, 1, 0.5);
@@ -256,36 +256,36 @@
{
case ALARM_ADD_ERROR_UNKNOWN:
snprintf(buf, sizeof(buf),
- "<hilight>Error, The alarm was not added
!</hilight><br><br>"
- "There is an error in the informations / schedule of
your alarm");
+ D_("<hilight>Error, The alarm was not added
!</hilight><br><br>"
+ "There is an error in the informations / schedule of
your alarm"));
break;
case ALARM_ADD_ERROR_NAME:
snprintf(buf, sizeof(buf),
- "<hilight>Error, The alarm was not added
!</hilight><br><br>"
- "You have to enter a name for the alarm");
+ D_("<hilight>Error, The alarm was not added
!</hilight><br><br>"
+ "You have to enter a name for the alarm"));
break;
case ALARM_ADD_ERROR_SCHED_WEEK:
snprintf(buf, sizeof(buf),
- "<hilight>Error, The alarm was not added
!</hilight><br><br>"
- "You have to select at least one day in the week");
+ D_("<hilight>Error, The alarm was not added
!</hilight><br><br>"
+ "You have to select at least one day in the week"));
break;
case ALARM_ADD_ERROR_SCHED_DAY:
snprintf(buf, sizeof(buf),
- "<hilight>Error, The alarm was not added
!</hilight><br><br>"
+ D_("<hilight>Error, The alarm was not added
!</hilight><br><br>"
"The date you entered for the alarm has incorrect
syntax<br><br>"
"You have to respect this format :<br>"
" YYYY/MM/DD<br>"
"YYYY is the year on 4 numbers<br>"
"MM is the month on 2 numbers<br>"
- "DD is the day on 2 numbers<br>");
+ "DD is the day on 2 numbers<br>"));
break;
case ALARM_ADD_ERROR_SCHED_BEFORE:
snprintf(buf, sizeof(buf),
- "<hilight>Error, The alarm was not added
!</hilight><br><br>"
- "The date you entered is before now");
+ D_("<hilight>Error, The alarm was not added
!</hilight><br><br>"
+ "The date you entered is before now"));
break;
}
- e_module_dialog_show(_("Eveil Module Error"), buf);
+ e_module_dialog_show(D_("Eveil Module Error"), buf);
return 0;
}
@@ -318,7 +318,7 @@
_common_create_widgets(cfd, evas, cfdata, o);
- ob = e_widget_button_add(evas, _("Test this alarm"), NULL, _cb_alarm_test,
cfd, cfdata);
+ ob = e_widget_button_add(evas, D_("Test this alarm"), NULL, _cb_alarm_test,
cfd, cfdata);
e_widget_list_object_append(o, ob, 1, 1, 0.5);
@@ -346,42 +346,42 @@
_common_create_widgets(cfd, evas, cfdata, o);
- of = e_widget_frametable_add(evas, _("Ring Options"), 0);
+ of = e_widget_frametable_add(evas, D_("Ring Options"), 0);
- ob = e_widget_label_add(evas, _("Remove alarm"));
+ ob = e_widget_label_add(evas, D_("Remove alarm"));
e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1);
rg = e_widget_radio_group_new(&(cfdata->autoremove));
ob = e_widget_radio_add(evas, _("No"), ALARM_AUTOREMOVE_NO, rg);
e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1);
- ob = e_widget_radio_add(evas, _("Use general settings"),
ALARM_AUTOREMOVE_PARENT, rg);
+ ob = e_widget_radio_add(evas, D_("Use general settings"),
ALARM_AUTOREMOVE_PARENT, rg);
e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 1);
ob = e_widget_radio_add(evas, _("Yes"), ALARM_AUTOREMOVE_YES, rg);
e_widget_frametable_object_append(of, ob, 1, 3, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Open popup"));
+ ob = e_widget_label_add(evas, D_("Open popup"));
e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
rg = e_widget_radio_group_new(&(cfdata->open_popup));
ob = e_widget_radio_add(evas, _("No"), ALARM_OPEN_POPUP_NO, rg);
e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1);
- ob = e_widget_radio_add(evas, _("Use general settings"),
ALARM_OPEN_POPUP_PARENT, rg);
+ ob = e_widget_radio_add(evas, D_("Use general settings"),
ALARM_OPEN_POPUP_PARENT, rg);
e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1);
ob = e_widget_radio_add(evas, _("Yes"), ALARM_OPEN_POPUP_YES, rg);
e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Run a program"));
+ ob = e_widget_label_add(evas, D_("Run a program"));
e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 1, 1, 1);
rg = e_widget_radio_group_new(&(cfdata->run_program));
ob = e_widget_radio_add(evas, _("No"), ALARM_RUN_PROGRAM_NO, rg);
e_widget_frametable_object_append(of, ob, 0, 5, 1, 1, 1, 1, 1, 1);
- ob = e_widget_radio_add(evas, _("Use general settings"),
ALARM_RUN_PROGRAM_PARENT, rg);
+ ob = e_widget_radio_add(evas, D_("Use general settings"),
ALARM_RUN_PROGRAM_PARENT, rg);
e_widget_frametable_object_append(of, ob, 0, 6, 1, 1, 1, 1, 1, 1);
- ob = e_widget_radio_add(evas, _("Run this program"), ALARM_RUN_PROGRAM_OWN,
rg);
+ ob = e_widget_radio_add(evas, D_("Run this program"),
ALARM_RUN_PROGRAM_OWN, rg);
e_widget_frametable_object_append(of, ob, 0, 7, 1, 1, 1, 1, 1, 1);
ob = e_widget_entry_add(evas, &(cfdata->program));
@@ -391,7 +391,7 @@
e_widget_list_object_append(o, of, 1, 1, 0.5);
- ob = e_widget_button_add(evas, _("Test this alarm"), NULL, _cb_alarm_test,
cfd, cfdata);
+ ob = e_widget_button_add(evas, D_("Test this alarm"), NULL, _cb_alarm_test,
cfd, cfdata);
e_widget_list_object_append(o, ob, 1, 1, 0.5);
@@ -425,14 +425,14 @@
if (eveil_alarm_ring(cfdata->al, 1))
{
snprintf(buf, sizeof(buf),
- "<hilight>Alarm test SUCCEED !</hilight>");
+ D_("<hilight>Alarm test SUCCEED !</hilight>"));
}
else
{
snprintf(buf, sizeof(buf),
- "<hilight>Alarm test FAILED !</hilight>");
+ D_("<hilight>Alarm test FAILED !</hilight>"));
}
- e_module_dialog_show(_("Eveil Module Test Report"), buf);
+ e_module_dialog_show(D_("Eveil Module Test Report"), buf);
}
static void _cb_alarm_today(void *data, void *data2)
===================================================================
RCS file: /cvs/e/e_modules/eveil/e_mod_main.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_mod_main.c 6 Jun 2006 15:42:33 -0000 1.7
+++ e_mod_main.c 12 Jun 2006 08:54:22 -0000 1.8
@@ -180,7 +180,7 @@
static char *
_gc_label(void)
{
- return _("Eveil");
+ return D_("Eveil");
}
static Evas_Object *
@@ -315,10 +315,10 @@
eveil_config->alarms_open_popup_default))
{
snprintf(buf, sizeof(buf),
- "<hilight>Alarm : %s</hilight><br><br>"
- "%s",
+ D_("<hilight>Alarm : %s</hilight><br><br>"
+ "%s"),
al->name, (al->description) ? al->description : "" );
- e_module_dialog_show(_("Eveil Module Popup"), buf);
+ e_module_dialog_show(D_("Eveil Module Popup"), buf);
}
if ((al->run_program == ALARM_RUN_PROGRAM_OWN) ||
@@ -342,9 +342,9 @@
else
{
snprintf(buf, sizeof(buf),
- "<hilight>Failed !</hilight><br><br>"
- "Eveil couln't launch the program you specified");
- e_module_dialog_show(_("Eveil Module Error"), buf);
+ D_("<hilight>Failed !</hilight><br><br>"
+ "Eveil couln't launch the program you specified"));
+ e_module_dialog_show(D_("Eveil Module Error"), buf);
ret = 0;
}
}
@@ -574,14 +574,14 @@
return;
evas = e_win_evas_get(dia->win);
- snprintf(buf, sizeof(buf), "Snooze %s", al->name);
+ snprintf(buf, sizeof(buf), D_("Snooze %s"), al->name);
e_dialog_title_set(dia, buf);
o = e_widget_list_add(evas, 0, 0);
- ob = e_widget_slider_add(evas, 1, 0, _("%1.0f hours"), 0.0, 24.0, 1.0, 0,
+ ob = e_widget_slider_add(evas, 1, 0, D_("%1.0f hours"), 0.0, 24.0, 1.0, 0,
NULL, &(al->snooze.hour), 100);
e_widget_list_object_append(o, ob, 0, 0, 1.0);
- ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 0.0, 60.0, 1.0, 0,
+ ob = e_widget_slider_add(evas, 1, 0, D_("%1.0f minutes"), 0.0, 60.0, 1.0, 0,
NULL, &(al->snooze.minute), 100);
e_widget_list_object_append(o, ob, 0, 0, 1.0);
@@ -750,7 +750,7 @@
if (al->state == ALARM_STATE_RINGING)
{
char buf[30];
- snprintf(buf, sizeof(buf), "Snooze %s", al->name);
+ snprintf(buf, sizeof(buf), D_("Snooze %s"), al->name);
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, buf);
e_menu_item_callback_set(mi, _menu_cb_alarm_snooze, al);
@@ -758,7 +758,7 @@
else e_menu_item_icon_edje_set(mi, eveil_config->theme,
THEME_ICON_SNOOZE);
if (al->snooze.remember)
{
- snprintf(buf, sizeof(buf), "Snooze %.14s of
%.2d:%.2d",
+ snprintf(buf, sizeof(buf), D_("Snooze %.14s of
%.2d:%.2d"),
al->name, al->snooze.hour,
al->snooze.minute);
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, buf);
@@ -772,14 +772,14 @@
if (!nb_snoozed)
{
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Snooze (No alarm to delay)"));
+ e_menu_item_label_set(mi, D_("Snooze (No alarm to delay)"));
if (!eveil_config->theme) e_util_menu_item_edje_icon_set(mi,
THEME_ICON_SNOOZE);
else e_menu_item_icon_edje_set(mi, eveil_config->theme,
THEME_ICON_SNOOZE);
}
mi = e_menu_item_new(mn);
e_menu_item_separator_set(mi, 1);
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Add an alarm"));
+ e_menu_item_label_set(mi, D_("Add an alarm"));
e_menu_item_callback_set(mi, _menu_cb_alarm_add, NULL);
if (!eveil_config->theme) e_util_menu_item_edje_icon_set(mi,
THEME_ICON_ALARM_ON);
else e_menu_item_icon_edje_set(mi, eveil_config->theme,
THEME_ICON_ALARM_ON);
@@ -788,14 +788,14 @@
mi = e_menu_item_new(mn);
if (eveil_config->timer_state == TIMER_STATE_OFF)
{
- e_menu_item_label_set(mi, _("Start the timer"));
+ e_menu_item_label_set(mi, D_("Start the timer"));
e_menu_item_callback_set(mi, _menu_cb_timer_start, NULL);
if (!eveil_config->theme) e_util_menu_item_edje_icon_set(mi,
THEME_ICON_TIMER_ON);
else e_menu_item_icon_edje_set(mi, eveil_config->theme,
THEME_ICON_TIMER_ON);
}
else
{
- e_menu_item_label_set(mi, _("Stop the timer"));
+ e_menu_item_label_set(mi, D_("Stop the timer"));
e_menu_item_callback_set(mi, _menu_cb_timer_stop, NULL);
if (!eveil_config->theme) e_util_menu_item_edje_icon_set(mi,
THEME_ICON_TIMER_OFF);
else e_menu_item_icon_edje_set(mi, eveil_config->theme,
THEME_ICON_TIMER_OFF);
@@ -935,9 +935,9 @@
char buf[4096];
snprintf(buf, sizeof(buf),
- "<hilight>Timer elapsed !</hilight><br><br>"
- "Time for pastas :D");
- e_module_dialog_show(_("Eveil Module Popup"), buf);
+ D_("<hilight>Timer elapsed !</hilight><br><br>"
+ "Time for pastas :D"));
+ e_module_dialog_show(D_("Eveil Module Popup"), buf);
}
if (eveil_config->timer_run_program_default)
@@ -1020,6 +1020,9 @@
EAPI void *
e_modapi_init(E_Module *m)
{
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset(PACKAGE, "UTF-8");
+
char buf[4096];
_alarms_edd = E_CONFIG_DD_NEW("Eveil_Alarm", Alarm);
@@ -1076,13 +1079,13 @@
if (eveil_config->config_version < CONFIG_VERSION)
{
snprintf(buf, sizeof(buf),
- _("<hilight>Eveil module : Configuration
Upgraded</hilight><br><br>"
+ D_("<hilight>Eveil module : Configuration
Upgraded</hilight><br><br>"
"Your configuration of eveil module<br>"
"has been upgraded<br>"
"Your settings were removed<br>"
"Sorry for the inconvenience<br><br>"
"(%d -> %d)"), eveil_config->config_version,
CONFIG_VERSION);
- e_module_dialog_show(_("Eveil Module version " MODULE_VERSION),
buf);
+ e_module_dialog_show(D_("Eveil Module version " MODULE_VERSION),
buf);
eveil_config = NULL;
}
else
@@ -1090,13 +1093,13 @@
if (eveil_config->config_version > CONFIG_VERSION)
{
snprintf(buf, sizeof(buf),
- _("<hilight>Eveil module : Configuration
Downgraded</hilight><br><br>"
+ D_("<hilight>Eveil module : Configuration
Downgraded</hilight><br><br>"
"Your configuration of Eveil module<br>"
"has been downgraded<br>"
"Your settings were removed<br>"
"Sorry for the inconvenience<br><br>"
"(%d ->%d)"), eveil_config->config_version,
CONFIG_VERSION);
- e_module_dialog_show(_("Eveil Module version "
MODULE_VERSION), buf);
+ e_module_dialog_show(D_("Eveil Module version "
MODULE_VERSION), buf);
eveil_config = NULL;
}
}
@@ -1207,8 +1210,8 @@
EAPI int
e_modapi_about(E_Module *m)
{
- e_module_dialog_show(_("Eveil Module version " MODULE_VERSION),
- _("A module to set timers and alarms to alert you<br>"
+ e_module_dialog_show(D_("Eveil Module version " MODULE_VERSION),
+ D_("A module to set timers and alarms to alert you<br>"
" when youre pastas are ready<br>"
"or when you need to wake up<br><br>"
"http://oooo.zapto.org<br>"
===================================================================
RCS file: /cvs/e/e_modules/eveil/e_mod_main.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_mod_main.h 6 Jun 2006 15:42:33 -0000 1.5
+++ e_mod_main.h 12 Jun 2006 08:54:22 -0000 1.6
@@ -1,6 +1,8 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
+#define D_(str) dgettext(PACKAGE, str)
+
#ifndef E_MOD_MAIN_H
#define E_MOD_MAIN_H
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
