Enlightenment CVS committal
Author : maiurana
Project : e_modules
Module : weather
Dir : e_modules/weather
Modified Files:
Makefile.am configure.in e_mod_config.c e_mod_main.c
e_mod_main.h
Log Message:
restored i18n support
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/weather/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Makefile.am 20 Mar 2006 00:54:07 -0000 1.5
+++ Makefile.am 20 Mar 2006 19:59:56 -0000 1.6
@@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = images
+SUBDIRS = images po
EDJE_CC = @edje_cc@
EDJE_FLAGS = -v -id images -fd fonts
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/weather/configure.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- configure.in 20 Mar 2006 00:54:07 -0000 1.5
+++ configure.in 20 Mar 2006 19:59:56 -0000 1.6
@@ -17,6 +17,12 @@
AM_ENABLE_SHARED
AM_PROG_LIBTOOL
+ALL_LINGUAS="it"
+AC_SUBST(ALL_LINGUAS)
+
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION(0.14)
+
MODULE_ARCH="$host_os-$host_cpu"
AC_SUBST(MODULE_ARCH)
AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
@@ -83,7 +89,17 @@
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,
"${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data
destination")
datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}"
fi
-
+
+AC_PREFIX_DEFAULT(${HOME}/.e/e)
+if test "x$prefix" = "xNONE"; then
+ datarootdir=${ac_default_prefix}
+else
+ datarootdir=${prefix}/share
+fi
+localedir=${datarootdir}/locale
+AC_SUBST(LOCALEDIR, "${localedir}")
+AC_DEFINE_UNQUOTED(LOCALEDIR, "${localedir}", [Module Locale Directory])
+
#AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
#AC_SUBST(dlopen_libs)
@@ -189,6 +205,7 @@
AC_OUTPUT([
Makefile
images/Makefile
+po/Makefile
],[
])
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/weather/e_mod_config.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_config.c 20 Mar 2006 00:54:07 -0000 1.1
+++ e_mod_config.c 20 Mar 2006 19:59:56 -0000 1.2
@@ -30,7 +30,7 @@
v->basic.apply_cfdata = _basic_apply_data;
v->basic.create_widgets = _basic_create_widgets;
v->override_auto_apply = 1;
- cfd = e_config_dialog_new(wf->con, _("Weather Configuration"), NULL, 0, v,
wf);
+ cfd = e_config_dialog_new(wf->con, D_("Weather Configuration"), NULL, 0, v,
wf);
wf->weather->cfd = cfd;
}
@@ -72,35 +72,35 @@
E_Radio_Group *rg, *dg;
o = e_widget_list_add(evas, 0, 0);
- of = e_widget_framelist_add(evas, _("Display Settings"), 0);
+ of = e_widget_framelist_add(evas, D_("Display Settings"), 0);
rg = e_widget_radio_group_new(&(cfdata->display));
- ob = e_widget_radio_add(evas, _("Simple"), SIMPLE_DISPLAY, rg);
+ ob = e_widget_radio_add(evas, D_("Simple"), SIMPLE_DISPLAY, rg);
e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Detailed"), DETAILED_DISPLAY, rg);
+ ob = e_widget_radio_add(evas, D_("Detailed"), DETAILED_DISPLAY, rg);
e_widget_framelist_object_append(of, ob);
- ob = e_widget_label_add(evas, _("Poll Time"));
+ ob = e_widget_label_add(evas, D_("Poll Time"));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_slider_add(evas, 1, 0, _("%2.0f minutes"), 15.0, 60.0, 1.0,
0, &(cfdata->poll_time), NULL, 40);
+ ob = e_widget_slider_add(evas, 1, 0, D_("%2.0f minutes"), 15.0, 60.0, 1.0,
0, &(cfdata->poll_time), NULL, 40);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
- of = e_widget_framelist_add(evas, _("Degree Settings"), 0);
+ of = e_widget_framelist_add(evas, D_("Degree Settings"), 0);
dg = e_widget_radio_group_new(&(cfdata->degrees));
- ob = e_widget_radio_add(evas, _("Celcius"), DEGREES_C, dg);
+ ob = e_widget_radio_add(evas, D_("Celsius"), DEGREES_C, dg);
e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Farenheit"), DEGREES_F, dg);
+ ob = e_widget_radio_add(evas, D_("Farenheit"), DEGREES_F, dg);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
- of = e_widget_frametable_add(evas, _("ICAO Code"), 0);
- ob = e_widget_label_add(evas, _("ICAO code"));
+ of = e_widget_frametable_add(evas, D_("ICAO Code"), 0);
+ ob = e_widget_label_add(evas, D_("ICAO Code"));
e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 0, 1, 0);
ob = e_widget_entry_add(evas, (&(cfdata->code)));
e_widget_min_size_set(ob, 100, 1);
e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 0, 1, 0);
- ob = e_widget_label_add(evas, _("Get your ICAO code at:"));
+ ob = e_widget_label_add(evas, D_("Get your ICAO code at:"));
e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 0, 1, 0);
- ob = e_widget_label_add(evas, _("http://www.weather.gov/tg/siteloc.shtml";));
+ ob = e_widget_label_add(evas,
D_("http://www.weather.gov/tg/siteloc.shtml";));
e_widget_frametable_object_append(of, ob, 0, 2, 2, 1, 1, 0, 1, 0);
e_widget_list_object_append(o, of, 1, 1, 0.5);
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/weather/e_mod_main.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_mod_main.c 20 Mar 2006 03:43:13 -0000 1.10
+++ e_mod_main.c 20 Mar 2006 19:59:56 -0000 1.11
@@ -44,6 +44,10 @@
e_modapi_shutdown(E_Module *m)
{
Weather *w;
+
+ /* Set up module's message catalogue */
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset(PACKAGE, "UTF-8");
w = m->data;
if (!w)
@@ -85,8 +89,8 @@
EAPI int
e_modapi_about(E_Module *m)
{
- e_module_dialog_show(_("Enlightenment Weather Module"),
- _("A weather forecast module for Enlightenment"));
+ e_module_dialog_show(D_("Enlightenment Weather Module"),
+ D_("A weather forecast module for Enlightenment"));
return 1;
}
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/weather/e_mod_main.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_mod_main.h 20 Mar 2006 00:54:07 -0000 1.6
+++ e_mod_main.h 20 Mar 2006 19:59:56 -0000 1.7
@@ -1,3 +1,5 @@
+#define D_(str) dgettext(PACKAGE, str)
+
#ifndef E_MOD_MAIN_H
#define E_MOD_MAIN_H
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
