From: Bruno Haible Date: Tue, 8 Feb 2005 11:22:14 +0000 (+0000) Subject: Use LC_ALL=C to protect range expression against Estonian locale. X-Git-Tag: v0.14.2~84 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2a6212b1cdeb803c9ddd0e6a470224286b0e6255;p=thirdparty%2Fgettext.git Use LC_ALL=C to protect range expression against Estonian locale. --- diff --git a/ChangeLog b/ChangeLog index 6e408cd44..c57d51ab0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-02-07 Bruno Haible + + * config/config.libpath: Use LC_ALL=C to protect range expression + against Estonian locale. + 2005-02-07 Bruno Haible * config/ltmain.sh: Upgrade to libtool-1.5.12. diff --git a/config/config.libpath b/config/config.libpath index 2d7873b1b..1d9df8590 100755 --- a/config/config.libpath +++ b/config/config.libpath @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable at run time. # -# Copyright 1996-2004 Free Software Foundation, Inc. +# Copyright 1996-2005 Free Software Foundation, Inc. # Taken from GNU libtool, 2003 # Originally by Gordon Matzigkeit , 1996 # @@ -140,7 +140,7 @@ case $host_os in ;; esac -sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' < + + * autopoint.in: Use LC_ALL=C to protect range expression against + Estonian locale. + * gettextize.in: Likewise. + 2005-02-05 Bruno Haible * autopoint.in: Check the version number, instead of relying on cvs diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in index f7147e832..28c2c5ff1 100644 --- a/gettext-tools/misc/autopoint.in +++ b/gettext-tools/misc/autopoint.in @@ -261,7 +261,7 @@ fi # At least one of the two must be given. If both are given, they must agree. xver=`cat "$configure_in" | grep '^AM_GNU_GETTEXT_VERSION(' | sed -e 's/^AM_GNU_GETTEXT_VERSION(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q` if test -z "$xver" && test -f intl/VERSION; then - xver=`cat intl/VERSION | sed -n -e 's/^.*gettext-\([-+_.0-9A-Za-z]*\).*$/\1/p'` + xver=`cat intl/VERSION | LC_ALL=C sed -n -e 's/^.*gettext-\([-+_.0-9A-Za-z]*\).*$/\1/p'` fi if test -n "$xver"; then if test -n "$ver"; then diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in index aefba8867..376b675dc 100644 --- a/gettext-tools/misc/gettextize.in +++ b/gettext-tools/misc/gettextize.in @@ -627,8 +627,8 @@ for file in *; do Makevars.template) func_linkorcopy Makevars.template "$gettext_dir/po/Makevars.template" po/Makevars.template if test -f "$srcdir/po/Makevars"; then - sed -n -e 's/[ ]*\([A-Za-z0-9_]*\)[ ]*=.*/\1/p' < "$srcdir/po/Makevars" | LC_ALL=C sort > "$srcdir/po/Makevars.tmp1" - sed -n -e 's/[ ]*\([A-Za-z0-9_]*\)[ ]*=.*/\1/p' < "$srcdir/po/Makevars.template" | LC_ALL=C sort > "$srcdir/po/Makevars.tmp2" + LC_ALL=C sed -n -e 's/[ ]*\([A-Za-z0-9_]*\)[ ]*=.*/\1/p' < "$srcdir/po/Makevars" | LC_ALL=C sort > "$srcdir/po/Makevars.tmp1" + LC_ALL=C sed -n -e 's/[ ]*\([A-Za-z0-9_]*\)[ ]*=.*/\1/p' < "$srcdir/po/Makevars.template" | LC_ALL=C sort > "$srcdir/po/Makevars.tmp2" missingvars=`LC_ALL=C comm -13 "$srcdir/po/Makevars.tmp1" "$srcdir/po/Makevars.tmp2"` rm -f "$srcdir/po/Makevars.tmp1" "$srcdir/po/Makevars.tmp2" if test -n "$missingvars"; then diff --git a/gettext-tools/po/POTFILES.in b/gettext-tools/po/POTFILES.in index 165f48af8..567f4ceba 100644 --- a/gettext-tools/po/POTFILES.in +++ b/gettext-tools/po/POTFILES.in @@ -1,8 +1,8 @@ # List of files which contain translatable strings. -# Copyright (C) 1995, 1998, 2001-2004 Free Software Foundation, Inc. +# Copyright (C) 1995, 1998, 2001-2005 Free Software Foundation, Inc. # For updating this file, look at the result of: -# $ grep -l '[^A-Za-z_]_(' {lib,src}/*.[chly] +# $ LC_ALL=C grep -l '[^A-Za-z_]_(' {lib,src}/*.[chly] # Files from the compatibility library lib/argmatch.c diff --git a/gettext-tools/projects/ChangeLog b/gettext-tools/projects/ChangeLog index 02aea97af..fed21c7c8 100644 --- a/gettext-tools/projects/ChangeLog +++ b/gettext-tools/projects/ChangeLog @@ -1,3 +1,9 @@ +2005-02-07 Bruno Haible + + * KDE/trigger: Use LC_ALL=C to protect range expression against + Estonian locale. + * GNOME/trigger: Likewise. + 2004-05-22 Bruno Haible * TP/teams.html: Update. diff --git a/gettext-tools/projects/GNOME/trigger b/gettext-tools/projects/GNOME/trigger index e7a04feaf..d159230e5 100755 --- a/gettext-tools/projects/GNOME/trigger +++ b/gettext-tools/projects/GNOME/trigger @@ -1,5 +1,9 @@ #!/bin/sh # Test whether the current package is a GNOME package. + +# NLS nuisances: Letter ranges are different in the Estonian locale. +LC_ALL=C + while true; do configfiles= if test -f configure.in; then diff --git a/gettext-tools/projects/KDE/trigger b/gettext-tools/projects/KDE/trigger index 342645493..561a408bb 100755 --- a/gettext-tools/projects/KDE/trigger +++ b/gettext-tools/projects/KDE/trigger @@ -1,5 +1,9 @@ #!/bin/sh # Test whether the current package is a KDE package. + +# NLS nuisances: Letter ranges are different in the Estonian locale. +LC_ALL=C + while true; do configfiles= if test -f configure.in; then diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index 457faf44e..af51c49e8 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,8 @@ +2005-02-07 Bruno Haible + + * project-id: Use LC_ALL=C to protect range expression against + Estonian locale. + 2005-02-06 Bruno Haible Leave #: lines with unknown syntax alone instead of turning them into diff --git a/gettext-tools/src/project-id b/gettext-tools/src/project-id index 7b1c86fbd..95e5f9ffa 100755 --- a/gettext-tools/src/project-id +++ b/gettext-tools/src/project-id @@ -1,7 +1,7 @@ #!/bin/sh # Prints a package's identification PACKAGE VERSION or PACKAGE. # -# Copyright (C) 2001-2003 Free Software Foundation, Inc. +# Copyright (C) 2001-2003, 2005 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,6 +18,10 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. want_version="$1" + +# NLS nuisances: Letter ranges are different in the Estonian locale. +LC_ALL=C + while true; do if test -f configure; then package=`(grep '^PACKAGE_NAME=' configure; grep '^ *PACKAGE=' configure) | grep -v '=[ ]*$' | sed -e '1q' | sed -e 's/^[^=]*=//' | sed -e "s/^'//" -e "s/'$//"`