[Top][All Lists]
[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: |
Thu, 13 Sep 2012 07:40:45 +0000 |
CVSROOT: /sources/trans-coord
Module name: trans-coord
Changes by: Pavel Kharitonov <ineiev> 12/09/13 07:40:45
Modified files:
gnun/server/gnun: ChangeLog GNUmakefile GNUmakefile.team NEWS
gnun/server/gnun/doc: gnun.texi
Log message:
* GNUmakefile (update-po-status, report-pos, reports-summary):
Take into account that the name of the file may contain
`fuzzy' or `untranslated'.
* GNUmakefile.team (report-pos): Likewise.
* GNUmakefile (TEAM-HTMLS, priority-articles-htmls)
(important-articles-htmls, important-dir-htmls, other-htmls):
New variables.
(report-pos, report, reports-summary): Report translations
that should be converted to PO files.
* doc/gnun.texi (report):
* NEWS: Update.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.288&r2=1.289
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.135&r2=1.136
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile.team?cvsroot=trans-coord&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/doc/gnun.texi?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.288
retrieving revision 1.289
diff -u -b -r1.288 -r1.289
--- ChangeLog 10 Aug 2012 14:41:10 -0000 1.288
+++ ChangeLog 13 Sep 2012 07:40:44 -0000 1.289
@@ -1,3 +1,17 @@
+2012-09-13 Pavel Kharitonov <address@hidden>
+
+ * GNUmakefile (update-po-status, report-pos, reports-summary):
+ Take into account that the name of the file may contain
+ `fuzzy' or `untranslated'.
+ * GNUmakefile.team (report-pos): Likewise.
+ * GNUmakefile (TEAM-HTMLS, priority-articles-htmls)
+ (important-articles-htmls, important-dir-htmls, other-htmls):
+ New variables.
+ (report-pos, report, reports-summary): Report translations
+ that should be converted to PO files.
+ * doc/gnun.texi (report):
+ * NEWS: Update.
+
2012-08-10 Pavel Kharitonov <address@hidden>
* GNUmakefile (mark-outdated): Output date from
Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -b -r1.135 -r1.136
--- GNUmakefile 10 Aug 2012 14:41:10 -0000 1.135
+++ GNUmakefile 13 Sep 2012 07:40:45 -0000 1.136
@@ -554,7 +554,7 @@
define update-po-status
if LC_ALL=C $(MSGFMT) --statistics -o /dev/null $(1) 2>&1 \
- | $(EGREP) '(fuzzy|untranslated)' > /dev/null; then \
+ | $(EGREP) '(fuzzy|untranslated)[^:]*$$$$' > /dev/null; then \
$(call insert-outdated-date,$(1)); \
else \
$(call remove-outdated-date,$(1)); \
@@ -1200,39 +1200,68 @@
ifdef TEAM
-include priorities.mk
TEAM-POS := $(sort $(filter %.${TEAM}.po,${ALL_POS}))
+# UnGNUNified translations
+TEAM-HTMLS := $(shell echo $(subst /po/,/,$(ALL_POTS:%.pot=%.$(TEAM).html)) \
+ | $(SED) "s/[[:blank:]]\+/\n/g" \
+ | while read f; do \
+ po_base=$${f\#\#*/}; po_base=$${po_base%html}po; po_dir=$${f%/*}/po; \
+ test -f $$f && { test -f $$po_dir/$$po_base || echo $$f; } done)
priority-articles-pos := \
$(filter \
$(foreach article,${priority-articles},\
${rootdir}/$(filter-out ./,\
$(dir ${article}))po/$(notdir ${article}).${TEAM}.po), \
${TEAM-POS})
+priority-articles-htmls := \
+ $(sort $(filter \
+ $(foreach article,${priority-articles},\
+ ${rootdir}/$(filter-out ./,\
+ $(dir ${article}))/$(notdir ${article}).${TEAM}.html), \
+ ${TEAM-HTMLS}))
important-articles-pos := \
$(filter \
$(foreach article,${important-articles},\
${rootdir}/$(filter-out ./,\
$(dir ${article}))po/$(notdir ${article}).${TEAM}.po), \
${TEAM-POS})
+important-articles-htmls := \
+ $(sort $(filter \
+ $(foreach article,${important-articles},\
+ ${rootdir}/$(filter-out ./,\
+ $(dir ${article}))/$(notdir ${article}).${TEAM}.html), \
+ ${TEAM-HTMLS}))
important-dir-pos := \
$(filter-out ${priority-articles-pos} ${important-articles-pos},\
$(filter $(addsuffix /%, \
$(addprefix ${rootdir}/,${important-directories})), \
${TEAM-POS}))
+important-dir-htmls := \
+$(sort $(filter-out ${priority-articles-htmls} ${important-articles-htmls},\
+ $(filter $(addsuffix /%, \
+ $(addprefix ${rootdir}/,${important-directories})), \
+ ${TEAM-HTMLS})))
other-pos := \
$(filter-out ${priority-articles-pos} ${important-articles-pos} \
${important-dir-pos}, \
$(shell find $(rootdir) -name '*.$(TEAM).po' \
! -path '$(template-dir)/gnun/*'))
+other-htmls := \
+ $(sort $(filter-out ${priority-articles-htmls} ${important-articles-htmls} \
+ ${important-dir-htmls}, ${TEAM-HTMLS}))
# Function to report a group of PO files.
define report-pos
address@hidden(if $(1), $(if $(2), echo " "$(strip $(2)); echo;) \
address@hidden(if $(1)$(strip $(3)), $(if $(2), echo " "$(strip $(2)); echo;))
\
+ $(if $(1), \
for i in $(1); do \
echo -n "$${i#${rootdir}/}: "; \
LC_ALL=C $(MSGFMT) --statistics -o /dev/null $$i 2>&1 \
| $(SED) ':egin;$$s/\n[[:blank:]]*/; /g;N;begin'; \
- done | $(EGREP) '(fuzzy|untranslated)' \
+ done | $(EGREP) '(fuzzy|untranslated)[^:]*$$' \
|| echo "All translations seem to be up-to-date."; $(if $(2), echo;) \
- )
+ )\
+ $(if $(strip $(3)), echo Translations to convert to PO files:; echo; \
+ for html in $(3); do echo $${html#${rootdir}/}; done; echo)
endef
endif # def TEAM
@@ -1246,13 +1275,16 @@
@echo "There are no translations for language $(TEAM)."
else
ifeq (,${priority-articles}${important-articles}${important-directories})
- $(call report-pos,${other-pos},)
+ $(call report-pos,${other-pos},,${other-htmls})
else #!eq (,${priority-articles}${important-articles}${important-directories})
- $(call report-pos,${priority-articles-pos},Priority Articles)
- $(call report-pos,${important-articles-pos},Important Articles)
+ $(call report-pos,${priority-articles-pos},Priority Articles,\
+ ${priority-articles-htmls})
+ $(call report-pos,${important-articles-pos},Important Articles,\
+ ${important-articles-htmls})
$(call report-pos,${important-dir-pos},\
- Other Articles from Important Directories)
- $(call report-pos,${other-pos},Other Translations)
+ Other Articles from Important Directories,\
+ ${important-dir-htmls})
+ $(call report-pos,${other-pos},Other Translations,${other-htmls})
endif #!eq (,${priority-articles}${important-articles}${important-directories})
endif # !eq (,$(call find-language,$(TEAM),$(sort $(GENERIC_LINGUAS))))
@@ -1260,9 +1292,15 @@
# for all languages.
.PHONY: reports-summary
reports-summary:
+ @echo Outdated translations:
+ @$(foreach lang,$(TEMPLATE_LINGUAS), echo -n "$(lang): "; \
+ $(MAKE) report TEAM=$(lang) \
+ | $(EGREP) '(fuzzy|untranslated)[^:]*$$' \
+ | $(EGREP) -v 'html$$' | wc -l; )
+ @echo; echo UnGNUNified translations:
@$(foreach lang,$(TEMPLATE_LINGUAS), echo -n "$(lang): "; \
$(MAKE) report TEAM=$(lang) \
- | $(EGREP) '(fuzzy|untranslated)' | wc -l; )
+ | $(EGREP) 'html$$' | wc -l; )
# Special target to touch all the prerequisites of the targets that
# failed HTML validation and thus to trigger a rebuild in the next
Index: GNUmakefile.team
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile.team,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- GNUmakefile.team 24 Apr 2012 06:01:35 -0000 1.13
+++ GNUmakefile.team 13 Sep 2012 07:40:45 -0000 1.14
@@ -191,7 +191,7 @@
@$(if $(1), $(if $(2), echo " "$(strip $(2)); echo;) \
for file in $(1); do \
LC_ALL=C $(MSGFMT) --statistics -o /dev/null $$file 2>&1 \
- | egrep '(fuzzy|untranslated)' \
+ | egrep '(fuzzy|untranslated)[^:]*$$' \
&& echo "$${file#./} needs updating." || true ; \
done; $(if $(2), echo;))
endef
Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- NEWS 10 Aug 2012 14:41:10 -0000 1.62
+++ NEWS 13 Sep 2012 07:40:45 -0000 1.63
@@ -15,6 +15,9 @@
the `OUTDATED_SINCE' SSI variable indicates when the translation
became obsolete.
+** The `report' and `reports-summary' targets will also report
+ the translations that should be converted to PO files.
+
** Bugs fixed in 0.7.
*** The `report' target didn't take into account the subdirectories of
@@ -22,6 +25,10 @@
*** The `validate-all' targed didn't validate the home pages.
+*** When deciding whether the translation is up-to-date, it was not
+ taken into account that the name of the article may include
+ `fuzzy' or `untranslated'.
+
* Changes in GNUnited Nations 0.6 (2012-06-28)
** New target in GNUmakefile: `validate-all'.
Index: doc/gnun.texi
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/doc/gnun.texi,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- doc/gnun.texi 31 Jul 2012 10:51:17 -0000 1.58
+++ doc/gnun.texi 13 Sep 2012 07:40:45 -0000 1.59
@@ -730,11 +730,10 @@
make report TEAM=fr
@end example
address@hidden:} This target checks only the PO files; if there are
-translations that are maintained in the old-fashioned way, they are
-not reported since there is no reasonable way to check if they are
-up-to-date. In fact, this is one of the main reasons GNUN is being
-developed, if you recall.
+This target checks only the PO files; the old translations that haven't
+been converted to PO files are reported, but there is no reasonable way
+to check if they are up-to-date. In fact, this is one of the main
+reasons GNUN is being developed, if you recall.
@cindex priorities.mk
When present, @file{priorities.mk} defines four classes of articles by
- trans-coord/gnun/server/gnun ChangeLog GNUmakef...,
Pavel Kharitonov <=