From c732eb584ec0b3dc2e4ab01e5b7276a701a2d523 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 9 Aug 2006 18:30:16 +0000
Subject: [PATCH] * bootstrap: Don't exclude ja.po; it is working again. Don't
 remove all old .po files if we're merely updating one. * po/.cvsignore: Add
 Makevars.

---
 ChangeLog     |  6 ++++++
 bootstrap     | 14 +++++++-------
 po/.cvsignore |  1 +
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 445dfa1..dd17a3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* bootstrap: Don't exclude ja.po; it is working again.
+	Don't remove all old .po files if we're merely updating one.
+	* po/.cvsignore: Add Makevars.
+
 2006-08-07  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* src/tar.c: Work around limitation imposed by gettext 0.15
diff --git a/bootstrap b/bootstrap
index b54810c..a08742e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -109,7 +109,10 @@ get_translations() {
   po_file=$3
 
   echo "$0: getting translations into $subdir for $domain..."
-  (cd $subdir && rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po/p'`) &&
+
+  case $po_file in
+  '') (cd $subdir && rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po/p'`);;
+  esac &&
 
   $WGET_COMMAND -O "$subdir/$domain.html" "$TP_URL$domain" &&
 
@@ -123,11 +126,11 @@ get_translations() {
   awk -v domain="$domain" -v po_file="$po_file" -v subdir="$subdir" '
     {
       lang = $1
-      if (po_file == (lang ".po")) next
+      if (po_file && po_file != (lang ".po")) next
 
       # Work around bugs in translations uncovered by gettext 0.15.
       # This workaround can be removed once the translations are fixed.
-      if (lang == "hu" || lang == "ja" || lang == "ky" || lang == "zh_TW") next
+      if (lang == "hu" || lang == "ky" || lang == "zh_TW") next
 
       ver = $2
       urlfmt = ""
@@ -146,10 +149,7 @@ update_po() {
     *.po)  POFILE=$1;;
     *)     POFILE=${1}.po;;
     esac
-    get_translations po $package "$POFILE" &&
-    LANG=`expr $POFILE : '\(.*\)\.po'` &&
-    { grep -q $LANG po/LINGUAS ||
-        (echo $LANG; cat po/LINGUAS) | sort -o po/LINGUAS; }
+    get_translations po $package "$POFILE"
   else
     get_translations po $package
   fi
diff --git a/po/.cvsignore b/po/.cvsignore
index 534c98a..21f2546 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -2,6 +2,7 @@ index.html
 *.po
 LINGUAS
 Makefile.in.in
+Makevars
 Makevars.template
 Rules-quot
 boldquot.sed
-- 
2.44.0