trans-coord-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Yavor Doganov
Subject: trans-coord/gnun/server/gnun ChangeLog GNUmakef...
Date: Thu, 30 Apr 2009 15:10:59 +0000

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   09/04/30 15:10:59

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

Log message:
        Avoid committing empty translations.
        * GNUmakefile ($(template-dir)/%.$(1).html)
        ($(template-dir)/whatsnew.%.include)
        ($(template-dir)/po/whatsnew.%.html, $(rootdir)/home.$(1).shtml)
        ($(subst /po/,/,$(1).html)): Call $(addfile) or equivalent after
        checking the PO file for validity.  Do not honor GRACE if the
        translation is new, but apparently is based on an outdated .pot.
        * NEWS: Update.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.143&r2=1.144
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/TODO?cvsroot=trans-coord&r1=1.29&r2=1.30

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -b -r1.143 -r1.144
--- ChangeLog   29 Apr 2009 14:51:10 -0000      1.143
+++ ChangeLog   30 Apr 2009 15:10:59 -0000      1.144
@@ -1,3 +1,14 @@
+2009-04-30  Yavor Doganov  <address@hidden>
+
+       Avoid committing empty translations.
+       * GNUmakefile ($(template-dir)/%.$(1).html)
+       ($(template-dir)/whatsnew.%.include)
+       ($(template-dir)/po/whatsnew.%.html, $(rootdir)/home.$(1).shtml)
+       ($(subst /po/,/,$(1).html)): Call $(addfile) or equivalent after
+       checking the PO file for validity.  Do not honor GRACE if the
+       translation is new, but apparently is based on an outdated .pot.
+       * NEWS: Update.
+
 2009-04-29  Yavor Doganov  <address@hidden>
 
        * m4/ax_compare_version.m4: Avoid AC_PROG_AWK macro-in-body

Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- GNUmakefile 17 Apr 2009 09:05:21 -0000      1.65
+++ GNUmakefile 30 Apr 2009 15:10:59 -0000      1.66
@@ -267,7 +267,6 @@
 
 $(template-dir)/%.$(1).html: $(template-dir)/%.html \
                             $(template-dir)/po/%.$(1).po
-       $$(addfile)
 # If the PO file is invalid and is not fixed within the next GNUN
 # build, touch the proper prerequisite to trigger another rebuild.
 # Otherwise, next time make doesn't execute the recipe as it considers
@@ -276,6 +275,7 @@
 # rendering them invalid.
        PO=$(template-dir)/po/$$(*F).$(1).po ; $(check-po) \
          || (touch $$$$PO ; exit 1)
+       $$(addfile)
        PO=$(template-dir)/po/$$(*F).$(1).po OUT=$$@ ; $(generate-html)
        $(SED) --in-place \
          ':egin;N;$$$$!begin;s/\([ \t]*\n[ \t]*\)\{3,\}<!--/\n\n<!--/g' $$@
@@ -326,12 +326,12 @@
 .PRECIOUS: $(template-dir)/whatsnew.%.include
 $(template-dir)/whatsnew.%.include: $(template-dir)/whatsnew.include \
                                    $(template-dir)/po/whatsnew.%.po
-       $(addfile)
        PO=$(template-dir)/po/whatsnew.$*.po ; \
          $(MAILFAIL) $(NOTIFYSKIP) $(transl-addr) \
          "[GNUN Error] $${PO#../../} is not a valid PO file" \
          $(VALIDATESKIP) $(MSGFMT) --check --verbose \
          --output-file=/dev/null $$PO || (touch $$PO ; exit 1)
+       $(addfile)
 # The <dd> element is not wrapped on purpose, for easy generation of
 # gnusflashes.LANG.include.
 # FIXME: Unfortunately, if the translator wraps the msgstr with M-q,
@@ -362,14 +362,14 @@
                                    $(template-dir)/po/whatsnew.%.po \
                                    $(template-dir)/whatsnew.%.include \
                                    generic.%.html
