[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
trans-coord/gnun/server/gnun ChangeLog GNUmakef...
From: |
Pavel Kharitonov |
Subject: |
trans-coord/gnun/server/gnun ChangeLog GNUmakef... |
Date: |
Fri, 21 Aug 2015 16:03:02 +0000 |
CVSROOT: /sources/trans-coord
Module name: trans-coord
Changes by: Pavel Kharitonov <ineiev> 15/08/21 16:03:02
Modified files:
gnun/server/gnun: ChangeLog GNUmakefile NEWS gnun-report.in
Log message:
* gnun-report.in: Fix the case when old POT without a HTML is present.
Reported by Thérèse Godefroy.
* GNUmakefile (article-rules): Don't break the build when a PO
for a language absent in TEMPLATE_LINGUAS is found; ignore it instead.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.433&r2=1.434
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.186&r2=1.187
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.113&r2=1.114
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/gnun-report.in?cvsroot=trans-coord&r1=1.10&r2=1.11
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.433
retrieving revision 1.434
diff -u -b -r1.433 -r1.434
--- ChangeLog 20 May 2015 14:36:01 -0000 1.433
+++ ChangeLog 21 Aug 2015 16:03:01 -0000 1.434
@@ -1,3 +1,11 @@
+2015-08-21 Pavel Kharitonov <address@hidden>
+
+ * gnun-report.in: Fix the case when old POT without a HTML
+ is present. Reported by Thérèse Godefroy.
+ * GNUmakefile (article-rules): Don't break the build when
+ a PO for a language absent in TEMPLATE_LINGUAS is found;
+ ignore it instead.
+
2015-05-20 Pavel Kharitonov <address@hidden>
* doc/web-trans.texi (Distribution Terms): Prepare migration
Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -b -r1.186 -r1.187
--- GNUmakefile 20 May 2015 14:36:01 -0000 1.186
+++ GNUmakefile 21 Aug 2015 16:03:01 -0000 1.187
@@ -1,5 +1,5 @@
# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013,
-# 2014 Free Software Foundation, Inc.
+# 2014, 2015 Free Software Foundation, Inc.
# This file is part of GNUnited Nations.
@@ -856,18 +856,11 @@
$(call update-po,$$@,$$<,$(2))
$(subst /po/,/,$(1).html): $(basename $(1)).proto $(1).po${po-suffix}
-# If the server templates are missing, assume the worst and exit with
-# an error to prevent the generation of broken translations.
+# If the server templates are missing, skip the generation
+# of broken translations.
ifeq (,$(call find-language,$(2),$(TEMPLATE_LINGUAS)))
-ifndef NOTIFYSKIP
- echo 'The "$(2)" language code is not defined in TEMPLATE_LINGUAS.' \
- | $(MAIL) $(transl-addr) -s \
- "[GNUN Error] Could not build $$(subst $$(rootdir)/,,$$@)"
+ @echo 'Note: the "$(2)" language code is not defined in
TEMPLATE_LINGUAS.'
else
- @echo 'The "$(2)" language code is not defined in TEMPLATE_LINGUAS.'
-endif
- exit 1
-endif
$(call update-po,$(1).po${po-suffix},$(basename $(1)).pot,$(2))
-$(RM) address@hidden
# If GRACE is not defined, which is the usual case for local manual
@@ -924,6 +917,7 @@
| $(EGREP) -v '[$$$$]Date:' | wc -c`" -eq 0 \
|| cp $(subst /po/,/,$(1:.$(2)=).html) $(1)-en.html)
endif
+endif # !eq (,$(call find-language,$(2),$(TEMPLATE_LINGUAS)))
endef
$(foreach base,$(ALL_BASE),$(eval $(call article-pot-rules,$(base))))
Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- NEWS 13 Mar 2015 18:02:47 -0000 1.113
+++ NEWS 21 Aug 2015 16:03:01 -0000 1.114
@@ -5,6 +5,9 @@
** `gnun-validate-html' supports groups of regular expressions
as Apache variables when expanding SSI (when gawk is used).
+** GNUmakefile doesn't break builds when encounters a PO for
+ a language absent in TEMPLATE_LINGUAS; such POs are ignored.
+
** GNUmakefile.team is made more suitable for parallel builds;
** In GNUmakefile.team, the `update' was split into
Index: gnun-report.in
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/gnun-report.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gnun-report.in 16 Jul 2014 15:29:59 -0000 1.10
+++ gnun-report.in 21 Aug 2015 16:03:02 -0000 1.11
@@ -1,6 +1,6 @@
#! @BASH@
-# Copyright (C) 2013, 2014 Free Software Foundation, Inc.
+# Copyright (C) 2013, 2014, 2015 Free Software Foundation, Inc.
# This file is part of GNUnited Nations.
@@ -20,7 +20,7 @@
function version () {
cat <<EOF
gnun-report (@PACKAGE_NAME@) @PACKAGE_VERSION@
-Copyright (C) 2014 Free Software Foundation, Inc.
+Copyright (C) 2015 Free Software Foundation, Inc.
You may redistribute copies of @PACKAGE_NAME@
under the terms of the GNU General Public License.
For more information about these matters, see the file named COPYING.
@@ -67,7 +67,7 @@
size="n/a"
test -f ${html} && size=`cat ${html} | wc -c`
first_entries='<td>'"${url}"'</td><td>'"${size}"'</td>'
- if ! test -f ${html}; then
+ if test -f ${tran} && ! test -f ${html}; then
echo '<tr class="trans-orphan">'$first_entries
echo '<td><a href="'$tran_url'">No original HTML</a></td></tr>'
return
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- trans-coord/gnun/server/gnun ChangeLog GNUmakef...,
Pavel Kharitonov <=