restored i18n support

SVN revision: 28560

Makefile.am

@@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
 		       config.sub configure depcomp install-sh ltmain.sh \
 		       missing
 
-SUBDIRS = src
+SUBDIRS = src po
 
 EDJE_FLAGS = -v \
 -id $(top_srcdir)/images \

autogen.sh

@@ -10,6 +10,17 @@ echo "Running autoheader..." ; autoheader || exit 1
 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 net.pot template"; \
+xgettext \
+--output net.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 "$@"

configure.in

@@ -13,6 +13,12 @@ AC_PROG_CC
 AM_PROG_LIBTOOL
 AC_HEADER_STDC
 
+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")
@@ -57,6 +63,19 @@ else
 fi
 AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}", "Package data destination")
 
+#
+# Set Data Root and Locale Directory in config.h
+#
+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")
+
 #
 # Check EFL Libs
 #
@@ -71,6 +90,7 @@ AC_PATH_GENERIC([enlightenment], [0.16.999.037], [], [AC_MSG_ERROR(Enlightenment
 AC_OUTPUT([
 Makefile
 src/Makefile
+po/Makefile
 module.desktop
 e_modules-net.spec
 ],[])

src/e_mod_configure.c

@@ -40,7 +40,7 @@ _configure_net_module(void *data)
    
    snprintf(buf, sizeof(buf), "%s/net.edj", e_module_dir_get(cfg->mod));
    con = e_container_current_get(e_manager_current_get());
-   cfd = e_config_dialog_new(con, _("Net Module Configuration"), "Net", 
+   cfd = e_config_dialog_new(con, D_("Net Module Configuration"), "Net", 
 			     "_netmod_config_dialog", buf, 0, v, ci);
    cfg->cfd = cfd;
 }
@@ -111,29 +111,29 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    o = e_widget_list_add(evas, 0, 0);
    
    of = e_widget_framelist_add(evas, _("General Settings"), 0);
-   ob = e_widget_check_add(evas, _("Show Text"), &(cfdata->show_text));
+   ob = e_widget_check_add(evas, D_("Show Text"), &(cfdata->show_text));
    e_widget_framelist_object_append(of, ob);
-   ob = e_widget_check_add(evas, _("Show Popup On Mouse-Over"), &(cfdata->show_popup));
+   ob = e_widget_check_add(evas, D_("Show Popup On Mouse-Over"), &(cfdata->show_popup));
    e_widget_framelist_object_append(of, ob);
-   ob = e_widget_label_add(evas, _("Launch Application On Double-Click"));
+   ob = e_widget_label_add(evas, D_("Launch Application On Double-Click"));
    e_widget_framelist_object_append(of, ob);
    ob = e_widget_entry_add(evas, &(cfdata->app));
    e_widget_framelist_object_append(of, ob);
    e_widget_list_object_append(o, of, 1, 1, 0.5);
    
-   of = e_widget_framelist_add(evas, _("Activity Notification Level"), 0);
+   of = e_widget_framelist_add(evas, D_("Activity Notification Level"), 0);
    rg = e_widget_radio_group_new(&(cfdata->limit));
-   ob = e_widget_radio_add(evas, _("High (MB)"), 1048575, rg);
+   ob = e_widget_radio_add(evas, D_("High (MB)"), 1048575, rg);
    e_widget_framelist_object_append(of, ob);
-   ob = e_widget_radio_add(evas, _("Middle (KB)"), 1023, rg);
+   ob = e_widget_radio_add(evas, D_("Middle (KB)"), 1023, rg);
    e_widget_framelist_object_append(of, ob);
-   ob = e_widget_radio_add(evas, _("Low (B)"), 0, rg);
+   ob = e_widget_radio_add(evas, D_("Low (B)"), 0, rg);
    e_widget_framelist_object_append(of, ob);
    e_widget_list_object_append(o, of, 1, 1, 0.5);
 
    if (!cfdata->devs) return o;
    
-   of = e_widget_framelist_add(evas, _("Device Settings"), 0);
+   of = e_widget_framelist_add(evas, D_("Device Settings"), 0);
    rg = e_widget_radio_group_new(&(cfdata->num));
    ecore_list_goto_first(cfdata->devs);
    while ((tmp = ecore_list_next(cfdata->devs)) != NULL) 

src/e_mod_gadcon.c

@@ -83,7 +83,7 @@ _gc_orient(E_Gadcon_Client *gcc)
 static char *
 _gc_label(void) 
 {
-   return _("Net");
+   return D_("Net");
 }
 
 static Evas_Object *

src/e_mod_main.c

@@ -15,6 +15,9 @@ EAPI E_Module_Api e_modapi =
 EAPI void *
 e_modapi_init(E_Module *m) 
 {
+   bindtextdomain(PACKAGE, LOCALEDIR);
+   bind_textdomain_codeset(PACKAGE, "UTF-8");
+
    item_edd = E_CONFIG_DD_NEW("Config_Item", Config_Item);
    E_CONFIG_VAL(item_edd, Config_Item, id, STR);
    E_CONFIG_VAL(item_edd, Config_Item, device, STR);
@@ -94,7 +97,7 @@ e_modapi_save(E_Module *m)
 EAPI int
 e_modapi_about(E_Module *m) 
 {
-   e_module_dialog_show(m, _("Network Monitor Module"), 
-			_("Module to monitor network traffic"));
+   e_module_dialog_show(m, D_("Network Monitor Module"), 
+			D_("Module to monitor network traffic"));
    return 1;
 }

src/e_mod_main.h

@@ -1,3 +1,5 @@
+#define D_(str) dgettext(PACKAGE, str)
+
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 

src/e_mod_net.c

@@ -121,7 +121,7 @@ _cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event)
 	cfg->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, _cb_configure, inst);
 	
@@ -167,7 +167,7 @@ _cb_mouse_in(void *data, Evas_Object *obj, const char *emission, const char *sou
    if (!e_theme_edje_object_set(bg, "base/theme/modules", 
 				"modules/net/popup"))
      edje_object_file_set(bg, buf, "modules/net/popup");
-   snprintf(buf, sizeof(buf), _("Device - %s"), ci->device);
+   snprintf(buf, sizeof(buf), D_("Device - %s"), ci->device);
    edje_object_part_text_set(bg, "e.text.title", buf);
    evas_object_show(bg);