Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : monitor
Dir : e_modules/monitor
Modified Files:
Makefile.am autogen.sh configure.in e_mod_config.c
e_mod_main.c e_mod_main.h
Log Message:
Add start of intl support for config dialogs.
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/monitor/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 25 Jan 2006 04:17:15 -0000 1.3
+++ Makefile.am 30 Jan 2006 01:11:45 -0000 1.4
@@ -1,3 +1,5 @@
+SUBDIRS = po
+
MAINTAINERCLEANFILES = Makefile.in
EDJE_CC = @edje_cc@
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/monitor/autogen.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- autogen.sh 12 Dec 2005 05:09:41 -0000 1.1
+++ autogen.sh 30 Jan 2006 01:11:45 -0000 1.2
@@ -10,6 +10,18 @@
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 monitor.pot template"; \
+xgettext \
+--output monitor.pot \
+--output-dir=po \
+--language=C \
+--add-location \
+--keyword=D_ \
+--indent \
+--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/monitor/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:01 -0000 1.2
+++ configure.in 30 Jan 2006 01:11:45 -0000 1.3
@@ -17,6 +17,12 @@
AM_ENABLE_SHARED
AM_PROG_LIBTOOL
+ALL_LINGUAS="ja"
+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")
@@ -84,6 +90,16 @@
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=${ac_default_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
e_modules-monitor.spec
+po/Makefile
],[
])
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_config.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_mod_config.c 24 Jan 2006 21:35:37 -0000 1.8
+++ e_mod_config.c 30 Jan 2006 01:11:45 -0000 1.9
@@ -56,7 +56,7 @@
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
- cfd = e_config_dialog_new(con, _("Monitor Configuration"), NULL, 0, v, f);
+ cfd = e_config_dialog_new(con, D_("Monitor Configuration"), NULL, 0, v, f);
}
static void
@@ -128,25 +128,25 @@
mon = f->mon;
o = e_widget_list_add(evas, 0, 0);
- of = e_widget_framelist_add(evas, _("Select Sensors"), 0);
- ob1 = e_widget_check_add(evas, _("CPU"), &(mon->conf->cpu));
+ of = e_widget_framelist_add(evas, D_("Select Sensors"), 0);
+ ob1 = e_widget_check_add(evas, D_("CPU"), &(mon->conf->cpu));
e_widget_framelist_object_append(of, ob1);
- ob2 = e_widget_check_add(evas, _("Memory"), &(mon->conf->mem));
+ ob2 = e_widget_check_add(evas, D_("Memory"), &(mon->conf->mem));
e_widget_framelist_object_append(of, ob2);
- ob3 = e_widget_check_add(evas, _("Network"), &(mon->conf->net));
+ ob3 = e_widget_check_add(evas, D_("Network"), &(mon->conf->net));
e_widget_framelist_object_append(of, ob3);
- ob4 = e_widget_check_add(evas, _("WLAN"), &(mon->conf->wlan));
+ ob4 = e_widget_check_add(evas, D_("WLAN"), &(mon->conf->wlan));
e_widget_framelist_object_append(of, ob4);
- ob5 = e_widget_check_add(evas, _("Hostname"), &(mon->conf->hostname));
+ ob5 = e_widget_check_add(evas, D_("Hostname"), &(mon->conf->hostname));
e_widget_framelist_object_append(of, ob5);
- ob6 = e_widget_check_add(evas, _("Uptime"), &(mon->conf->uptime));
+ ob6 = e_widget_check_add(evas, D_("Uptime"), &(mon->conf->uptime));
e_widget_framelist_object_append(of, ob6);
- ob7 = e_widget_check_add(evas, _("time"), &(mon->conf->time));
+ ob7 = e_widget_check_add(evas, D_("time"), &(mon->conf->time));
e_widget_framelist_object_append(of, ob7);
e_widget_list_object_append(o, of, 1, 1, 0.5);
- of = e_widget_framelist_add(evas, _("Monitor"), 0);
- ob = e_widget_check_add(evas, _("Horizontal"), &(mon->conf->Horz));
+ of = e_widget_framelist_add(evas, D_("Monitor"), 0);
+ ob = e_widget_check_add(evas, D_("Horizontal"), &(mon->conf->Horz));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
@@ -175,18 +175,18 @@
f = cfd->data;
o = e_widget_list_add(evas, 0, 0);
- of = e_widget_framelist_add(evas, _("Cpu"), 0);
+ of = e_widget_framelist_add(evas, D_("CPU"), 0);
ob = e_widget_label_add(evas, _("Check Interval"));
e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f seconds"), 1.0, 60.0, 1.0, 0,
&(f->conf->cpu_interval), NULL, 150);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
- of = e_widget_framelist_add(evas, _("Memory"), 0);
+ of = e_widget_framelist_add(evas, D_("Memory"), 0);
ot = e_widget_table_add(evas, 0);
- ob = e_widget_check_add(evas, _("Ignore Cached"),
&(f->conf->mem_real_ignore_cached));
+ ob = e_widget_check_add(evas, D_("Ignore Cached"),
&(f->conf->mem_real_ignore_cached));
e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 0, 1, 0);
- ob = e_widget_check_add(evas, _("Ignore Buffers"),
&(f->conf->mem_real_ignore_buffers));
+ ob = e_widget_check_add(evas, D_("Ignore Buffers"),
&(f->conf->mem_real_ignore_buffers));
e_widget_table_object_append(ot, ob, 0, 1, 1, 1, 1, 0, 1, 0);
ob = e_widget_label_add(evas, _("Check Interval"));
e_widget_table_object_append(ot, ob, 0, 2, 1, 1, 1, 0, 1, 0);
@@ -198,7 +198,7 @@
i = 0;
if (wlan_interface_count > 0)
{
- of = e_widget_framelist_add(evas, _("Wireless"), 0);
+ of = e_widget_framelist_add(evas, D_("Wireless"), 0);
ot = e_widget_table_add(evas, 0);
rg = e_widget_radio_group_new(&(wlan_interface_number));
ecore_list_goto_first(wlan_interfaces);
@@ -221,7 +221,7 @@
i = 0;
if (net_interface_count > 0)
{
- of = e_widget_framelist_add(evas, _("Network"), 0);
+ of = e_widget_framelist_add(evas, D_("Network"), 0);
ot = e_widget_table_add(evas, 0);
rg = e_widget_radio_group_new(&(net_interface_number));
ecore_list_goto_first(net_interfaces);
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_main.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e_mod_main.c 24 Jan 2006 21:35:37 -0000 1.15
+++ e_mod_main.c 30 Jan 2006 01:11:45 -0000 1.16
@@ -54,6 +54,10 @@
e_modapi_init(E_Module *module)
{
Monitor *monitor;
+
+ /* Set up module's message catalogue */
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset(PACKAGE, "UTF-8");
/* actually init buttons */
monitor = _monitor_new();
@@ -96,8 +100,8 @@
EAPI int
e_modapi_about(E_Module *module)
{
- e_module_dialog_show(_("Enlightenment Monitor Module"),
- _("A simple module to give E17 a usage monitor for some
resources."));
+ e_module_dialog_show(D_("Enlightenment Monitor Module"),
+ D_("A simple module to give E17 a usage monitor for some
resources."));
return 1;
}
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_main.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_mod_main.h 15 Jan 2006 08:05:09 -0000 1.8
+++ e_mod_main.h 30 Jan 2006 01:11:45 -0000 1.9
@@ -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: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
