trans-coord/gnun/server/gnun gnun-report.in Cha...

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       14/07/07 08:22:04

Modified files:
        gnun/server/gnun: gnun-report.in ChangeLog 

Log message:
        Further fix option parser; support optional templates.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/gnun-report.in?cvsroot=trans-coord&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.421&r2=1.422

Patches:
Index: gnun-report.in
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/gnun-report.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gnun-report.in      17 Jun 2014 15:12:17 -0000      1.7
+++ gnun-report.in      7 Jul 2014 08:22:03 -0000       1.8
@@ -56,8 +56,10 @@
 function report_file () {
   html=$1.html
   url='<a href="'"$root_url$html"'">'"$html"'</a>'
-  pot=$(echo "$1" | @SED@ 's|\(.*\)/|\1/po/|; \|/po/|!s|^|po/|').pot
-  po=${pot%pot}${team}.po
+  base=$(echo "$1" | @SED@ 's|\(.*\)/|\1/po/|; \|/po/|!s|^|po/|')
+  po=${base}.${team}.po
+  pot=$base.pot
+  test -f "$pot" || pot="$pot.opt"
   tran=$1.${team}.html
   pot_url="$root_url$pot"
   po_url="$root_url$po"
@@ -234,7 +236,7 @@
   shift
 done
 
-if test "x$root" != x; then
+if test "x$ROOT" != x; then
   root="$ROOT"
   case "$root" in
     -* ) root="./$root" ;;
@@ -317,21 +319,41 @@
 important_directories=`get_var /important-directories/`
 
 other_to_translate=$(
-for dir in $important_directories; do
+{
+  for dir in $important_directories; do
   find $dir -name \*.pot -path \*/po/\* | while read pot; do
     base=${pot%.pot}; base=${base/\/po\//\/}
     echo " "$important_files $priority_files" " \
       | @GREP@ -q -F " $base " || echo $base
   done
-done | sort
+  done
+  for dir in $important_directories; do
+    find $dir -name \*.pot.opt -path \*/po/\* | while read pot; do
+      base=${pot%.pot.opt};
+      test -f $base.$team.po || continue
+      base=${base/\/po\//\/}
+      echo " "$important_files $priority_files" " \
+        | @GREP@ -q -F " $base " || echo $base
+    done
+  done
+} | sort
 )
 
 other_files=$(
-find . -name \*.pot -path \*/po/\* | sort | while read pot; do
+{
+  find . -name \*.pot -path \*/po/\* | while read pot; do
   pot=${pot#./}; base=${pot%.pot}; base=${base#po/}; base=${base/\/po\//\/}
   echo " "$other_to_translate $important_files $priority_files" " \
     | @GREP@ -q -F " $base " || echo $base
-done | sort
+  done
+  find . -name \*.pot.opt -path \*/po/\* | while read pot; do
+    pot=${pot#./}; base=${pot%.pot.opt};
+    test -f $base.$team.po || continue
+    base=${base#po/}; base=${base/\/po\//\/}
+    echo " "$other_to_translate $important_files $priority_files" " \
+      | @GREP@ -q -F " $base " || echo $base
+  done;
+} | sort
 )
 
 # Compile a table against every list.

Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -b -r1.421 -r1.422
--- ChangeLog   29 Jun 2014 09:03:23 -0000      1.421
+++ ChangeLog   7 Jul 2014 08:22:03 -0000       1.422
@@ -1,3 +1,8 @@
+2014-07-07  Pavel Kharitonov  <address@hidden>
+
+       * gnun-report.in: Further fix option parser; support
+       optional templates.
+
 2014-06-29  Pavel Kharitonov  <address@hidden>
 
        * doc/web-trans.texi (Introduction): Add a reference to