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

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       11/09/20 04:17:34

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

Log message:
        * GNUmakefile (PO4A-XHTMLFLAGS): Add --master-charset=utf-8.
        ($(template-dir)/po/whatsnew.proto, article-pot-rules)
        (article-rules): Don't generate and don't depend on .translinks.
        Use --home mode of `make-prototype'.
        * NEWS: Update, make recent entries more consistent with the rest text.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.203&r2=1.204
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.33&r2=1.34

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -b -r1.203 -r1.204
--- ChangeLog   19 Sep 2011 04:43:26 -0000      1.203
+++ ChangeLog   20 Sep 2011 04:17:33 -0000      1.204
@@ -1,3 +1,12 @@
+2011-09-20  Pavel Kharitonov  <address@hidden>
+
+       * GNUmakefile (PO4A-XHTMLFLAGS): Add --master-charset=utf-8.
+       ($(template-dir)/po/whatsnew.proto, article-pot-rules)
+       (article-rules): Don't generate and don't depend on .translinks.
+       Use --home mode of `make-prototype'.
+       * NEWS: Update, make recent entries more consistent
+       with the rest text.
+
 2011-09-19  Pavel Kharitonov  <address@hidden>
 
        * GNUmakefile (generate-translinks): Move add-file call

Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- GNUmakefile 19 Sep 2011 04:43:27 -0000      1.94
+++ GNUmakefile 20 Sep 2011 04:17:33 -0000      1.95
@@ -33,7 +33,8 @@
 PO4A-GETTEXTIZEFLAGS := -o porefs=none
 PO4A-TRANSLATEFLAGS := --keep=0
 
-PO4A-XHTMLFLAGS := --format=xhtml -o ontagerror=silent \
+PO4A-XHTMLFLAGS := --format=xhtml --master-charset=utf-8 \
+                   -o ontagerror=silent \
                    -o "attributes=<meta>content" \
                    -o "untranslated=W<gnun> W<script>" \
                    -o "translated=W<pre>"
@@ -440,9 +441,8 @@
 $(template-dir)/po/whatsnew.proto: $(template-dir)/whatsnew.html
        $(VALIDATESKIP) $(VALIDATE-HTML-NOTIFY) $(NOTIFYSKIP) $(web-addr) $<
        $(mail-error-proto) $(MAKE-PROTOTYPE) --input=$< \
-         --generic=generic.html --translinks=$(basename $@).translinks \
-         --output=$@ \
-         || ($(RM) $@ $(basename $@).translinks ; exit 1)
+         --generic=generic.html --home --output=$@ \
+         || ($(RM) $@ ; exit 1)
        $(SED) --in-place "s/\$$Date.*\$$/<gnun>\0<\/gnun>/g" $@
 
 # This target is present because the whatsnew.%.html target depends on
@@ -636,8 +636,6 @@
 
 ### Rules for all other articles ###
 define article-pot-rules
-# Note: .translinks files are regenerated
-# until the next revision of $(MAKE-PROTOTYPE) which won't deal with them.
 $(1).proto: $(subst /po/,/,$(1).html)
 # Skip the validation step if the article is in `no-validate-articles'.
 ifneq ($(1), $(findstring $(1),$(no-validate-articles)))
@@ -645,14 +643,11 @@
 endif
        $(call generate-translinks,$(1))
        $(call update-translinks-include,$(1)) 
-       $$(mail-error-proto) $(MAKE-PROTOTYPE) --input=$$< \
+       $$(mail-error-proto) $(MAKE-PROTOTYPE) --home --input=$$< \
          --generic=generic.html --output=$(1).proto \
-         --translinks=$(1).translinks \
-           || ($(RM) $(1).proto $(1).translinks ; exit 1)
+           || ($(RM) $(1).proto ; exit 1)
        $(SED) --in-place "s/\$$$$Date.*\$$$$/<gnun>\0<\/gnun>/g" $(1).proto
 
-$(1).translinks: $(1).proto
-
 $(1).pot: $(1).proto
        $$(addfile)
        $$(fixperm)
@@ -680,7 +675,7 @@
        $$(fixperm)
        $(call update-po,$$@,$$<)
 
-$(subst /po/,/,$(1).html): $(basename $(1)).proto $(basename $(1)).translinks \
+$(subst /po/,/,$(1).html): $(basename $(1)).proto \
                           $(1).po generic.$(2).html
 # If the server templates are missing, assume the worst and exit with
 # an error to prevent the generation of broken translations -- even if

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- NEWS        3 Sep 2011 04:45:27 -0000       1.33
+++ NEWS        20 Sep 2011 04:17:34 -0000      1.34
@@ -2,10 +2,18 @@
 
 * Changes in GNUnited Nations 0.5 (2011-??-??)
 
+** Links to translations are generated outside of `make-prototype'
+   based on presence of translations rather than copied from
+   the English file.  They are included via SSI rather than pasted
+   into the file.
+
+** UTF-8 encoding is assumed when processing the input files.
+   This permits using non-ASCII characters in English articles.
+
 ** New template file: outdated.html; its translations are
    automatically included in HTML files of outdated translations.
 
-** gnun-validate-html recognizes HTML5 pages and validates
+** `gnun-validate-html' recognizes HTML5 pages and validates
    them against a custom DTD; this should eliminate need
    for `no-validate-articles' variable.
 
@@ -38,8 +46,8 @@
     In older versions it was measured from the latest update
     of the POT file.
 
-*** Completeness of translations is determined via msgfmt --statistics
-    rather than grep "^#, fuzzy"; the latter let new English passages
+*** Completeness of translations is determined via `msgfmt --statistics'
+    rather than `grep "^#, fuzzy"'; the latter let new English passages
     penetrate into translations.
 
 *** `gnun-validate-html' once again properly supports nested
@@ -47,7 +55,7 @@
     and relative paths, with different quotes (CGI includes are
     still unsupported).
 
-*** `validate-html-notify' uses gnun-validate-html from $(bindir)
+*** `validate-html-notify' uses `gnun-validate-html' from $(bindir)
     rather than first found in $(PATH).
 
 * Changes in GNUnited Nations 0.4 (2009-11-11)