Enlightenment CVS committal
Author : maiurana
Project : e_modules
Module : weather
Dir : e_modules/weather
Modified Files:
Makefile.am autogen.sh configure.in e_mod_main.c e_mod_main.h
Added Files:
ABOUT-NLS
Log Message:
added i18n support and italian localization
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/weather/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 25 Jan 2006 04:33:31 -0000 1.2
+++ Makefile.am 19 Mar 2006 15:09:16 -0000 1.3
@@ -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/autogen.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- autogen.sh 12 Dec 2005 05:19:10 -0000 1.1
+++ autogen.sh 19 Mar 2006 15:09:16 -0000 1.2
@@ -10,6 +10,17 @@
echo "Running autoconf..." ; autoconf || exit 1
echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize
--automake) || exit 1
echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1
+echo "Generating gettext weather.pot template"; \
+xgettext \
+--output weather.pot \
+--output-dir=po \
+--language=C \
+--add-location \
+--keyword=D_ \
+--sort-by-file \
+--copyright-holder="TODO" \
+--foreign-user \
+`find . -name "*.[ch]" -print` || exit 1
if [ -z "$NOCONFIGURE" ]; then
./configure "$@"
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/weather/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- configure.in 21 Jan 2006 00:36:03 -0000 1.2
+++ configure.in 19 Mar 2006 15:09:16 -0000 1.3
@@ -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,6 +89,16 @@
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)
@@ -190,6 +206,7 @@
Makefile
e_modules-weather.spec
images/Makefile
+po/Makefile
],[
])
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/weather/e_mod_main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_mod_main.c 30 Jan 2006 03:16:42 -0000 1.5
+++ e_mod_main.c 19 Mar 2006 15:09:16 -0000 1.6
@@ -89,6 +89,10 @@
{
Weather *weather;
+ /* Set up module's message catalogue */
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset(PACKAGE, "UTF-8");
+
weather = _weather_new();
module->config_menu = weather->config_menu;
return weather;
@@ -129,8 +133,8 @@
EAPI int
e_modapi_about(E_Module * module)
{
- 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;
}
@@ -218,15 +222,15 @@
/* Add main menu to face menu */
mi = e_menu_item_new(face->menu);
- e_menu_item_label_set(mi, _("Set Degrees"));
+ e_menu_item_label_set(mi, D_("Set Degrees"));
e_menu_item_submenu_set(mi, weather->config_menu_degrees);
mi = e_menu_item_new(face->menu);
- e_menu_item_label_set(mi, _("Set Display"));
+ e_menu_item_label_set(mi, D_("Set Display"));
e_menu_item_submenu_set(mi, weather->config_menu_display);
mi = e_menu_item_new(face->menu);
- e_menu_item_label_set(mi, _("Set Update Time"));
+ e_menu_item_label_set(mi, D_("Set Update Time"));
e_menu_item_submenu_set(mi, weather->config_menu_poll);
}
}
@@ -254,15 +258,15 @@
/* Add main menu to face menu */
mi = e_menu_item_new(face->menu);
- e_menu_item_label_set(mi, _("Set Degrees"));
+ e_menu_item_label_set(mi, D_("Set Degrees"));
e_menu_item_submenu_set(mi, weather->config_menu_degrees);
mi = e_menu_item_new(face->menu);
- e_menu_item_label_set(mi, _("Set Display"));
+ e_menu_item_label_set(mi, D_("Set Display"));
e_menu_item_submenu_set(mi, weather->config_menu_display);
mi = e_menu_item_new(face->menu);
- e_menu_item_label_set(mi, _("Set Update Time"));
+ e_menu_item_label_set(mi, D_("Set Update Time"));
e_menu_item_submenu_set(mi, weather->config_menu_poll);
}
}
@@ -312,7 +316,7 @@
mn = e_menu_new();
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("15 minutes"));
+ e_menu_item_label_set(mi, D_("15 minutes"));
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (weather->conf->poll_time == 900.0)
@@ -320,7 +324,7 @@
e_menu_item_callback_set(mi, _weather_menu_fast, weather);
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("30 minutes"));
+ e_menu_item_label_set(mi, D_("30 minutes"));
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (weather->conf->poll_time == 1800.0)
@@ -328,7 +332,7 @@
e_menu_item_callback_set(mi, _weather_menu_medium, weather);
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("1 hour"));
+ e_menu_item_label_set(mi, D_("1 hour"));
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (weather->conf->poll_time == 3600.0)
@@ -341,7 +345,7 @@
mn = e_menu_new();
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Simple"));
+ e_menu_item_label_set(mi, D_("Simple"));
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (weather->conf->display == SIMPLE_DISPLAY)
@@ -349,7 +353,7 @@
e_menu_item_callback_set(mi, _weather_menu_display_simple, weather);
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Detailed"));
+ e_menu_item_label_set(mi, D_("Detailed"));
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (weather->conf->display == DETAILED_DISPLAY)
@@ -362,7 +366,7 @@
mn = e_menu_new();
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Fahrenheit"));
+ e_menu_item_label_set(mi, D_("Fahrenheit"));
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (weather->conf->degrees == DEGREES_F)
@@ -370,7 +374,7 @@
e_menu_item_callback_set(mi, _weather_menu_degrees_F, weather);
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Celcius"));
+ e_menu_item_label_set(mi, D_("Celsius"));
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (weather->conf->degrees == DEGREES_C)
@@ -389,19 +393,19 @@
mn = e_menu_new();
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Set Degrees"));
+ e_menu_item_label_set(mi, D_("Set Degrees"));
e_menu_item_submenu_set(mi, weather->config_menu_degrees);
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Set Display"));
+ e_menu_item_label_set(mi, D_("Set Display"));
e_menu_item_submenu_set(mi, weather->config_menu_display);
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Set Update Time"));
+ e_menu_item_label_set(mi, D_("Set Update Time"));
e_menu_item_submenu_set(mi, weather->config_menu_poll);
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Faces"));
+ e_menu_item_label_set(mi, D_("Faces"));
e_menu_item_submenu_set(mi, weather->config_menu_faces);
weather->config_menu = mn;
@@ -432,7 +436,7 @@
/* New face */
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, _("Add Face"));
+ e_menu_item_label_set(mi, D_("Add Face"));
e_menu_item_callback_set(mi, _weather_menu_add_face, weather);
/* Add faces to the config menu */
@@ -554,12 +558,12 @@
/* New face */
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Add Face"));
+ e_menu_item_label_set(mi, D_("Add Face"));
e_menu_item_callback_set(mi, _weather_menu_add_face, face->weather);
/* Remove face */
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Remove Face"));
+ e_menu_item_label_set(mi, D_("Remove Face"));
e_menu_item_callback_set(mi, _weather_menu_remove_face, face);
/* Choose location */
@@ -568,7 +572,7 @@
{
face->menu_location = subm;
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Choose Continent"));
+ e_menu_item_label_set(mi, D_("Choose Continent"));
e_menu_item_submenu_set(mi, subm);
}
}
@@ -1153,15 +1157,15 @@
/* Add main menu to face menu */
mi = e_menu_item_new(face->menu);
- e_menu_item_label_set(mi, _("Set Degrees"));
+ e_menu_item_label_set(mi, D_("Set Degrees"));
e_menu_item_submenu_set(mi, weather->config_menu_degrees);
mi = e_menu_item_new(face->menu);
- e_menu_item_label_set(mi, _("Set Display"));
+ e_menu_item_label_set(mi, D_("Set Display"));
e_menu_item_submenu_set(mi, weather->config_menu_display);
mi = e_menu_item_new(face->menu);
- e_menu_item_label_set(mi, _("Set Update Time"));
+ e_menu_item_label_set(mi, D_("Set Update Time"));
e_menu_item_submenu_set(mi, weather->config_menu_poll);
weather->update_menu_faces = 1;
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/weather/e_mod_main.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_main.h 30 Jan 2006 03:16:42 -0000 1.3
+++ e_mod_main.h 19 Mar 2006 15:09:16 -0000 1.4
@@ -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
-------------------------------------------------------
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
