Internationalization works now.

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@67 dbcabf3a-b0e7-0310-adc4-f8d773084564

Makefile.am

@@ -4,9 +4,6 @@ config.h: default-config.h
 default-config.h: $(srcdir)/config
 	$(srcdir)/file2header.sh $(srcdir)/config > default-config.h
 
-## if <internationalization support>
-#SUBDIRS = po intl macros support # <your subdirs here>
-## else
 if BUILD_PLUGINS
 PLUGINS=plugins
 endif
@@ -14,8 +11,7 @@ if BUILD_SERVERTEST
 SERVERTEST=servertest
 endif
 
-SUBDIRS = macros src $(PLUGINS) $(SERVERTEST)
-## endif
+SUBDIRS = po intl macros src $(PLUGINS) $(SERVERTEST)
 
 ## to automatically rebuild aclocal.m4 if any of the macros in
 ## `macros/' change

acconfig.h

@@ -1,24 +1,26 @@
+/* paths */
 #undef SYSCONFDIR
+#undef HELPDIR
 #undef PLUGINSDIR
-#undef PERLSCRIPTDIR
+#undef LOCALEDIR
 
+/* gtk / gnome */
 #undef HAVE_GTK
 #undef HAVE_IMLIB
 #undef HAVE_GNOME
 #undef HAVE_GNOME_PANEL
 
+/* hebrew support for GtkText */
 #undef GTK_HEBREW
 #undef GTK_HEBREW_RC
 
+/* misc.. */
 #undef MEM_DEBUG
 #undef HAVE_IPV6
-
 #undef HAVE_POPT_H
 #undef HAVE_SOCKS_H
 
-#undef HAVE_NCURSES_USE_DEFAULT_COLORS
-#undef HAVE_CURSES_IDCOK
-
+/* macros/curses checks */
 #undef HAS_CURSES
 #undef USE_SUNOS_CURSES
 #undef USE_BSD_CURSES
@@ -27,3 +29,14 @@
 #undef NO_COLOR_CURSES
 #undef SCO_FLAVOR
 #undef NCURSES_970530
+
+/* our own curses checks */
+#undef HAVE_NCURSES_USE_DEFAULT_COLORS
+#undef HAVE_CURSES_IDCOK
+
+/* nls */
+#undef ENABLE_NLS
+#undef HAVE_CATGETS
+#undef HAVE_GETTEXT
+#undef HAVE_LC_MESSAGES
+#undef HAVE_STPCPY

configure.in

@@ -172,17 +172,6 @@ if test "x$ac_cv_prog_gcc" = "xyes"; then
   CFLAGS="$CFLAGS -Wall"
 fi
 
-if test "x$prefix" = "xNONE"; then
-	prefix="/usr/local"
-else
-	prefix=$prefix
-fi
-
-AM_CONDITIONAL(BUILD_PLUGINS, test "x$want_plugins" = "xyes")
-AM_CONDITIONAL(BUILD_SERVERTEST, test "x$want_servertest" = "xyes")
-AC_DEFINE_UNQUOTED(SYSCONFDIR, "$prefix/etc")
-AC_DEFINE_UNQUOTED(PLUGINSDIR, "$prefix/lib/irssi/plugins")
-
 dnl **
 dnl ** check for libPropList
 dnl **
@@ -233,7 +222,6 @@ if test "x$want_gnome" = "xyes"; then
         fi
 fi
 
-AM_CONDITIONAL(HAVE_GNOME, test "x$want_gnome" = "xyes")
 if test "x$want_gnome" = "xyes"; then
 	AC_DEFINE(HAVE_GTK)
 	AC_DEFINE(HAVE_GNOME)
@@ -280,8 +268,6 @@ fi
 
 AC_SUBST(GUI_LIBS)
 AC_SUBST(GUI_CFLAGS)
-AM_CONDITIONAL(BUILD_GNOMEUI, test "x$GUI_LIBS" != "x")
-AM_CONDITIONAL(HAVE_GNOME_PANEL, test "x$want_gnome_panel" = "xyes")
 
 
 dnl **
@@ -290,6 +276,9 @@ dnl **
 
 AM_PATH_GLIB(1.2.0,,, gmodule)
 
+PROG_LIBS="$PROG_LIBS $GLIB_LIBS ../lib-popt/libpopt.a"
+AC_SUBST(PROG_LIBS)
+
 dnl **
 dnl ** curses checks
 dnl **
@@ -314,8 +303,13 @@ else
 fi
 AM_CONDITIONAL(HAS_CURSES, test "$has_curses" = true)
 
-dnl ** check if we want to build irssibot
+dnl ** check what we want to build
 AM_CONDITIONAL(BUILD_IRSSIBOT, test "$want_irssibot" = "xyes")
+AM_CONDITIONAL(BUILD_PLUGINS, test "x$want_plugins" = "xyes")
+AM_CONDITIONAL(BUILD_SERVERTEST, test "x$want_servertest" = "xyes")
+AM_CONDITIONAL(BUILD_GNOMEUI, test "x$GUI_LIBS" != "x")
+AM_CONDITIONAL(HAVE_GNOME, test "x$want_gnome" = "xyes")
+AM_CONDITIONAL(HAVE_GNOME_PANEL, test "x$want_gnome_panel" = "xyes")
 
 dnl **
 dnl ** memory debugging
