Boris Faure, il 30/04/2012 11:21, ha scritto: > It is all ok with me. Thank you for doing it. > About po files, I think maxerba should be able to fix it.
uhmm, actually I'm not a real coder, so I could just try to guess what should
be done :)
however the attached patch should be enough to remove from the code all the
stuff needed to build e-tiling in its own i18n domain.
all the translatable strings would go directly in enlightement.pot, so
translators will have to update it (isn't it their job? :) ).
--
Massimo Maiurana massimo<at>ragusa.linux.it
http://massimo.solira.org GPG keyID #7044D601
Creare l'uomo fu un'idea bizzarra e originale,
ma aggiungere la pecora fu una tautologia.
[Mark Twain]
diff -Naur ./a/e/po/POTFILES.in ./b/e/po/POTFILES.in
--- ./a/e/po/POTFILES.in 2012-04-28 14:51:52.000000000 +0200
+++ ./b/e/po/POTFILES.in 2012-04-30 18:51:05.599543921 +0200
@@ -249,6 +249,9 @@
src/modules/shot/e_mod_main.c
src/modules/tasks/e_mod_main.c
src/modules/tasks/e_mod_config.c
+src/modules/tiling/e_mod_config.c
+src/modules/tiling/e_mod_tiling.c
+src/modules/tiling/e_mod_tiling.h
src/modules/xkbswitch/e_mod_main.c
src/modules/xkbswitch/e_mod_config.c
src/modules/xkbswitch/e_mod_keybindings.c
diff -Naur ./a/e/src/modules/tiling/e_mod_config.c ./b/e/src/modules/tiling/e_mod_config.c
--- ./a/e/src/modules/tiling/e_mod_config.c 2011-12-23 19:45:00.000000000 +0100
+++ ./b/e/src/modules/tiling/e_mod_config.c 2012-04-30 14:05:11.517311577 +0200
@@ -14,7 +14,7 @@
/* Some defines to make coding with the e_widget_* easier for
* configuration panel */
#define RADIO(title, value, radiogroup) \
- e_widget_radio_add(evas, D_(title), value, radiogroup)
+ e_widget_radio_add(evas, _(title), value, radiogroup)
#define LIST_ADD(list, object) \
e_widget_list_object_append(list, object, 1, 1, 0.5)
@@ -121,15 +121,15 @@
list = e_widget_list_add(evas, false, true);
LIST_ADD(list, e_widget_label_add(evas, desk->name));
- slider = e_widget_slider_add(evas, 1, 0, D_("%1.0f"),
+ slider = e_widget_slider_add(evas, 1, 0, _("%1.0f"),
0.0, 8.0, 1.0, 0, NULL,
&vd->nb_stacks, 150);
LIST_ADD(list, slider);
rg = e_widget_radio_group_new(&vd->use_rows);
- radio = e_widget_radio_add(evas, D_("columns"), 0, rg);
+ radio = e_widget_radio_add(evas, _("columns"), 0, rg);
LIST_ADD(list, radio);
- radio = e_widget_radio_add(evas, D_("rows"), 1, rg);
+ radio = e_widget_radio_add(evas, _("rows"), 1, rg);
LIST_ADD(list, radio);
LIST_ADD(cfdata->o_desklist, list);
@@ -169,16 +169,16 @@
o = e_widget_list_add(evas, 0, 0);
/* General settings */
- of = e_widget_framelist_add(evas, D_("General"), 0);
+ of = e_widget_framelist_add(evas, _("General"), 0);
e_widget_framelist_object_append(of,
- e_widget_check_add(evas, D_("Tile dialog windows aswell"),
+ e_widget_check_add(evas, _("Tile dialog windows aswell"),
&cfdata->config.tile_dialogs));
e_widget_framelist_object_append(of,
- e_widget_check_add(evas, D_("Show window titles"),
+ e_widget_check_add(evas, _("Show window titles"),
&cfdata->config.show_titles));
oc = e_widget_list_add(evas, false, true);
e_widget_list_object_append(oc,
- e_widget_label_add(evas, D_("Key hints")), 1, 0, 0.5);
+ e_widget_label_add(evas, _("Key hints")), 1, 0, 0.5);
e_widget_list_object_append(oc,
e_widget_entry_add(evas, &cfdata->config.keyhints, NULL, NULL, NULL),
1, 1, 0.5);
@@ -187,9 +187,9 @@
LIST_ADD(o, of);
/* Virtual desktop settings */
- of = e_widget_framelist_add(evas, D_("Virtual Desktops"), 0);
+ of = e_widget_framelist_add(evas, _("Virtual Desktops"), 0);
e_widget_label_add(evas,
- D_("Number of columns used to tile per desk"
+ _("Number of columns used to tile per desk"
" (0 â tiling disabled):"));
cfdata->osf = e_widget_list_add(evas, 0, 1);
@@ -326,7 +326,7 @@
snprintf(buf, sizeof(buf), "%s/e-module-e-tiling.edj",
e_module_dir_get(tiling_g.module));
cfd = e_config_dialog_new(con,
- D_("Tiling Configuration"),
+ _("Tiling Configuration"),
"E", "windows/e-tiling",
buf, 0, v, NULL);
return cfd;
diff -Naur ./a/e/src/modules/tiling/e_mod_tiling.c ./b/e/src/modules/tiling/e_mod_tiling.c
--- ./a/e/src/modules/tiling/e_mod_tiling.c 2012-03-12 20:38:01.000000000 +0100
+++ ./b/e/src/modules/tiling/e_mod_tiling.c 2012-04-30 13:58:13.811240290 +0200
@@ -3721,10 +3721,6 @@
}
}
- snprintf(buf, sizeof(buf), "%s/locale", e_module_dir_get(m));
- bindtextdomain(PACKAGE, buf);
- bind_textdomain_codeset(PACKAGE, "UTF-8");
-
_G.info_hash = eina_hash_pointer_new(_clear_info_hash);
_G.border_extras = eina_hash_pointer_new(_clear_border_extras);
@@ -3759,7 +3755,7 @@
const char *_name = _value; \
if ((_action = e_action_add(_name))) { \
_action->func.go = _cb; \
- e_action_predef_name_set(D_("E-Tiling"), D_(_title), _name, \
+ e_action_predef_name_set(_("E-Tiling"), _(_title), _name, \
NULL, NULL, 0); \
} \
}
@@ -3786,9 +3782,9 @@
/* Configuration entries */
snprintf(_G.edj_path, sizeof(_G.edj_path), "%s/e-module-e-tiling.edj",
e_module_dir_get(m));
- e_configure_registry_category_add("windows", 50, D_("Windows"), NULL,
+ e_configure_registry_category_add("windows", 50, _("Windows"), NULL,
"preferences-system-windows");
- e_configure_registry_item_add("windows/e-tiling", 150, D_("E-Tiling"),
+ e_configure_registry_item_add("windows/e-tiling", 150, _("E-Tiling"),
NULL, _G.edj_path,
e_int_config_tiling_module);
@@ -3877,7 +3873,7 @@
#define ACTION_DEL(act, title, value) \
if (act) { \
- e_action_predef_name_del(D_("E-Tiling"), D_(title)); \
+ e_action_predef_name_del(_("E-Tiling"), _(title)); \
e_action_del(value); \
act = NULL; \
}
diff -Naur ./a/e/src/modules/tiling/e_mod_tiling.h ./b/e/src/modules/tiling/e_mod_tiling.h
--- ./a/e/src/modules/tiling/e_mod_tiling.h 2011-11-03 18:19:17.000000000 +0100
+++ ./b/e/src/modules/tiling/e_mod_tiling.h 2012-04-30 14:04:43.153170944 +0200
@@ -1,7 +1,5 @@
#ifndef E_MOD_TILING_H
#define E_MOD_TILING_H
-#include <libintl.h>
-#define D_(str) dgettext(PACKAGE, str)
#include <e.h>
#include <e_border.h>
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
