From fc9a08b5e69ba5705f784f1d24ff0b29adfac406 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Thu, 3 May 2012 14:44:06 +0000 Subject: [PATCH] Iniciando implementação do suporte a múltiplas línguas --- Makefile.in | 3 +++ src/include/rules.mak.in | 11 +++++++++++ src/lib3270/Makefile.in | 18 ++++++++++++++++++ src/lib3270/telnet.c | 2 +- src/pw3270/Makefile.in | 5 +++++ src/pw3270/dialog.c | 4 ++-- 6 files changed, 40 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 2603494..2ebded8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -75,6 +75,9 @@ endif debian/%.install: src/%/Makefile @$(MAKE) DEBDIR=../../debian -C $(dir $^) ../../$@ +$(BINDIR)/pot/%.pot: src/%/Makefile + @$(MAKE) BINDIR=../../$(BINDIR) -C $(dir $^) ../../$@ + #---[ Release targets ]-------------------------------------------------------- all: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) filelist diff --git a/src/include/rules.mak.in b/src/include/rules.mak.in index a8c1756..d1a08d8 100644 --- a/src/include/rules.mak.in +++ b/src/include/rules.mak.in @@ -45,6 +45,8 @@ DEPENDS ?= *.h MKDIR=@MKDIR_P@ CC=@CC@ LD=@CC@ +MSGCAT=@MSGCAT@ +XGETTEXT=@XGETTEXT@ #---[ ]------------------------------------------------------------------ @@ -55,6 +57,7 @@ OBJEXT=.o ROOTDIR ?= . OBJDIR ?= $(ROOTDIR)/.obj BINDIR ?= $(ROOTDIR)/.bin +TMPDIR ?= $(ROOTDIR)/.tmp BINDBG ?= $(BINDIR)/Debug BINRLS ?= $(BINDIR)/Release @@ -74,11 +77,19 @@ $(OBJRLS)/%.o: %.c $(DEPENDS) @$(MKDIR) `dirname $@` @$(CC) $(CFLAGS) $(LIB3270_CFLAGS) -o $@ -c $< +$(TMPDIR)/pot/%.pot: %.c + @echo " TEXT `basename $@`" + @$(MKDIR) `dirname $@` + @$(XGETTEXT) --default-domain=$(PACKAGE_NAME) --language=C \ + --keyword=_ --keyword=N_ --keyword=MSG_:2 --output=$@ $< + @touch $@ + #---[ Targets ]---------------------------------------------------------------- clean-common: @rm -fr $(OBJDIR) @rm -fr $(BINDIR) + @rm -fr $(TMPDIR) @rm -f *.log @find . -name "*~" -exec rm -f {} \; diff --git a/src/lib3270/Makefile.in b/src/lib3270/Makefile.in index 482ab8e..d797ad3 100644 --- a/src/lib3270/Makefile.in +++ b/src/lib3270/Makefile.in @@ -58,6 +58,8 @@ INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ INSTALL_DATA=@INSTALL_DATA@ VALGRIND=@VALGRIND@ +XGETTEXT=@XGETTEXT@ +MSGCAT=@MSGCAT@ #---[ ]------------------------------------------------------------------ @@ -68,6 +70,7 @@ OBJEXT=.o ROOTDIR ?= . OBJDIR ?= $(ROOTDIR)/.obj BINDIR ?= $(ROOTDIR)/.bin +TMPDIR ?= $(ROOTDIR)/.tmp DEPENDS ?= *.h Makefile BINDBG ?= $(BINDIR)/Debug @@ -88,6 +91,14 @@ $(OBJRLS)/%.o: %.c $(DEPENDS) @$(MKDIR) `dirname $@` @$(CC) $(CFLAGS) $(SSL_CFLAGS) -o $@ -c $< +$(TMPDIR)/pot/%.pot: %.c + @echo " TEXT `basename $@`" + @$(MKDIR) `dirname $@` + @$(XGETTEXT) --default-domain=$(PACKAGE) --language=C \ + --keyword=_ --keyword=N_ --keyword=MSG_:2 --output=$@ $< + @touch $@ + + #---[ Sources ]---------------------------------------------------------------- SOURCES = XtGlue.c init.c actions.c ansi.c charset.c ctlr.c \ @@ -128,6 +139,11 @@ $(DEBDIR)/lib3270.install: Makefile @$(MKDIR) `dirname $@` @echo "$(libdir)/lib3270.so" > $@ +$(BINDIR)/pot/lib3270.pot: $(foreach SRC, $(basename $(SOURCES)), $(TMPDIR)/pot/$(SRC).pot) + @rm -f $@ + @mkdir -p `dirname $@` + @$(MSGCAT) --sort-output $^ > $@ + run: $(BINDBG)/testprogram$(EXEEXT) $(BINDBG)/testprogram$(EXEEXT) @@ -155,6 +171,8 @@ $(BINDIR)/mkfb@EXEEXT@: mkfb.c Makefile clean: @rm -fr .obj @rm -fr .bin + @rm -fr .tmp @rm -f *.log @rm -f version.c @rm -f fallbacks.c + @rm -f lib3270.pot diff --git a/src/lib3270/telnet.c b/src/lib3270/telnet.c index 26f170c..18ad940 100644 --- a/src/lib3270/telnet.c +++ b/src/lib3270/telnet.c @@ -384,7 +384,7 @@ void sockstart(H3270 *session) LIB3270_NOTIFY_CRITICAL, N_( "Network startup error" ), N_( "Bad winsock version" ), - N_( "Can´t use winsock version %d.%d" ), LOBYTE(wsaData.wVersion), HIBYTE(wsaData.wVersion)); + N_( "Can't use winsock version %d.%d" ), LOBYTE(wsaData.wVersion), HIBYTE(wsaData.wVersion)); _exit(1); } } diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in index 6e1cb75..26294a2 100644 --- a/src/pw3270/Makefile.in +++ b/src/pw3270/Makefile.in @@ -153,6 +153,11 @@ v3270/marshal.c: v3270/genmarshal v3270/marshal.h @$(MKDIR) `dirname $@` @glib-genmarshal --prefix=$(PACKAGE_NAME) --body v3270/genmarshal > $@ +$(BINDIR)/pot/pw3270.pot: $(foreach SRC, $(basename $(SOURCES)), $(TMPDIR)/pot/$(SRC).pot) + @rm -f $@ + @mkdir -p `dirname $@` + @$(MSGCAT) --sort-output $^ > $@ + clean: clean-common @rm -f v3270/marshal.c @rm -f v3270/marshal.h diff --git a/src/pw3270/dialog.c b/src/pw3270/dialog.c index 8695996..343ed20 100644 --- a/src/pw3270/dialog.c +++ b/src/pw3270/dialog.c @@ -187,7 +187,7 @@ GTK_MESSAGE_ERROR,GTK_BUTTONS_CLOSE, gettext(errmsg),filename); - gtk_window_set_title(GTK_WINDOW(popup),_("Can´t save file")); + gtk_window_set_title(GTK_WINDOW(popup),_("Can't save file")); gtk_message_dialog_format_secondary_markup(GTK_MESSAGE_DIALOG(popup),"%s",error->message); g_error_free(error); @@ -448,7 +448,7 @@ GTK_MESSAGE_ERROR,GTK_BUTTONS_CLOSE, _( "Error loading %s" ),filename); - gtk_window_set_title(GTK_WINDOW(popup),_("Can´t load file")); + gtk_window_set_title(GTK_WINDOW(popup),_("Can't load file")); gtk_message_dialog_format_secondary_markup(GTK_MESSAGE_DIALOG(popup),"%s",error->message); g_error_free(error); -- libgit2 0.21.2