trans-coord/gnun/server/gnun AUTHORS ChangeLog ...

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       11/08/28 09:37:10

Modified files:
        gnun/server/gnun: AUTHORS ChangeLog GNUmakefile NEWS THANKS 

Log message:
        Automatically mark outdated translations.
        
        * GNUmakefile (temlate-files): Add `outdated'.
        (mark-outdated): New function to insert notice in outdated
        translations.
        (home-rules), (article-rules): Invoke mark-outdated.
        (output-article-html): New procedure.
        (article-rules): Minor refactoring using output-article-html.
        * AUTHORS, NEWS, THANKS: Update.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/AUTHORS?cvsroot=trans-coord&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.193&r2=1.194
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.83&r2=1.84
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/THANKS?cvsroot=trans-coord&r1=1.7&r2=1.8

Patches:
Index: AUTHORS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/AUTHORS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AUTHORS     2 Nov 2008 18:50:21 -0000       1.1
+++ AUTHORS     28 Aug 2011 09:37:09 -0000      1.2
@@ -1,4 +1,15 @@
 Authors of GNUnited Nations.
 
-Yavor Doganov <address@hidden>
 Kaloian Doganov <address@hidden>
+Yavor Doganov <address@hidden> Original authors
+
+Pavel Kharitonov <address@hidden>
+
+    Add dtd/html5.dtd (based on W3C DTD).
+
+    Some changes in GNUmakefile and gnun-validate-html, dtd/README.
+
+    Tiny changes in validate-html-notify.in, Makefile.am, dtd/Makefile.am.
+
+Brett Smith <address@hidden>
+    "Distribution Terms" section in doc/web-trans.texi

Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -b -r1.193 -r1.194
--- ChangeLog   22 Aug 2011 14:45:03 -0000      1.193
+++ ChangeLog   28 Aug 2011 09:37:09 -0000      1.194
@@ -1,3 +1,18 @@
+2011-08-28  Pavel Kharitonov  <address@hidden>
+
+       Automatically mark outdated translations.
+       * GNUmakefile (temlate-files): Add `outdated'.
+       (mark-outdated): New function to insert notice in outdated
+       translations.
+       (home-rules), (article-rules): Invoke mark-outdated.
+       (output-article-html): New procedure.
+       (article-rules): Minor refactoring using output-article-html.
+       * AUTHORS, NEWS, THANKS: Update.
+
+2011-08-28  Pavel Kharitonov  <address@hidden> (tiny change)
+
+       * doc/web-trans.texi (Distribution Terms): fix double quotes.
+
 2011-08-22  Pavel Kharitonov  <address@hidden>
 
        * dtd/README: add terms and conditions for html5.dtd.

Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- GNUmakefile 15 Feb 2011 12:00:50 -0000      1.83
+++ GNUmakefile 28 Aug 2011 09:37:09 -0000      1.84
@@ -83,7 +83,8 @@
 template-files := head-include-2 \
                  body-include-1 \
                  body-include-2 \
-                 footer-text
+                 footer-text \
+                 outdated
 template-translated-base := $(addprefix $(template-dir)/,$(template-files))
 template-pots := $(addsuffix .pot, \
                   $(addprefix $(template-dir)/po/,$(template-files)))
@@ -173,6 +174,20 @@
   --master $$< --po $$$$PO --localized $$$$OUT
 endef
 
+# Add notice about the translation being out of date
+define mark-outdated
+  $(MSGFMT) --statistics -o /dev/null $$$$PO 2>&1 \
+    | ($(EGREP) '(fuzzy|untranslated)' > /dev/null \
+       && $(SED) --in-place \
+            "/^<!--#set var=\"PO_FILE\"/,+3d;\
+/^<!--#include virtual=\"\/server\/banner/a\
+<!--#set var=\"PO_FILE\"\n \
+    value='<a href=\"http://www.gnu.org$$$${PO#$(rootdir)}\">\n\
+           http://www.gnu.org$$$${PO#$(rootdir)}</a>' -->\n\
+<!--#include virtual=\"/server/outdated.$(2).html\" -->" $(1); \
+      ) || true
+endef
+
 # The command to check the validity of a PO file.
 define check-po
 $(MAILFAIL) $(NOTIFYSKIP) $(transl-addr) \
@@ -510,6 +525,7 @@
          "s/\(<!--#include file=\"gnusflashes*\)\(.include\" 
-->\)/\1.$(1)\2/g" \
          $(rootdir)/po/home.$(1).m4
        $(M4) $(rootdir)/po/home.$(1).m4 > $$@
