trans-coord/gnun/server/gnun ChangeLog NEWS THA...

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       12/04/26 08:51:04

Modified files:
        gnun/server/gnun: ChangeLog NEWS THANKS gnun-validate-html 

Log message:
        Update.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.265&r2=1.266
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/THANKS?cvsroot=trans-coord&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/gnun-validate-html?cvsroot=trans-coord&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -b -r1.265 -r1.266
--- ChangeLog   23 Apr 2012 04:54:32 -0000      1.265
+++ ChangeLog   26 Apr 2012 08:51:00 -0000      1.266
@@ -1,3 +1,36 @@
+2012-04-26  Pavel Kharitonov  <address@hidden>
+
+       * gnun-validate-html.in: Fail when some SSI files are missing.
+       (TMP3): New variable.
+       * NEWS:
+       * THANKS: Update.
+
+2012-04-24  Pavel Kharitonov  <address@hidden>
+
+       Report outdated articles by priority; improve merging team
+       files with `www' working copy.
+
+       * GNUmakefile (report): Use `priorities.mk' to sort reported
+       translations by priority.
+       * GNUmakefile.team (report): Likewise.
+       * GNUmakefile (reports-summary): Adjust to new `report' output.
+       * GNUmakefile.team (sync): Don't merge PO file when it is
+       identical to the `www' version; use `www' version as a possible
+       source for missing translations.
+       * GNUmakefile (report-pos): New function.
+       * GNUmakefile.team (report-pos): Likewise.
+       * GNUmakefile (TEAM-POS, priority-articles-pos, other-pos)
+       (important-articles-pos, important-dir-pos): New variables.
+       * GNUmakefile.team (priority-articles-pos, other-pos)
+       (important-articles-pos, important-dir-pos): Likewise.
+       * Makefile.am (dist_example_DATA): Add `priorities.mk'.
+       * priorities.mk: New file.
+       * doc/gnun.texi (report, Invoking GNUN, PO Files and Team):
+       Update.
+       * doc/web-trans.texi (Priorities): Likewise.
+       * AUTHORS: Likewise.
+       * NEWS: Likewise.
+
 2012-04-23  Pavel Kharitonov  <address@hidden>
 
        * GNUmakefile (generate-pot): Pre-fill some fields of generated

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- NEWS        24 Apr 2012 06:01:44 -0000      1.50
+++ NEWS        26 Apr 2012 08:51:03 -0000      1.51
@@ -23,6 +23,9 @@
 *** When the title didn't fit into single line, it weren't extracted
     correctly for announcements.
 
+*** `gnun-validate-html' didn't report failure when some SSI files
+    were missing.
+
 * Changes in GNUnited Nations 0.5 (2012-01-30)
 
 ** Multivews support.

Index: THANKS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/THANKS,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- THANKS      25 Mar 2012 05:19:13 -0000      1.13
+++ THANKS      26 Apr 2012 08:51:04 -0000      1.14
@@ -6,6 +6,8 @@
 +------------------+---------------------------+
 |Andrea Pescetti   |           address@hidden|
 +------------------+---------------------------+
+|Chang-hun Song    |             address@hidden|
++------------------+---------------------------+
 |Denis Barbier     |           address@hidden|
 +------------------+---------------------------+
 |Dominik Smatana   |             address@hidden|
@@ -24,6 +26,8 @@
 +------------------+---------------------------+
 |Karl Berry        |               address@hidden|
 +------------------+---------------------------+
+|NIIBE Yutaka      |            address@hidden|
++------------------+---------------------------+
 |Rafael Beraldo    |    address@hidden|
 +------------------+---------------------------+
 |Richard Stallman  |                address@hidden|

Index: gnun-validate-html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/gnun-validate-html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gnun-validate-html  21 Oct 2011 11:46:06 -0000      1.13
+++ gnun-validate-html  26 Apr 2012 08:51:04 -0000      1.14
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 
 # This file is part of GNUnited Nations.
 
