[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
trans-coord/gnun/server/gnun GNUmakefile.team C...
From: |
Pavel Kharitonov |
Subject: |
trans-coord/gnun/server/gnun GNUmakefile.team C... |
Date: |
Thu, 06 Dec 2012 05:05:11 +0000 |
CVSROOT: /sources/trans-coord
Module name: trans-coord
Changes by: Pavel Kharitonov <ineiev> 12/12/06 05:05:11
Modified files:
gnun/server/gnun: GNUmakefile.team ChangeLog
Log message:
(MSGATTRIB): New variable.
(sync-file) <sync-$(1)>: Ignore differences in `POT-Creation-Date'.
Use non-fuzzy translation from www repository when it is available
and the translation from the team's repository is fuzzy. Display
statistics for the resulting file.
(format-file) <format-$(1)>: Add `-s' to cmp invocation.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile.team?cvsroot=trans-coord&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.310&r2=1.311
Patches:
Index: GNUmakefile.team
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile.team,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- GNUmakefile.team 23 Nov 2012 05:25:52 -0000 1.16
+++ GNUmakefile.team 6 Dec 2012 05:05:11 -0000 1.17
@@ -48,6 +48,7 @@
MSGMERGEFLAGS := --previous --backup=none
MSGFMT := msgfmt
MSGCAT := msgcat
+MSGATTRIB := msgattrib
CVS := cvs
SVN := svn
BZR := bzr
@@ -171,12 +172,20 @@
else \
comp=; \
fi; \
- diff -q -I "^$$$$" -I "^#" $$$${file} $$$${www_po} &>/dev/null \
+ diff -q -I "^$$$$" -I "^#" -I '^"POT-Creation-Date:' \
+ $$$${file} $$$${www_po} &>/dev/null \
&& echo "$$$${file#./}: Already in sync." \
|| { \
echo -n "$$$${file#./}: Merging"; \
+ $(MSGATTRIB) --no-fuzzy -o $(1)-tmp.www.po $$$$www_po 2>&1;
\
+ $(MSGATTRIB) --fuzzy -o $(1)-tmp.po $$$$file 2>&1; \
+ $(MSGCAT) --use-first --more-than=1 -o $(1)-tmp.po \
+ $(1)-tmp.www.po $(1)-tmp.po 2>&1; \
+ $(MSGCAT) --use-first --less-than=2 -o $(1) $(1)-tmp.po
$(1); \
$(MSGMERGE) $(MSGMERGEFLAGS) $(MSGMERGEVERBOSE) $$$${comp} \
--update $$$$file $$$${www_po%.$(TEAM).po}.pot 2>&1; \
+ echo -n " "; $(MSGFMT) -o /dev/null --statistics $$$$file;
\
+ $(RM) $(1)-tmp.www.po $(1)-tmp.po; \
} \
fi
sync: sync-$(1)
@@ -233,7 +242,7 @@
.PNONY: format-$(1)
format-$(1):
@file=$(1); $(MSGCAT) -o $$$$file-tmp $$$$file; \
- cmp $$$$file-tmp $$$$file || cp $$$$file-tmp $$$$file; \
+ cmp -s $$$$file-tmp $$$$file || cp $$$$file-tmp $$$$file; \
$(RM) $$$$file-tmp; echo " $$$${file#./} formatted."
format: format-$(1)
endef
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -b -r1.310 -r1.311
--- ChangeLog 4 Dec 2012 16:20:08 -0000 1.310
+++ ChangeLog 6 Dec 2012 05:05:11 -0000 1.311
@@ -1,3 +1,13 @@
+2012-12-06 Pavel Kharitonov <address@hidden>
+
+ * GNUmakefile.team (MSGATTRIB): New variable.
+ (sync-file) <sync-$(1)>: Ignore differences in
+ `POT-Creation-Date'. Use non-fuzzy translation from www
+ repository when it is available and the translation from
+ the team's repository is fuzzy. Display statistics
+ for the resulting file.
+ (format-file) <format-$(1)>: Add `-s' to cmp invocation.
+
2012-12-04 Pavel Kharitonov <address@hidden>
Minor updates of documentation.
- trans-coord/gnun/server/gnun GNUmakefile.team C...,
Pavel Kharitonov <=