Reviewers: Graham Percival,
Message:
Before integrating po-replace in the release process,
let build a well-formed lilypond.pot in one run.
Description:
PO: modifying po-replace before integrating it to the release process
Until now, updating the translation template file is disconnected from
the releasing process, which means that a dev or translator must
1- run 'po-replace',
2- embed lilypond.pot headers,
3- eliminate all po files that have been moved upwards from po/out to
po/
4- commit the new lilypond.pot
5- run 'make dist' to have a tarball,
6- notify the Free Translation Project where to pick up that tarbal.
The first three steps may already be reduced to one single step by
embedding lilypond.pot directly (with specific options and some 'sed'
when creating) and moving it only in po/, what does this patch.
A second step would be to have a call to po-replace when the Release
Meister enters the dance, which would "group" steps 4 and 5.
We then will have the same unique tarball to refer to, directly from
linuxaudio.
Please review this at http://codereview.appspot.com/6188051/
Affected files:
M po/README
M stepmake/stepmake/po-targets.make
M stepmake/stepmake/podir-targets.make
Index: po/README
diff --git a/po/README b/po/README
index
7b9c400308ecaa035ebd4846846d77c472d25ae9..f691dbb6b8714a6a72a0dc7e522fe55363e6c5f6
100644
--- a/po/README
+++ b/po/README
@@ -28,12 +28,13 @@ automatically notified to lilypond-devel@gnu.org list
by the FTP
robot; you can also see LilyPond page on FTP.
-2) updating lilypond.pot: run 'make po-replace' at toplevel, clean up
-lilypond.pot header to make it look like its previous state, commit
-only lilypond.pot to Git and reset all .po files, roll a tarball with
-'make dist', upload it somewhere on the web (or wait for the release),
-and send a notification to FTP coordinator with a link to the tarball.
-
+2) updating lilypond.pot: run 'make po-replace' at toplevel, commit
+lilypond.pot to Git, roll a tarball with 'make dist', upload it
+somewhere on the web (or wait for the release), and send a notification
+to FTP coordinator with a link to the tarball.
+Running 'po-update' at top-level and opening either po/out/fr.po or
+po/out/es.po gives you an idea of the changes that have affected
+the sources (number of fuzzy and untranslated stings).
Rationale
=========
Index: stepmake/stepmake/po-targets.make
diff --git a/stepmake/stepmake/po-targets.make
b/stepmake/stepmake/po-targets.make
index
05088ee1700a49164a67681a3e5f84d75ded7c06..bb6215cf3025161afd1a5b7452f9e2abdfb011b9
100644
--- a/stepmake/stepmake/po-targets.make
+++ b/stepmake/stepmake/po-targets.make
@@ -1,5 +1,14 @@
-
-
+XGETTEXT_OPTIONS = \
+ --default-domain=$(package) \
+ --from-code=UTF-8 \
+ --join \
+ --add-comments \
+
--msgid-bugs-address="http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs";
\
+ --package-name=$(package) \
+ --package-version=$(VERSION)
+
+sed-header = \# Translation of LilyPond\n\# Copyright \(C\) 1998--2012
Han-Wen Nienhuys, Jan Nieuwenhuizen.\n\# This file is distributed under the
same license as the LilyPond package.
+sed-content = "Content-Type: text\/plain; charset=UTF-8\\n"
####
#### UGH!
@@ -21,12 +30,14 @@ ALL_PO_SOURCES = $(ALL_C_SOURCES) $(ALL_CC_SOURCES)
$(PYTHON_SCRIPTS_IN) $(PY_MO
local-po:
ifneq ($(strip $(ALL_PO_SOURCES)),)
@echo $(ALL_PO_SOURCES)
- xgettext --default-domain=$(package) --join \
- --output-dir=$(po-dir)/$(outdir) --add-comments \
+ xgettext $(XGETTEXT_OPTIONS) --output-dir=$(po-dir)/$(outdir) \
--keyword=_ --keyword=_f --keyword=_i \
$(XGETTEXT_FLAGS) $(ALL_PO_SOURCES)
endif
endif
+ sed -i '1,2d' $(po-dir)/$(outdir)/$(package).po
+ sed -i -e 's/^\# This file is distributed.*/$(sed-header)/'
$(po-dir)/$(outdir)/$(package).po
+ sed -i -e 's/^\"Content-Type: text\/plain.*/$(sed-content)/'
$(po-dir)/$(outdir)/$(package).po
po-update: po
Index: stepmake/stepmake/podir-targets.make
diff --git a/stepmake/stepmake/podir-targets.make
b/stepmake/stepmake/podir-targets.make
index
0b831c5c797b622a230d2d80ea0be2a3c80bd99a..fdfa5ef33f472194b1701629b34edc85a8dd1f8f
100644
--- a/stepmake/stepmake/podir-targets.make
+++ b/stepmake/stepmake/podir-targets.make
@@ -29,4 +29,3 @@ po-changes:
po-replace: po-update
mv $(outdir)/$(package).po $(package).pot
- mv $(outdir)/*.po .
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