@@ -19,8 +19,8 @@
 
 function version () {
 cat <<EOF
-gnun-validate-html (GNUnited Nations) 0.4
-Copyright (C) 2011 Free Software Foundation, Inc.
+gnun-validate-html (GNUnited Nations) 0.5
+Copyright (C) 2012 Free Software Foundation, Inc.
 You may redistribute copies of GNUnited Nations
 under the terms of the GNU General Public License.
 For more information about these matters, see the file named COPYING.
@@ -32,6 +32,7 @@
 Usage: gnun-validate-html OPTION... FILE
 
 Options:
+      --expand-to=FILE       Specify file to output expanded HTML
       --root=DIRECTORY       Specify top directory for working copy
       --version              Display version info and exit
       --help                 Display this help and exit
@@ -47,8 +48,9 @@
 
 params=$#
 ROOT=../..
+OUTPUT=
 
-while [ ${params} -gt 1 ]; do
+while [ ${params} -ge 1 ]; do
   case "$1" in
       --help )
          usage
@@ -66,6 +68,14 @@
       --root=* )
          ROOT="${1#--root=}"
          ;;
+      --expand-to )
+         shift
+         params=$((${params}-1))
+         OUTPUT="$1"
+         ;;
+      --expand-to=* )
+         OUTPUT="${1#--expand-to=}"
+         ;;
       * )
           break
          ;;
@@ -89,15 +99,23 @@
 # Create two tempfiles and mark them for deletion on exit.
 TMP1=`mktemp -t gnun.1.XXXXXX`
 TMP2=`mktemp -t gnun.2.XXXXXX`
-trap "rm -f $TMP1 $TMP2" EXIT
+TMP3=`mktemp -t gnun.3.XXXXXX`
+trap "rm -f $TMP1 $TMP2 $TMP3" EXIT
+
+# Use $TMP1 if no $OUTPUT is specified.
+OUTPUT="${OUTPUT:-${TMP1}}"
 
 # Expand input file's #include directives and save the result in
 # $TMP1.
 cat > $TMP2 <<"EOF"
 # Limitations: CGI includes would be expanded in a wrong way
 BEGIN {
+  exit_val = 0
   relative_dir_name = ARGV[1];
+  if (relative_dir_name ~ /\//)
   sub (/[^\/]*$/, "", relative_dir_name);
+  else
+    relative_dir_name="./"
   sub (/\/*$/, "/", relative_dir_name);
 }
 
@@ -131,8 +149,10 @@
         name = relative_dir_name name;
 
       # Invoke the script recursively
-      system ("gawk -v script_name='" script_name "' -v root='" \
-               root "' -f '" script_name "' " name);
+      val = system ("gawk -v script_name='" script_name "' -v root='" \
+                    root "' -f '" script_name "' " name)
+      if (!exit_val)
+        exit_val = val
 
       # Output the part remaining after the include directive
       print (substr (names[i], m + 3));
@@ -141,15 +161,22 @@
 }
 
 { print; }
+
+END { exit exit_val }
 EOF
 
-gawk -v script_name=$TMP2 -v root="$ROOT" -f $TMP2 $1 > $TMP1
+if ! gawk -v script_name=$TMP2 -v root="${ROOT}" -f $TMP2 $1 > "${OUTPUT}" \
+    2> $TMP3; then
+  echo Failed to expand SSIs:
+  cat $TMP3 
+  exit 1
+fi
 
 if gawk '
   # Check whether we are validating HTML5 or some other flavor of HTML
   /<!DOCTYPE/ {
      exit $0 ~ /<!DOCTYPE[ \t\f\n\r\v]+html[ \t\f\n\r\v]*>/;
-  }' $TMP1;
+  }' "${OUTPUT}";
 then
   # Use our old procedure
   VALIDATE=--valid
@@ -166,14 +193,14 @@
           vex = 1;
         }
     }
-    { print; }' $TMP1 > $TMP2
-  mv $TMP2 $TMP1
+    { print; }' "${OUTPUT}" > $TMP2
+  mv $TMP2 "${OUTPUT}"
   VALIDATE="--dtdvalid $DTD/html5.dtd"
 fi
 
-# Execute xmllint on $TMP1 and save its output to $TMP2.
+# Execute xmllint on $OUTPUT and save its output to $TMP2.
 set +e
-xmllint --path "$DTD" $VALIDATE --nonet --noout $TMP1 2> $TMP2
+xmllint --path "$DTD" $VALIDATE --nonet --noout "${OUTPUT}" 2> $TMP2
 LINTSTATUS=$?
 set -e
 
@@ -186,7 +213,7 @@
 sed '
   /line [[:digit:]]\+/ {
      p
-     s=^.*line \([[:digit:]]\+\).*$=head -n \1 '"$TMP1"' | tail -n 1=
+     s=^.*line \([[:digit:]]\+\).*$=head -n \1 '"${OUTPUT}"' | tail -n 1=
      e
   }' $TMP2