trans-coord/gnun/server/gnun ChangeLog GNUmakefile

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   08/09/23 09:14:35

Modified files:
        gnun/server/gnun: ChangeLog GNUmakefile 

Log message:
        ($(subst /po/,/,$(1).html)): Update the PO file with
        `msgmerge' unconditionally to handle the scenario when a
        translator commits a translation based on an old POT.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.102&r2=1.103
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.58&r2=1.59

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- ChangeLog   21 Aug 2008 21:00:41 -0000      1.102
+++ ChangeLog   23 Sep 2008 09:14:35 -0000      1.103
@@ -1,3 +1,9 @@
+2008-09-23  Yavor Doganov  <address@hidden>
+
+       * GNUmakefile ($(subst /po/,/,$(1).html)): Update the PO file with
+       `msgmerge' unconditionally to handle the scenario when a
+       translator commits a translation based on an old POT.
+
 2008-08-22  Yavor Doganov  <address@hidden>
 
        * README: Require Po4a 0.34.

Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- GNUmakefile 21 Aug 2008 18:45:22 -0000      1.58
+++ GNUmakefile 23 Sep 2008 09:14:35 -0000      1.59
@@ -485,6 +485,13 @@
 endif
        $$(addfile)
        PO=$(1).po ; $(check-po) || (touch $$$$PO ; exit 1)
+# If a translator commits a PO file based on an old version of the
+# POT, it is not msgmerge'd as `make' considers the corresponding
+# `$(1).po' target up-to-date.  As a result, the generated HTML
+# translations has English strings (but no fuzzy strings in the PO)
+# since there's no match between msgid/msgstr.  Invoke msgmerge
+# unconditionally to cope with that (valid) scenario.
+       $(MSGMERGE) --update $(1).po $(basename $(1)).pot
 # This is needed for only a few articles, but as it is harmless there
 # is no real need to determine them and run the command conditionally.
        $$(fixperm)