From d79b3aec6ea8d2c7a7e792cf543ad7673e07e419 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Thu, 26 Apr 2012 13:05:59 +0000 Subject: [PATCH] Iniciando reinclusão de suporte completo a gettext --- src/gtk/Makefile.in | 2 +- src/gtk/main.c | 33 +++++++++++++++++++++++++++++++++ src/gtk/uiparser/Makefile.in | 2 +- src/lib3270/Makefile.in | 2 +- 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/src/gtk/Makefile.in b/src/gtk/Makefile.in index 9fad512..2b9532d 100644 --- a/src/gtk/Makefile.in +++ b/src/gtk/Makefile.in @@ -59,7 +59,7 @@ DEPENDS=*.h common/*.h uiparser/*.h v3270/*.h $(GLOBAL_DEPS) VALGRIND=@VALGRIND@ -CFLAGS=@CFLAGS@ @GTK_CFLAGS@ -DAPPDATA=\"$(datarootdir)/$(PACKAGE_NAME)\" -I../../src/include +CFLAGS=@CFLAGS@ @GTK_CFLAGS@ -DDATADIR=\"$(datarootdir)\" -I../../src/include LIBS=@LIBS@ @GTK_LIBS@ include ../include/rules.mak diff --git a/src/gtk/main.c b/src/gtk/main.c index e1414d0..c6ee6e5 100644 --- a/src/gtk/main.c +++ b/src/gtk/main.c @@ -139,6 +139,39 @@ int main(int argc, char *argv[]) } } +#ifdef LC_ALL + setlocale( LC_ALL, "" ); +#endif + +#if defined( WIN32 ) + { + gchar * appdir = g_win32_get_package_installation_directory_of_module(NULL); + gchar * locdir = g_build_filename(appdir,"locale",NULL); + + g_chdir(appdir); + bindtextdomain( PACKAGE_NAME, locdir ); + + g_free(locdir); + g_free( appdir ); + + } +#elif defined( DATADIR ) + { + gchar * appdir = g_build_filename(DATADIR,PACKAGE_NAME,NULL); + gchar * locdir = g_build_filename(DATADIR,"locale",NULL); + + g_chdir(appdir); + bindtextdomain( PACKAGE_NAME, locdir); + + g_free(locdir); + g_free(appdir); + + } +#endif // DATADIR + + bind_textdomain_codeset(PACKAGE_NAME, "UTF-8"); + textdomain(PACKAGE_NAME); + g_set_application_name(appname); rc = initialize(); diff --git a/src/gtk/uiparser/Makefile.in b/src/gtk/uiparser/Makefile.in index 6261785..0926536 100644 --- a/src/gtk/uiparser/Makefile.in +++ b/src/gtk/uiparser/Makefile.in @@ -53,7 +53,7 @@ SOURCES=testprogram.c ../common/config.c $(foreach SRC, $(UI_PARSER_SRC), $(SRC) DEPENDS=*.h ../common/*.h Makefile -CFLAGS=@CFLAGS@ @GTK_CFLAGS@ -DAPPDATA=\"$(datarootdir)/$(PACKAGE_NAME)\" -I../../include +CFLAGS=@CFLAGS@ @GTK_CFLAGS@ -DDATADIR=\"$(datarootdir)\" -I../../include LIBS=@LIBS@ @GTK_LIBS@ include ../../include/rules.mak diff --git a/src/lib3270/Makefile.in b/src/lib3270/Makefile.in index 2b5a1fb..761a1a3 100644 --- a/src/lib3270/Makefile.in +++ b/src/lib3270/Makefile.in @@ -28,7 +28,7 @@ PACKAGE=@PACKAGE_NAME@ -CFLAGS=@CFLAGS@ @DLL_CFLAGS@ -DAPPDATA=\"$(datarootdir)/$(PACKAGE_NAME)\" -I../include +CFLAGS=@CFLAGS@ @DLL_CFLAGS@ -DDATADIR=\"$(datarootdir)\" -I../include SSL_CFLAGS=@LIBSSL_CFLAGS@ DLL_FLAGS=@DLL_FLAGS@ -- libgit2 0.21.2