* library/msgs/de.msg: German message catalog.

* library/msgs/en.msg: English message catalog.

* library/msgs/es.msg: Spanish message catalog.

* library/msgs/fr.msg: French message catalog.

* unix/Makefile.in:
* unix/configure.in:
* library/tk.tcl:
* library/clrpick.tcl:
* library/choosedir.tcl:
* library/console.tcl:
* library/msgbox.tcl:
* library/tkfbox.tcl:
* library/xmfbox.tcl:
* library/bgerror.tcl: Applied patches from Laurent Duperval to
provide localization of Tk dialogs. [RFE: 2671].

2 files changed, 29 insertions, 3 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 2c73faf..4978a1b 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,12 +5,13 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.46 2000/05/03 00:18:19 hobbs Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.47 2000/06/30 06:38:40 ericm Exp $
 
 # Current Tk version;  used in various names.
 
 TCLVERSION		= @TCL_VERSION@
 VERSION			= @TK_VERSION@
+LOCALES			= @LOCALES@
 
 #----------------------------------------------------------------
 # Things you can change to personalize the Makefile for your own
@@ -418,6 +419,21 @@ test: tktest
 	TK_LIBRARY=@TK_SRC_DIR@/library; export TK_LIBRARY; \
 	./tktest $(TOP_DIR)/tests/all.tcl -geometry +0+0 $(TCLTESTARGS)
 
+# Tests with different languages
+testlang: tktest
+	LD_LIBRARY_PATH=`pwd`:${TCL_BIN_DIR}:${LD_LIBRARY_PATH}; \
+	export LD_LIBRARY_PATH; \
+	LIBPATH=`pwd`:${TCL_BIN_DIR}:${LIBPATH}; export LIBPATH; \
+	SHLIB_PATH=`pwd`:${TCL_BIN_DIR}:${SHLIB_PATH}; \
+	export SHLIB_PATH; \
+	TCL_LIBRARY=@TCL_SRC_DIR@/library; export TCL_LIBRARY; \
+	TK_LIBRARY=@TK_SRC_DIR@/library; export TK_LIBRARY; \
+	for lang in $(LOCALES) ;  \
+	do \
+	LANG=$(lang); export LANG; \
+	./tktest $(TOP_DIR)/tests/all.tcl -geometry +0+0 $(TCLTESTARGS); \
+	done
+
 # Useful target to launch a built tktest with the proper path,...
 runtest: tktest
 	LD_LIBRARY_PATH=`pwd`:${TCL_BIN_DIR}:${LD_LIBRARY_PATH}; \
@@ -471,7 +487,8 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
 
 install-libraries:
 	@for i in $(INCLUDE_INSTALL_DIR) \
-		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
+		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images \
+		$(SCRIPT_INSTALL_DIR)/msgs; \
 	    do \
 	    if [ ! -d $$i ] ; then \
 		echo "Making directory $$i"; \
@@ -501,6 +518,13 @@ install-libraries:
 		$(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/images; \
 	    fi; \
 	    done;
+	@echo "Installing translation directory";
+	@for i in $(SRC_DIR)/library/msgs/*.msg; \
+	    do \
+	    if [ -f $$i ] ; then \
+		$(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/msgs; \
+	    fi; \
+	    done;
 
 install-demos:
 	@for i in $(SCRIPT_INSTALL_DIR) \
diff --git a/unix/configure.in b/unix/configure.in
index e0d1848..7632343 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,13 +3,14 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tk installation
 dnl	to configure the system for the local environment.
 AC_INIT(../generic/tk.h)
-# RCS: @(#) $Id: configure.in,v 1.50 2000/05/03 00:18:37 hobbs Exp $
+# RCS: @(#) $Id: configure.in,v 1.51 2000/06/30 06:38:40 ericm Exp $
 
 TK_VERSION=8.4
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=4
 TK_PATCH_LEVEL="a1"
 VERSION=${TK_VERSION}
+LOCALES=de en es fr
 
 if test "${prefix}" = "NONE"; then
     prefix=/usr/local
@@ -455,5 +456,6 @@ AC_SUBST(TK_VERSION)
 AC_SUBST(XINCLUDES)
 AC_SUBST(XLIBSW)
 AC_SUBST(TK_SHARED_BUILD)
+AC_SUBST(LOCALES)
 
 AC_OUTPUT(Makefile tkConfig.sh)