davemds pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/forecasts.git/commit/?id=1a2f682b283291aa819879a76ffb3c6e952911b2
commit 1a2f682b283291aa819879a76ffb3c6e952911b2 Author: Dave Andreoli <[email protected]> Date: Sun Apr 19 10:29:55 2020 +0200 Forecasts: make translation works again NLS was probably broken since the switch to meson, this commit fix 2 issues: * config.h was not readed at all, renamed to forecasts_config.g and included * meson install po files in system dir, not in E modules dir like it was before --- meson.build | 6 +++++- src/e_mod_main.c | 5 +---- src/e_mod_main.h | 2 ++ src/meson.build | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 68cd960..adfa753 100644 --- a/meson.build +++ b/meson.build @@ -21,9 +21,13 @@ edje_cmd = find_program('edje_cc') install_mod_dir = join_paths(dir_module_e, meson.project_name()) install_dir = join_paths(install_mod_dir, module_arch) +locale_dir = join_paths(get_option('prefix'), get_option('localedir')) config_data = configuration_data() +config_data.set_quoted('PACKAGE', meson.project_name()) config_data.set_quoted('MODULE_DIR', install_dir) +config_data.set_quoted('LOCALE_DIR', locale_dir) +config_dir = include_directories('.') use_translations = false intl_lib = cc.find_library('intl', required: false) @@ -47,7 +51,7 @@ endif subdir('src') -configure_file(output: 'config.h', install: false, configuration: config_data) +configure_file(output: 'forecast_config.h', install: false, configuration: config_data) install_data('module.desktop', install_dir : install_mod_dir) diff --git a/src/e_mod_main.c b/src/e_mod_main.c index fbf0c10..8976a45 100644 --- a/src/e_mod_main.c +++ b/src/e_mod_main.c @@ -392,10 +392,7 @@ EAPI E_Module_Api e_modapi = { EAPI void * e_modapi_init(E_Module *m) { - char buf[4095]; - - snprintf(buf, sizeof(buf), "%s/locale", e_module_dir_get(m)); - bindtextdomain(PACKAGE, buf); + bindtextdomain(PACKAGE, LOCALE_DIR); bind_textdomain_codeset(PACKAGE, "UTF-8"); conf_item_edd = E_CONFIG_DD_NEW("Forecasts_Config_Item", Config_Item); diff --git a/src/e_mod_main.h b/src/e_mod_main.h index bdc43ec..ca09bf1 100644 --- a/src/e_mod_main.h +++ b/src/e_mod_main.h @@ -1,6 +1,8 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H +#include "forecast_config.h" + #ifdef ENABLE_NLS # include <libintl.h> # define D_(string) dgettext(PACKAGE, string) diff --git a/src/meson.build b/src/meson.build index bbb9b20..83fbf96 100644 --- a/src/meson.build +++ b/src/meson.build @@ -5,6 +5,7 @@ module = shared_module('module', 'e_mod_main.c', 'e_mod_config.c', dependencies : [e, json], install_dir: install_dir, + include_directories: config_dir, install: true, name_prefix: '', link_args: '-Wl,--unresolved-symbols=ignore-in-object-files') --
