Download as
Browse Code »

Commit fc9a08b5e69ba5705f784f1d24ff0b29adfac406

Authored by perry.werneck@gmail.com
1 parent 992ebecd
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Iniciando implementação do suporte a múltiplas línguas

Showing 6 changed files with 40 additions and 3 deletions   Show diff stats
@@ -75,6 +75,9 @@ endif @@ -75,6 +75,9 @@ endif
75 debian/%.install: src/%/Makefile 75 debian/%.install: src/%/Makefile
76 @$(MAKE) DEBDIR=../../debian -C $(dir $^) ../../$@ 76 @$(MAKE) DEBDIR=../../debian -C $(dir $^) ../../$@
77 77
  78 +$(BINDIR)/pot/%.pot: src/%/Makefile
  79 + @$(MAKE) BINDIR=../../$(BINDIR) -C $(dir $^) ../../$@
  80 +
78 #---[ Release targets ]-------------------------------------------------------- 81 #---[ Release targets ]--------------------------------------------------------
79 82
80 all: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) filelist 83 all: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) filelist
src/include/rules.mak.in
  Diff comments   View file @fc9a08b
@@ -45,6 +45,8 @@ DEPENDS ?= *.h @@ -45,6 +45,8 @@ DEPENDS ?= *.h
45 MKDIR=@MKDIR_P@ 45 MKDIR=@MKDIR_P@
46 CC=@CC@ 46 CC=@CC@
47 LD=@CC@ 47 LD=@CC@
  48 +MSGCAT=@MSGCAT@
  49 +XGETTEXT=@XGETTEXT@
48 50
49 #---[ ]------------------------------------------------------------------ 51 #---[ ]------------------------------------------------------------------
50 52
@@ -55,6 +57,7 @@ OBJEXT=.o @@ -55,6 +57,7 @@ OBJEXT=.o
55 ROOTDIR ?= . 57 ROOTDIR ?= .
56 OBJDIR ?= $(ROOTDIR)/.obj 58 OBJDIR ?= $(ROOTDIR)/.obj
57 BINDIR ?= $(ROOTDIR)/.bin 59 BINDIR ?= $(ROOTDIR)/.bin
  60 +TMPDIR ?= $(ROOTDIR)/.tmp
58 61
59 BINDBG ?= $(BINDIR)/Debug 62 BINDBG ?= $(BINDIR)/Debug
60 BINRLS ?= $(BINDIR)/Release 63 BINRLS ?= $(BINDIR)/Release
@@ -74,11 +77,19 @@ $(OBJRLS)/%.o: %.c $(DEPENDS) @@ -74,11 +77,19 @@ $(OBJRLS)/%.o: %.c $(DEPENDS)
74 @$(MKDIR) `dirname $@` 77 @$(MKDIR) `dirname $@`
75 @$(CC) $(CFLAGS) $(LIB3270_CFLAGS) -o $@ -c $< 78 @$(CC) $(CFLAGS) $(LIB3270_CFLAGS) -o $@ -c $<
76 79
  80 +$(TMPDIR)/pot/%.pot: %.c
  81 + @echo " TEXT `basename $@`"
  82 + @$(MKDIR) `dirname $@`
  83 + @$(XGETTEXT) --default-domain=$(PACKAGE_NAME) --language=C \
  84 + --keyword=_ --keyword=N_ --keyword=MSG_:2 --output=$@ $<
  85 + @touch $@
  86 +
77 #---[ Targets ]---------------------------------------------------------------- 87 #---[ Targets ]----------------------------------------------------------------
78 88
79 clean-common: 89 clean-common:
80 @rm -fr $(OBJDIR) 90 @rm -fr $(OBJDIR)
81 @rm -fr $(BINDIR) 91 @rm -fr $(BINDIR)
  92 + @rm -fr $(TMPDIR)
82 @rm -f *.log 93 @rm -f *.log
83 @find . -name "*~" -exec rm -f {} \; 94 @find . -name "*~" -exec rm -f {} \;
84 95
src/lib3270/Makefile.in
  Diff comments   View file @fc9a08b