+       PO=$(rootdir)/po/home.$(1).po; $(call mark-outdated,$$@,$(1))
        $(VALIDATESKIP) $(VALIDATE-HTML-NOTIFY) $(NOTIFYSKIP) $(transl-addr) \
          $$@ || (PO=$(rootdir)/po/home.$(1).po ; $$(touch-hook))
 endef
@@ -538,6 +554,13 @@
        $$(generate-pot)
 endef
 
+# Produce article HTML file, announce and validate it if needed
+define output-article-html
+$(M4) $(1).m4 > $$@ \
+$(if $(findstring $(basename $(1)),$(no-validate-articles)), , \
+  && $(announce) && $(validate-article))
+endef
+
 define article-rules
 $(1).po: $(basename $(1)).pot
        PO=$$@ ; $(check-po)
@@ -601,11 +624,7 @@
 # If GRACE is not defined, which is the usual case for local manual
 # builds, update the target and validate the result.
 ifndef GRACE
-       $(M4) $(1).m4 > $$@
-# Skip HTML validation if the article is in `no-validate-articles'.
-ifneq ($(basename $(1)), $(findstring $(basename 
$(1)),$(no-validate-articles)))
-       $(announce); $(validate-article)
-endif
+       $(output-article-html);
 # Check if the article is not in `no-grace-articles'.
 else ifneq ($(basename $(1)), \
            $(findstring $(basename $(1)),$(no-grace-articles)))
@@ -616,36 +635,24 @@
 # If the target is of zero size, it means that it was just touched by
 # $(addfile) -- GRACE is ignored in this case to avoid committing
 # empty files to the repository.
-ifneq ($(basename $(1)), $(findstring $(basename 
$(1)),$(no-validate-articles)))
        if ! $(GREP) --quiet "^#, fuzzy" $(1).po || ! test -s $$@; \
          then \
-           ($(M4) $(1).m4 > $$@; $(announce); $(validate-article)); \
+           $(output-article-html); \
          else \
          if [ "`date --date="$(GRACE) days ago" +%Y%m%d`" -ge \
               "`$(AWK) '/POT-Creation-Date/ { gsub(/-/, ""); print $$$$2 }' \
                 $(1).po`" ]; \
            then \
-             $(M4) $(1).m4 > $$@ && $(announce) && $(validate-article); \
+             $(output-article-html); \
            else \
              sleep 1; touch $(1).po; \
          fi; \
        fi
 else
-       if ! $(GREP) --quiet "^#, fuzzy" $(1).po || ! test -s $$@; \
-         then $(M4) $(1).m4 > $$@; else \
-         if [ "`date --date="$(GRACE) days ago" +%Y%m%d`" -ge \
-              "`$(AWK) '/POT-Creation-Date/ { gsub(/-/, ""); print $$$$2 }' \
-                $(1).po`" ]; \
-           then $(M4) $(1).m4 > $$@; \
-           else sleep 1; touch $(1).po; fi; fi
-endif
-else
        @echo 'Ignoring grace period for article "$(notdir $(basename $(1)))"'
-       $(M4) $(1).m4 > $$@
-ifneq ($(basename $(1)), $(findstring $(basename 
$(1)),$(no-validate-articles)))
-       $(announce); $(validate-article)
-endif
+       $(output-article-html);
 endif
+       PO=$(1).po; $(call mark-outdated,$$@,$(2))
 endef
 
 $(foreach base,$(ALL_BASE),$(eval $(call article-pot-rules,$(base))))

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- NEWS        21 Aug 2011 13:04:12 -0000      1.30
+++ NEWS        28 Aug 2011 09:37:09 -0000      1.31
@@ -2,6 +2,13 @@
 
 * Changes in GNUnited Nations 0.5 (2011-??-??)
 
+** New template file: outdated.html; its translations are
+   automatically included in HTML files of outdated translations.
+
+** gnun-validate-html recognizes HTML5 pages and validates
+   them against a custom DTD; this should eliminate need
+   for `no-validate-articles' variable.
+
 ** GNU Bzr is a supported VCS.
 
 ** New GNUmakefile.team targets: format, publish, clean.

Index: THANKS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/THANKS,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- THANKS      15 Feb 2011 12:00:50 -0000      1.7
+++ THANKS      28 Aug 2011 09:37:10 -0000      1.8
@@ -16,8 +16,6 @@
 +------------------+---------------------------+
 |Karl Berry        |               address@hidden|
 +------------------+---------------------------+
-|Pavel Kharitonov  |           address@hidden|
-+------------------+---------------------------+
 
 Local Variables:
 mode: text