-       [ -f $(template-dir)/$(@F) ] \
-         || (touch $(template-dir)/$(@F) ; \
-            $(CVSSKIP) $(CVS) add $(template-dir)/$(@F))
        PO=$(template-dir)/po/whatsnew.$*.po ; $(MAILFAIL) \
          $(NOTIFYSKIP) $(transl-addr) \
          "[GNUN Error] $${PO#../../} is not a valid PO file" \
          $(VALIDATESKIP) $(MSGFMT) --check --verbose --output-file=/dev/null \
          $$PO || (touch $$PO ; exit 1)
+       [ -f $(template-dir)/$(@F) ] \
+         || (touch $(template-dir)/$(@F) ; \
+            $(CVSSKIP) $(CVS) add $(template-dir)/$(@F))
        PO=$(template-dir)/po/whatsnew.$*.po \
          OUT=$(template-dir)/po/whatsnew.$*.m4 ; $(PO4A_TRANSLATE) \
          $(PO4A-XHTMLFLAGS) $(PO4A-TRANSLATEFLAGS) --master $< \
@@ -421,11 +421,11 @@
 
 $(rootdir)/home.$(1).shtml: $(rootdir)/po/home.proto \
                            $(rootdir)/po/home.$(1).po generic.$(1).html
-       $$(addfile)
 # If $PO is not valid, then the generated page could be broken even
 # for the reader.  Ensure that the build still barfs next time if the
 # translator doesn't fix it quickly.
        PO=$(rootdir)/po/home.$(1).po ; $(check-po) || (touch $$$$PO ; exit 1)
+       $$(addfile)
        $$(fixperm)
        PO=$(rootdir)/po/home.$(1).po OUT=$(rootdir)/po/home.$(1).m4 ; \
          $(generate-html)
@@ -530,7 +530,10 @@
 # obsolete, so proceed as usual.  If there are fuzzy strings, compare
 # the POT-Creation-Date in the PO with the current value of the grace
 # period and invoke regeneration only if the grace period is over.
-       if ! $(GREP) --quiet "^#, fuzzy" $(1).po ; \
+# 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.
+       if ! $(GREP) --quiet "^#, fuzzy" $(1).po || ! test -s $$@; \
          then \
            ($(M4) $(1).m4 > $$@ ; $(validate-article)) ; \
          else \

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- NEWS        24 Feb 2009 20:50:35 -0000      1.8
+++ NEWS        30 Apr 2009 15:10:59 -0000      1.9
@@ -4,6 +4,22 @@
 
 ** GNU gettext >= 0.16 is required for `msgmerge --previous' support.
 
+** Bugs fixed in 0.3.
+
+*** Empty .LANG.html files are no longer committed.
+    In previous releases, an empty .LANG.html was committed when
+      1) The newly added .LANG.po does not pass PO validation, or
+      2) The translation was based on an old version of the .pot,
+         so msgmerge introduced "fuzzy" strings in the .LANG.po prior
+         to the generation of the HTML translation.
+
+    The behavior now is the following: 1) The build halts with an
+    error and a message is sent (if NOTIFY is enabled) while no .html
+    file is created; 2) The value of GRACE is ignored, so the
+    resulting .LANG.html contains English text.  This proved to be a
+    better alternative than an empty file which leads to 404, and may
+    remain unnoticed by the translator during the whole GRACE period.
+
 * Changes in GNUnited Nations 0.2 (2009-02-13)
 
 ** GNUmakefile.team supports Subversion repositories.

Index: TODO
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/TODO,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- TODO        28 Apr 2009 15:55:35 -0000      1.29
+++ TODO        30 Apr 2009 15:10:59 -0000      1.30
@@ -15,17 +15,6 @@
        <a href="http:/fsf.org....
    </dd>
 
-** Sometimes empty article.LANG.html is committed.
-   When a team commits a .po file, and it is invalid, an empty file is
-   added as .LANG.html.  Furthermore, when a team commits a legitimate
-   valid fully translated article.LANG.po (like why-gnu-linux.sr.po)
-   but it doesn't get built immediately (because of previous errors)
-   or because the original article.html changes after the translator's
-   commit and before the build, again an empty file is `cvs add'-ed
-   and committed, because GRACE is in effect.
-   This may not classify as a bug, but it would be nice to make it
-   more robust.
-
 ** Items are not in alphabetical order in articles like
    gnu/gnu-user-groups.LANG.html or
    philosophy/words-to-avoid.LANG.html.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]