@@ -58,6 +58,8 @@ INSTALL=@INSTALL@ @@ -58,6 +58,8 @@ INSTALL=@INSTALL@
58 INSTALL_PROGRAM=@INSTALL_PROGRAM@ 58 INSTALL_PROGRAM=@INSTALL_PROGRAM@
59 INSTALL_DATA=@INSTALL_DATA@ 59 INSTALL_DATA=@INSTALL_DATA@
60 VALGRIND=@VALGRIND@ 60 VALGRIND=@VALGRIND@
  61 +XGETTEXT=@XGETTEXT@
  62 +MSGCAT=@MSGCAT@
61 63
62 #---[ ]------------------------------------------------------------------ 64 #---[ ]------------------------------------------------------------------
63 65
@@ -68,6 +70,7 @@ OBJEXT=.o @@ -68,6 +70,7 @@ OBJEXT=.o
68 ROOTDIR ?= . 70 ROOTDIR ?= .
69 OBJDIR ?= $(ROOTDIR)/.obj 71 OBJDIR ?= $(ROOTDIR)/.obj
70 BINDIR ?= $(ROOTDIR)/.bin 72 BINDIR ?= $(ROOTDIR)/.bin
  73 +TMPDIR ?= $(ROOTDIR)/.tmp
71 DEPENDS ?= *.h Makefile 74 DEPENDS ?= *.h Makefile
72 75
73 BINDBG ?= $(BINDIR)/Debug 76 BINDBG ?= $(BINDIR)/Debug
@@ -88,6 +91,14 @@ $(OBJRLS)/%.o: %.c $(DEPENDS) @@ -88,6 +91,14 @@ $(OBJRLS)/%.o: %.c $(DEPENDS)
88 @$(MKDIR) `dirname $@` 91 @$(MKDIR) `dirname $@`
89 @$(CC) $(CFLAGS) $(SSL_CFLAGS) -o $@ -c $< 92 @$(CC) $(CFLAGS) $(SSL_CFLAGS) -o $@ -c $<
90 93
  94 +$(TMPDIR)/pot/%.pot: %.c
  95 + @echo " TEXT `basename $@`"
  96 + @$(MKDIR) `dirname $@`
  97 + @$(XGETTEXT) --default-domain=$(PACKAGE) --language=C \
  98 + --keyword=_ --keyword=N_ --keyword=MSG_:2 --output=$@ $<
  99 + @touch $@
  100 +
  101 +
91 #---[ Sources ]---------------------------------------------------------------- 102 #---[ Sources ]----------------------------------------------------------------
92 103
93 SOURCES = XtGlue.c init.c actions.c ansi.c charset.c ctlr.c \ 104 SOURCES = XtGlue.c init.c actions.c ansi.c charset.c ctlr.c \
@@ -128,6 +139,11 @@ $(DEBDIR)/lib3270.install: Makefile @@ -128,6 +139,11 @@ $(DEBDIR)/lib3270.install: Makefile
128 @$(MKDIR) `dirname $@` 139 @$(MKDIR) `dirname $@`
129 @echo "$(libdir)/lib3270.so" > $@ 140 @echo "$(libdir)/lib3270.so" > $@
130 141
  142 +$(BINDIR)/pot/lib3270.pot: $(foreach SRC, $(basename $(SOURCES)), $(TMPDIR)/pot/$(SRC).pot)
  143 + @rm -f $@
  144 + @mkdir -p `dirname $@`
  145 + @$(MSGCAT) --sort-output $^ > $@
  146 +
131 run: $(BINDBG)/testprogram$(EXEEXT) 147 run: $(BINDBG)/testprogram$(EXEEXT)
132 $(BINDBG)/testprogram$(EXEEXT) 148 $(BINDBG)/testprogram$(EXEEXT)
133 149
@@ -155,6 +171,8 @@ $(BINDIR)/mkfb@EXEEXT@: mkfb.c Makefile @@ -155,6 +171,8 @@ $(BINDIR)/mkfb@EXEEXT@: mkfb.c Makefile
155 clean: 171 clean:
156 @rm -fr .obj 172 @rm -fr .obj
157 @rm -fr .bin 173 @rm -fr .bin
  174 + @rm -fr .tmp
