Commit d79b3aec6ea8d2c7a7e792cf543ad7673e07e419
1 parent
a95daa75
Exists in
master
and in
5 other branches
Iniciando reinclusão de suporte completo a gettext
Showing
4 changed files
with
36 additions
and
3 deletions
Show diff stats
src/gtk/Makefile.in
| ... | ... | @@ -59,7 +59,7 @@ DEPENDS=*.h common/*.h uiparser/*.h v3270/*.h $(GLOBAL_DEPS) |
| 59 | 59 | |
| 60 | 60 | VALGRIND=@VALGRIND@ |
| 61 | 61 | |
| 62 | -CFLAGS=@CFLAGS@ @GTK_CFLAGS@ -DAPPDATA=\"$(datarootdir)/$(PACKAGE_NAME)\" -I../../src/include | |
| 62 | +CFLAGS=@CFLAGS@ @GTK_CFLAGS@ -DDATADIR=\"$(datarootdir)\" -I../../src/include | |
| 63 | 63 | LIBS=@LIBS@ @GTK_LIBS@ |
| 64 | 64 | |
| 65 | 65 | include ../include/rules.mak | ... | ... |
src/gtk/main.c
| ... | ... | @@ -139,6 +139,39 @@ int main(int argc, char *argv[]) |
| 139 | 139 | } |
| 140 | 140 | } |
| 141 | 141 | |
| 142 | +#ifdef LC_ALL | |
| 143 | + setlocale( LC_ALL, "" ); | |
| 144 | +#endif | |
| 145 | + | |
| 146 | +#if defined( WIN32 ) | |
| 147 | + { | |
| 148 | + gchar * appdir = g_win32_get_package_installation_directory_of_module(NULL); | |
| 149 | + gchar * locdir = g_build_filename(appdir,"locale",NULL); | |
| 150 | + | |
| 151 | + g_chdir(appdir); | |
| 152 | + bindtextdomain( PACKAGE_NAME, locdir ); | |
| 153 | + | |
| 154 | + g_free(locdir); | |
| 155 | + g_free( appdir ); | |
| 156 | + | |
| 157 | + } | |
| 158 | +#elif defined( DATADIR ) | |
| 159 | + { | |
| 160 | + gchar * appdir = g_build_filename(DATADIR,PACKAGE_NAME,NULL); | |
| 161 | + gchar * locdir = g_build_filename(DATADIR,"locale",NULL); | |
| 162 | + | |
| 163 | + g_chdir(appdir); | |
| 164 | + bindtextdomain( PACKAGE_NAME, locdir); | |
| 165 | + | |
| 166 | + g_free(locdir); | |
| 167 | + g_free(appdir); | |
| 168 | + | |
| 169 | + } | |
| 170 | +#endif // DATADIR | |
| 171 | + | |
| 172 | + bind_textdomain_codeset(PACKAGE_NAME, "UTF-8"); | |
| 173 | + textdomain(PACKAGE_NAME); | |
| 174 | + | |
| 142 | 175 | g_set_application_name(appname); |
| 143 | 176 | |
| 144 | 177 | rc = initialize(); | ... | ... |
src/gtk/uiparser/Makefile.in
| ... | ... | @@ -53,7 +53,7 @@ SOURCES=testprogram.c ../common/config.c $(foreach SRC, $(UI_PARSER_SRC), $(SRC) |
| 53 | 53 | |
| 54 | 54 | DEPENDS=*.h ../common/*.h Makefile |
| 55 | 55 | |
| 56 | -CFLAGS=@CFLAGS@ @GTK_CFLAGS@ -DAPPDATA=\"$(datarootdir)/$(PACKAGE_NAME)\" -I../../include | |
| 56 | +CFLAGS=@CFLAGS@ @GTK_CFLAGS@ -DDATADIR=\"$(datarootdir)\" -I../../include | |
| 57 | 57 | LIBS=@LIBS@ @GTK_LIBS@ |
| 58 | 58 | |
| 59 | 59 | include ../../include/rules.mak | ... | ... |
src/lib3270/Makefile.in
| ... | ... | @@ -28,7 +28,7 @@ |
| 28 | 28 | |
| 29 | 29 | PACKAGE=@PACKAGE_NAME@ |
| 30 | 30 | |
| 31 | -CFLAGS=@CFLAGS@ @DLL_CFLAGS@ -DAPPDATA=\"$(datarootdir)/$(PACKAGE_NAME)\" -I../include | |
| 31 | +CFLAGS=@CFLAGS@ @DLL_CFLAGS@ -DDATADIR=\"$(datarootdir)\" -I../include | |
| 32 | 32 | SSL_CFLAGS=@LIBSSL_CFLAGS@ |
| 33 | 33 | |
| 34 | 34 | DLL_FLAGS=@DLL_FLAGS@ | ... | ... |