integrate systray translation/gettext into e17.

SVN revision: 40613

diff --git a/po/POTFILES.in b/po/POTFILES.in
index adf0f43..19de96c 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -264,3 +264,4 @@ src/modules/mixer/conf_module.c
 src/modules/mixer/e_mod_main.c
 src/modules/connman/e_iface.c
 src/modules/connman/e_mod_main.c
+src/modules/systray/e_mod_main.c

diff --git a/src/modules/systray/e_mod_main.c b/src/modules/systray/e_mod_main.c
index 0dd5f80..90f751a 100644 (file)
--- a/src/modules/systray/e_mod_main.c
+++ b/src/modules/systray/e_mod_main.c
@@ -868,9 +868,9 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
    if ((!id) || (instance))
      {
        e_util_dialog_internal
-         (D_("Another systray exists"),
-          D_("There can be only one systray gadget and "
-             "another one already exists."));
+         (_("Another systray exists"),
+          _("There can be only one systray gadget and "
+            "another one already exists."));
        return NULL;
      }
 
@@ -1067,7 +1067,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
 static char *
 _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
 {
-   return D_(_Name);
+   return _("Systray");
 }
 
 static Evas_Object *
@@ -1103,11 +1103,6 @@ e_modapi_init(E_Module *m)
 {
    systray_mod = m;
 
-   if (snprintf(tmpbuf, sizeof(tmpbuf), "%s/locale", e_module_dir_get(m)) >= (int)sizeof(tmpbuf))
-     return NULL;
-   bindtextdomain(PACKAGE, tmpbuf);
-   bind_textdomain_codeset(PACKAGE, "UTF-8");
-
    e_gadcon_provider_register(&_gc_class);
 
    if (!_atom_manager)

diff --git a/src/modules/systray/e_mod_main.h b/src/modules/systray/e_mod_main.h
index 8d10ecf..f884cc0 100644 (file)
--- a/src/modules/systray/e_mod_main.h
+++ b/src/modules/systray/e_mod_main.h
@@ -1,8 +1,6 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-#define D_(str) dgettext(PACKAGE, str)
-
 EAPI extern E_Module_Api e_modapi;
 
 EAPI void *e_modapi_init(E_Module *m);