158 @rm -f *.log 175 @rm -f *.log
159 @rm -f version.c 176 @rm -f version.c
160 @rm -f fallbacks.c 177 @rm -f fallbacks.c
  178 + @rm -f lib3270.pot
src/lib3270/telnet.c
  Diff comments   View file @fc9a08b
@@ -384,7 +384,7 @@ void sockstart(H3270 *session) @@ -384,7 +384,7 @@ void sockstart(H3270 *session)
384 LIB3270_NOTIFY_CRITICAL, 384 LIB3270_NOTIFY_CRITICAL,
385 N_( "Network startup error" ), 385 N_( "Network startup error" ),
386 N_( "Bad winsock version" ), 386 N_( "Bad winsock version" ),
387 - N_( "Can´t use winsock version %d.%d" ), LOBYTE(wsaData.wVersion), HIBYTE(wsaData.wVersion)); 387 + N_( "Can't use winsock version %d.%d" ), LOBYTE(wsaData.wVersion), HIBYTE(wsaData.wVersion));
388 _exit(1); 388 _exit(1);
389 } 389 }
390 } 390 }
src/pw3270/Makefile.in
  Diff comments   View file @fc9a08b
@@ -153,6 +153,11 @@ v3270/marshal.c: v3270/genmarshal v3270/marshal.h @@ -153,6 +153,11 @@ v3270/marshal.c: v3270/genmarshal v3270/marshal.h
153 @$(MKDIR) `dirname $@` 153 @$(MKDIR) `dirname $@`
154 @glib-genmarshal --prefix=$(PACKAGE_NAME) --body v3270/genmarshal > $@ 154 @glib-genmarshal --prefix=$(PACKAGE_NAME) --body v3270/genmarshal > $@
155 155
  156 +$(BINDIR)/pot/pw3270.pot: $(foreach SRC, $(basename $(SOURCES)), $(TMPDIR)/pot/$(SRC).pot)
  157 + @rm -f $@
  158 + @mkdir -p `dirname $@`
  159 + @$(MSGCAT) --sort-output $^ > $@
  160 +
156 clean: clean-common 161 clean: clean-common
157 @rm -f v3270/marshal.c 162 @rm -f v3270/marshal.c
158 @rm -f v3270/marshal.h 163 @rm -f v3270/marshal.h
src/pw3270/dialog.c
  Diff comments   View file @fc9a08b
@@ -187,7 +187,7 @@ @@ -187,7 +187,7 @@
187 GTK_MESSAGE_ERROR,GTK_BUTTONS_CLOSE, 187 GTK_MESSAGE_ERROR,GTK_BUTTONS_CLOSE,
188 gettext(errmsg),filename); 188 gettext(errmsg),filename);
189 189
190 - gtk_window_set_title(GTK_WINDOW(popup),_("Can´t save file")); 190 + gtk_window_set_title(GTK_WINDOW(popup),_("Can't save file"));
191 191
192 gtk_message_dialog_format_secondary_markup(GTK_MESSAGE_DIALOG(popup),"%s",error->message); 192 gtk_message_dialog_format_secondary_markup(GTK_MESSAGE_DIALOG(popup),"%s",error->message);
193 g_error_free(error); 193 g_error_free(error);
@@ -448,7 +448,7 @@ @@ -448,7 +448,7 @@
448 GTK_MESSAGE_ERROR,GTK_BUTTONS_CLOSE, 448 GTK_MESSAGE_ERROR,GTK_BUTTONS_CLOSE,
449 _( "Error loading %s" ),filename); 449 _( "Error loading %s" ),filename);
450 450
451 - gtk_window_set_title(GTK_WINDOW(popup),_("Can´t load file")); 451 + gtk_window_set_title(GTK_WINDOW(popup),_("Can't load file"));
452 452
453 gtk_message_dialog_format_secondary_markup(GTK_MESSAGE_DIALOG(popup),"%s",error->message); 453 gtk_message_dialog_format_secondary_markup(GTK_MESSAGE_DIALOG(popup),"%s",error->message);
454 g_error_free(error); 454 g_error_free(error);