@@ -334,23 +328,17 @@ if test "x$want_ipv6" = "xyes"; then
 	AC_DEFINE(HAVE_IPV6)
 fi
 
-PROG_LIBS="$PROG_LIBS $GLIB_LIBS ../lib-popt/libpopt.a"
-AC_SUBST(PROG_LIBS)
-
-
 dnl **
 dnl ** internationalization support
 dnl **
 
-dnl ALL_LINGUAS=""
-dnl AM_GNU_GETTEXT
-dnl AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
+ALL_LINGUAS="fi"
+AM_GNU_GETTEXT
 
 AC_OUTPUT(
 Makefile
-dnl ## internationalization support
-dnl po/Makefile.in
-dnl intl/Makefile
+po/Makefile.in
+intl/Makefile
 macros/Makefile
 src/Makefile
 src/irc-base/Makefile

po/Makefile.in.in

@@ -0,0 +1,248 @@
+# Makefile for program source directory in GNU NLS utilities package.
+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+#
+# This file file be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+SHELL = /bin/sh
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datadir = $(prefix)/@DATADIRNAME@
+localedir = $(datadir)/locale
+gnulocaledir = $(prefix)/share/locale
+gettextsrcdir = $(prefix)/share/gettext/po
+subdir = po
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
+
+CC = @CC@
+GENCAT = @GENCAT@
+GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
+MSGFMT = @MSGFMT@
+XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
+MSGMERGE = PATH=../src:$$PATH msgmerge
+
+DEFS = @DEFS@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+
+INCLUDES = -I.. -I$(top_srcdir)/intl
+
+COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
+
+SOURCES = cat-id-tbl.c
+POFILES = @POFILES@
+GMOFILES = @GMOFILES@
+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
+stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
+
+POTFILES = \
+
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+INSTOBJEXT = @INSTOBJEXT@
+
+.SUFFIXES:
+.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
+
+.c.o:
+	$(COMPILE) $<
+
+.po.pox:
+	$(MAKE) $(PACKAGE).pot
+	$(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
+
+.po.mo:
+	$(MSGFMT) -o $@ $<
+
+.po.gmo:
+	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
+	  && rm -f $$file && $(GMSGFMT) -o $$file $<
+
+.po.cat:
+	sed -f ../intl/po2msg.sed < $< > $*.msg \
+	  && rm -f $@ && $(GENCAT) $@ $*.msg
+
+
+all: all-@USE_NLS@
+
+all-yes: cat-id-tbl.c $(CATALOGS)
+all-no:
+
+$(srcdir)/$(PACKAGE).pot: $(POTFILES)
+	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
+	  --add-comments --keyword=_ --keyword=N_ \
+	  --files-from=$(srcdir)/POTFILES.in \
+	&& test ! -f $(PACKAGE).po \
+	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
+		&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
+
+$(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
+$(srcdir)/stamp-cat-id: $(PACKAGE).pot
+	rm -f cat-id-tbl.tmp
+	sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
+		| sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
+	if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
+	  rm cat-id-tbl.tmp; \
+	else \
+	  echo cat-id-tbl.c changed; \
+	  rm -f $(srcdir)/cat-id-tbl.c; \
+	  mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \
+	fi
+	cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
+
+
+install: install-exec install-data
+install-exec:
+install-data: install-data-@USE_NLS@
+install-data-no: all
+install-data-yes: all
+	if test -r "$(MKINSTALLDIRS)"; then \
+	  $(MKINSTALLDIRS) $(datadir); \
+	else \
+	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
+	fi
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  case "$$cat" in \
+	    *.gmo) destdir=$(gnulocaledir);; \
+	    *)     destdir=$(localedir);; \
+	  esac; \
+	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+	  dir=$$destdir/$$lang/LC_MESSAGES; \
+	  if test -r "$(MKINSTALLDIRS)"; then \
+	    $(MKINSTALLDIRS) $$dir; \
+	  else \
+	    $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
+	  fi; \
+	  if test -r $$cat; then \
+	    $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
+	    echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
+	  else \
+	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
+	    echo "installing $(srcdir)/$$cat as" \
+		 "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
+	  fi; \
+	  if test -r $$cat.m; then \
+	    $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+	    echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
+	  else \
+	    if test -r $(srcdir)/$$cat.m ; then \
+	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
+		$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+	      echo "installing $(srcdir)/$$cat as" \
+		   "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
+	    else \
+	      true; \
+	    fi; \
+	  fi; \
+	done
+	if test "$(PACKAGE)" = "gettext"; then \
+	  if test -r "$(MKINSTALLDIRS)"; then \
+	    $(MKINSTALLDIRS) $(gettextsrcdir); \
+	  else \
+	    $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
+	  fi; \
+	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
+			  $(gettextsrcdir)/Makefile.in.in; \
+	else \
+	  : ; \
+	fi
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall:
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+	done
+	rm -f $(gettextsrcdir)/po-Makefile.in.in
+
+check: all
+
+cat-id-tbl.o: ../intl/libgettext.h
+
+dvi info tags TAGS ID:
+
+mostlyclean:
+	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
+	rm -fr *.o
+
+clean: mostlyclean
+
+distclean: clean
+	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
+
+maintainer-clean: distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f $(GMOFILES)
+
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir: update-po $(DISTFILES)
+	dists="$(DISTFILES)"; \
+	for file in $$dists; do \
+	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
+	    || cp -p $(srcdir)/$$file $(distdir); \
+	done
+
+update-po: Makefile
+	$(MAKE) $(PACKAGE).pot
+	PATH=`pwd`/../src:$$PATH; \
+	cd $(srcdir); \
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+	  mv $$lang.po $$lang.old.po; \
+	  echo "$$lang:"; \
+	  if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \
+	    rm -f $$lang.old.po; \
+	  else \
+	    echo "msgmerge for $$cat failed!"; \
+	    rm -f $$lang.po; \
+	    mv $$lang.old.po $$lang.po; \
+	  fi; \
+	done
+
+POTFILES: POTFILES.in
+	( if test 'x$(srcdir)' != 'x.'; then \
+	    posrcprefix='$(top_srcdir)/'; \
+	  else \
+	    posrcprefix="../"; \
+	  fi; \
+	  rm -f $@-t $@ \
+	    && (sed -e '/^#/d' -e '/^[ 	]*$$/d' \
+		    -e "s@.*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in \
+		| sed -e '$$s/\\$$//') > $@-t \
+	    && chmod a-w $@-t \
+	    && mv $@-t $@ )
+
+Makefile: Makefile.in.in ../config.status POTFILES
+	cd .. \
+	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
+	       $(SHELL) ./config.status
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

po/POTFILES.in

@@ -0,0 +1,73 @@
+src/gui-gnome/channels-newdata.c
+src/gui-gnome/dialog-about.c
+src/gui-gnome/dialog-channels.c
+src/gui-gnome/dialog-connect.c
+src/gui-gnome/dialog-dcc.c
+src/gui-gnome/dialog-disconnect.c
+src/gui-gnome/dialog-irssibot.c
+src/gui-gnome/dialog-join.c
+src/gui-gnome/dialog-links.c
+src/gui-gnome/dialog-log.c
+src/gui-gnome/dialog-modes.c
+src/gui-gnome/dialog-notifylist.c
+src/gui-gnome/dialog-plugins.c
+src/gui-gnome/dialog-rawlog.c
+src/gui-gnome/dialog-status.c
+src/gui-gnome/dialog-textwidget.c
+src/gui-gnome/dialog-window.c
+src/gui-gnome/dialogs.c
+src/gui-gnome/gnome-specific.c
+src/gui-gnome/gtk-specific.c
+src/gui-gnome/gui-channels.c
+src/gui-gnome/gui-dcc.c
+src/gui-gnome/gui-depends.c
+src/gui-gnome/gui-event-invite.c
+src/gui-gnome/gui-event-list.c
+src/gui-gnome/gui-event-who.c
+src/gui-gnome/gui-event-whois.c
+src/gui-gnome/gui-events.c
+src/gui-gnome/gui-mainwindows.c
+src/gui-gnome/gui-menu-commands.c
+src/gui-gnome/gui-menus.c
+src/gui-gnome/gui-nicklist-popup.c
+src/gui-gnome/gui-nicklist.c
+src/gui-gnome/gui-printtext.c
+src/gui-gnome/gui-server.c
+src/gui-gnome/gui-statusbar.c
+src/gui-gnome/gui-windows.c
+src/gui-gnome/gui.c
+src/gui-gnome/irssi.c
+src/gui-gnome/itext.c
+src/gui-gnome/panel.c
+src/gui-gnome/setup-appearance.c
+src/gui-gnome/setup-bg.c
+src/gui-gnome/setup-colors.c
+src/gui-gnome/setup-completion.c
+src/gui-gnome/setup-dcc.c
+src/gui-gnome/setup-flood.c
+src/gui-gnome/setup-history.c
+src/gui-gnome/setup-ircnets.c
+src/gui-gnome/setup-ircproxy.c
+src/gui-gnome/setup-lists.c
+src/gui-gnome/setup-lookandfeel.c
+src/gui-gnome/setup-misc.c
+src/gui-gnome/setup-servers.c
+src/gui-gnome/setup-session.c
+src/gui-gnome/setup-themes.c
+src/gui-gnome/setup-txt.c
+src/gui-gnome/setup.c
+src/gui-gnome/snapshot.c
+src/gui-gnome/wordclick.c
+src/gui-text/channels-newdata.c
+src/gui-text/gui-channels.c
+src/gui-text/gui-entry.c
+src/gui-text/gui-mainwindows.c
+src/gui-text/gui-printtext.c
+src/gui-text/gui-readline.c
+src/gui-text/gui-statusbar-items.c
+src/gui-text/gui-statusbar.c
+src/gui-text/gui-textwidget.c
+src/gui-text/gui-windows.c
+src/gui-text/irssi.c
+src/gui-text/screen.c
+src/gui-text/setup.c