Hi Jan and Graham,

Since I got a problem the last time I notified the Free Translation Project of a new lilypond.pot, I'd like to have it updated during the releasing process.

What you'll find in the enclosed patch is an attempt to adapt
'make po-replace' in order to have an automatically well-formed .pot included in 'make dist'.

I'll let Graham, if he agrees with this matter, incorporate a call to po-replace in his 'make release'.

Cheers,
Jean-Charles
diff --git a/po/README b/po/README
index 7b9c400..b4c7571 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 openning 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
 =========
diff --git a/stepmake/stepmake/po-targets.make b/stepmake/stepmake/po-targets.make
index 05088ee..bb6215c 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
diff --git a/stepmake/stepmake/podir-targets.make b/stepmake/stepmake/podir-targets.make
index 0b831c5..fdfa5ef 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

Reply via email to