[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
trans-coord/gnun/server/gnun GNUmakefile ChangeLog
From: |
Pavel Kharitonov |
Subject: |
trans-coord/gnun/server/gnun GNUmakefile ChangeLog |
Date: |
Tue, 02 Oct 2012 11:48:05 +0000 |
CVSROOT: /sources/trans-coord
Module name: trans-coord
Changes by: Pavel Kharitonov <ineiev> 12/10/02 11:48:05
Modified files:
gnun/server/gnun: GNUmakefile ChangeLog
Log message:
Fix a bug in optional templates (`generate-html' assummed *.pot
rather than *.pot.opt POT file). Reported by Joerg Kohne.
* GNUmakefile (generate-html): Add another argument.
(optional-template-lang-rules): Pass the name of POT
to `generate-html'.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.139&r2=1.140
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.295&r2=1.296
Patches:
Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -b -r1.139 -r1.140
--- GNUmakefile 28 Sep 2012 10:27:59 -0000 1.139
+++ GNUmakefile 2 Oct 2012 11:48:04 -0000 1.140
@@ -460,7 +460,7 @@
# The command to generate the translated article $(3) in language $(1)
# in HTML format from a PO file $(2). The result is further manipulated
-# in the recipes.
+# in the recipes. $(4) when supplied is the name of the POT.
#
# 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
@@ -469,7 +469,7 @@
# since there's no match between msgid/msgstr. Invoke update-po
# unconditionally to cope with that (valid) scenario.
define generate-html
-$(call update-po,$(2),$(2:.$(1).po=.pot),$(1)); \
+$(call update-po,$(2),$(if $(4),$(4),$(2:.$(1).po=.pot)),$(1)); \
$(PO4A_TRANSLATE) $(PO4A-XHTMLFLAGS) $(PO4A-TRANSLATEFLAGS) \
--master $$< --po $(2) --localized $(3); \
$(call insert-ssi-vars,$(3)); \
@@ -814,7 +814,7 @@
$(subst /po/,/,$(1)).$(2).html: $(subst /po/,/,$(1)).html \
$(1).$(2).po
PO=$(1).$(2).po ; $(check-po) || (touch $$$$PO ; exit 1)
- $(call generate-html,$(2),$(1).$(2).po,$$@)
+ $(call generate-html,$(2),$(1).$(2).po,$$@,$(1).pot.opt)
$(SED) --in-place \
':egin;N;$$$$!begin;s/\([ \t]*\n[ \t]*\)\{3,\}<!--/\n\n<!--/g' $$@
endif #eq ($(wildcard $(1).$(2).po),)
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -b -r1.295 -r1.296
--- ChangeLog 29 Sep 2012 05:42:19 -0000 1.295
+++ ChangeLog 2 Oct 2012 11:48:05 -0000 1.296
@@ -1,3 +1,13 @@
+2012-10-02 Pavel Kharitonov <address@hidden>
+
+ Fix a bug in optional templates (`generate-html'
+ assummed *.pot rather than *.pot.opt POT file).
+ Reported by Joerg Kohne.
+
+ * GNUmakefile (generate-html): Add another argument.
+ (optional-template-lang-rules): Pass the name of POT
+ to `generate-html'.
+
2012-09-29 Pavel Kharitonov <address@hidden>
* doc/web-trans.texi (New Team): Update (move the step
- trans-coord/gnun/server/gnun GNUmakefile ChangeLog,
Pavel Kharitonov <=