[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
trans-coord/gnun/server/gnun ChangeLog GNUmakef...
From: |
Ineiev |
Subject: |
trans-coord/gnun/server/gnun ChangeLog GNUmakef... |
Date: |
Tue, 19 Nov 2019 05:06:02 -0500 (EST) |
CVSROOT: /sources/trans-coord
Module name: trans-coord
Changes by: Ineiev <ineiev> 19/11/19 05:06:02
Modified files:
gnun/server/gnun: ChangeLog GNUmakefile NEWS
Log message:
(merge-dir-po, merge-whole-dir): Take into account optional templates.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.477&r2=1.478
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.197&r2=1.198
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.141&r2=1.142
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.477
retrieving revision 1.478
diff -u -b -r1.477 -r1.478
--- ChangeLog 3 Jul 2019 17:37:25 -0000 1.477
+++ ChangeLog 19 Nov 2019 10:06:02 -0000 1.478
@@ -1,3 +1,9 @@
+2019-11-19 Pavel Kharitonov <address@hidden>
+
+ * GNUmakefile (merge-dir-po, merge-whole-dir): Take into account
+ optional templates.
+ * NEWS: Update.
+
2019-07-03 Pavel Kharitonov <address@hidden>
* GNUmakefile.team (cmp-POs): Ignore whole header msgstr.
Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -b -r1.197 -r1.198
--- GNUmakefile 28 May 2019 10:39:08 -0000 1.197
+++ GNUmakefile 19 Nov 2019 10:06:02 -0000 1.198
@@ -243,7 +243,9 @@
| $(MSGATTRIB) --no-fuzzy --translated \
| $(MSGCAT) --use-first --less-than=2 -o $(1).tmp $(1) -
$(MSGMERGE) --backup=none --update --previous -C $(2) \
- $(1).tmp $$(basename $$(basename $(1))).pot
+ $(1).tmp $$(if $$(wildcard $$(basename $$(basename $(1))).pot),\
+ $$(basename $$(basename $(1))).pot,\
+ $$(basename $$(basename $(1))).pot.opt)
$$(if $$(and $(WDIFF),$$(call find-language,$$(basename $$(notdir
$(2))),\
$(FUZZY_DIFF_LINGUAS))), \
$(ADD-FUZZY-DIFF) --in-place $(1).tmp,true)
@@ -274,13 +276,15 @@
DIR-LANGS := $(call list-langs,$(1))
merge-whole-dir-$(1): $(1)/pot \
$$(addsuffix .po,$$(addprefix $(1)/,$$(DIR-LANGS)))
-$(1)/pot: $(wildcard $(1)/*.pot)
- msgcat --use-first $$^ -o $$@
+$(1)/pot: $(wildcard $(1)/*.pot) $(wildcard $(1)/*.pot.opt)
+ for i in $(wildcard $(1)/*.pot.opt); do cp $$$$i $$$${i%.opt}; done
+ msgcat --use-first $$(patsubst %.opt,%,$$^) -o $$@
$(SED) --in-place \
'1s,https.*,files in $(patsubst $(rootdir)/%,%,$(1))/,; \
1,/^"Project-Id-Version:/ \
s,^\("Project-Id-Version:\).*,\1 $(patsubst $(rootdir)/%,%,$(1))/\\n",' \
$$@
+ for i in $(wildcard $(1)/*.pot.opt); do $(RM) $$$${i%.opt}; done
$$(foreach la,$$(DIR-LANGS),\
$$(eval $$(call la-po-rule,$$(la),$(1))))
endef
Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -b -r1.141 -r1.142
--- NEWS 3 Jul 2019 17:37:26 -0000 1.141
+++ NEWS 19 Nov 2019 10:06:02 -0000 1.142
@@ -2,6 +2,8 @@
* Changes in GNUnited Nations 1.0 (????-??-??)
+** Per-directory compendia include optional templates.
+
** gnun-link-diff takes into account CC BY links "localized" per
https://www.gnu.org/s/trans-coord/w/Distribution-Terms.html
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- trans-coord/gnun/server/gnun ChangeLog GNUmakef...,
Ineiev <=