[Pkg-isocodes-devel] [iso-codes] 05/13: Do no longer include the version in the .pot file
Tobias Quathamer
toddy at moszumanska.debian.org
Tue Apr 1 15:53:50 UTC 2014
This is an automated email from the git hooks/post-receive script.
toddy pushed a commit to branch new_xml_structure
in repository iso-codes.
commit 301a083c8ce3d3c00b951a5881586282d55ea2e3
Author: Tobias Quathamer <toddy at debian.org>
Date: Mon Nov 11 13:05:15 2013 +0100
Do no longer include the version in the .pot file
---
iso2pot.py | 15 ++++++---------
iso_15924/Makefile.am | 2 +-
iso_15924/Makefile.in | 2 +-
iso_3166_1/Makefile.am | 2 +-
iso_3166_1/Makefile.in | 2 +-
iso_3166_2/Makefile.am | 2 +-
iso_3166_2/Makefile.in | 2 +-
iso_4217/Makefile.am | 2 +-
iso_4217/Makefile.in | 2 +-
iso_639/Makefile.am | 2 +-
iso_639/Makefile.in | 2 +-
iso_639_3/Makefile.am | 2 +-
iso_639_3/Makefile.in | 2 +-
13 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/iso2pot.py b/iso2pot.py
index eb789f3..afd9e3b 100755
--- a/iso2pot.py
+++ b/iso2pot.py
@@ -66,7 +66,7 @@ class printPot(ContentHandler):
(aname, comment_str)
self.result[self.done[n]].append(translator_comment)
-def printHeader(ofile, iso_standard, report_bugs_to, version):
+def printHeader(ofile, iso_standard, report_bugs_to):
"""Print the file header
"""
description = "# Translation of ISO " + iso_standard[0]
@@ -83,7 +83,7 @@ def printHeader(ofile, iso_standard, report_bugs_to, version):
ofile.write ("#\n")
ofile.write ("msgid \"\"\n")
ofile.write ("msgstr \"\"\n")
- ofile.write ("\"Project-Id-Version: iso_" + iso_standard[0] + " " + version + "\\n\"\n")
+ ofile.write ("\"Project-Id-Version: iso_" + iso_standard[0].replace('-', '_') + "\\n\"\n")
ofile.write ("\"Report-Msgid-Bugs-To: " + report_bugs_to + "\\n\"\n")
ofile.write ("\"POT-Creation-Date: " + time.strftime('%F %H:%M%z') + "\\n\"\n")
ofile.write ("\"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n\"\n")
@@ -101,8 +101,8 @@ def printHeader(ofile, iso_standard, report_bugs_to, version):
locale.setlocale(locale.LC_ALL, 'C')
try:
- (opts,trail)=getopt.getopt(sys.argv[1:],"f:c:o:v:",
- ["fields=", "comments=", "is-version=", "outfile="])
+ (opts,trail)=getopt.getopt(sys.argv[1:],"f:c:o:",
+ ["fields=", "comments=", "outfile="])
assert trail, "No argument provided"
except Exception,e:
print "ERROR: %s" % e
@@ -112,16 +112,13 @@ except Exception,e:
print " outfilename: Write to this file"
sys.exit(1)
-version = "VERSION"
report_bugs_to = "Debian iso-codes team <pkg-isocodes-devel at lists.alioth.\"\n\"debian.org>"
fields = ["name","official_name"]
comment = []
ofile = sys.stdout
for opt, arg in opts:
- if opt in ('-v', '--is-version'):
- version = arg
- elif opt in ('-f', '--fields'):
+ if opt in ('-f', '--fields'):
fields = arg.split(',')
elif opt in ('-c','--comments'):
comment.append(arg)
@@ -151,7 +148,7 @@ else:
iso_standard = [iso_number, iso_desc]
-printHeader(ofile, iso_standard, report_bugs_to, version)
+printHeader(ofile, iso_standard, report_bugs_to)
p = make_parser()
diff --git a/iso_15924/Makefile.am b/iso_15924/Makefile.am
index ae40422..78cdad8 100644
--- a/iso_15924/Makefile.am
+++ b/iso_15924/Makefile.am
@@ -9,7 +9,7 @@ mofiles = $(patsubst $(srcdir)/%.po,%.mo, $(pofiles))
noinst_DATA = $(mofiles) $(xml_DATA:.xml=.pot)
iso_15924.pot: iso_15924.xml
- ../iso2pot.py --is-version ${VERSION} --comments alpha_4_code \
+ ../iso2pot.py --comments alpha_4_code \
--fields name --outfile $@ $<
EXTRA_DIST = \
diff --git a/iso_15924/Makefile.in b/iso_15924/Makefile.in
index b8ea45d..91a577c 100644
--- a/iso_15924/Makefile.in
+++ b/iso_15924/Makefile.in
@@ -405,7 +405,7 @@ uninstall-am: uninstall-xmlDATA
iso_15924.pot: iso_15924.xml
- ../iso2pot.py --is-version ${VERSION} --comments alpha_4_code \
+ ../iso2pot.py --comments alpha_4_code \
--fields name --outfile $@ $<
check-local: check-content
diff --git a/iso_3166_1/Makefile.am b/iso_3166_1/Makefile.am
index 2bafc90..f013dcc 100644
--- a/iso_3166_1/Makefile.am
+++ b/iso_3166_1/Makefile.am
@@ -9,7 +9,7 @@ mofiles = $(patsubst $(srcdir)/%.po,%.mo, $(pofiles))
noinst_DATA = $(mofiles) $(xml_DATA:.xml=.pot)
iso_3166_1.pot: iso_3166_1.xml
- ../iso2pot.py --is-version $(VERSION) --comments alpha_3_code \
+ ../iso2pot.py --comments alpha_3_code \
--fields name,official_name,common_name --outfile $@ $<
EXTRA_DIST = \
diff --git a/iso_3166_1/Makefile.in b/iso_3166_1/Makefile.in
index 943bc6e..33c55ad 100644
--- a/iso_3166_1/Makefile.in
+++ b/iso_3166_1/Makefile.in
@@ -405,7 +405,7 @@ uninstall-am: uninstall-xmlDATA
iso_3166_1.pot: iso_3166_1.xml
- ../iso2pot.py --is-version $(VERSION) --comments alpha_3_code \
+ ../iso2pot.py --comments alpha_3_code \
--fields name,official_name,common_name --outfile $@ $<
check-local: check-content
diff --git a/iso_3166_2/Makefile.am b/iso_3166_2/Makefile.am
index 42ebb30..f0b4407 100644
--- a/iso_3166_2/Makefile.am
+++ b/iso_3166_2/Makefile.am
@@ -9,7 +9,7 @@ mofiles = $(patsubst $(srcdir)/%.po,%.mo, $(pofiles))
noinst_DATA = $(mofiles) $(xml_DATA:.xml=.pot)
iso_3166_2.pot: iso_3166_2.xml
- ../iso2pot.py --is-version ${VERSION} --comment code \
+ ../iso2pot.py --comment code \
--fields name --outfile $@ $<
EXTRA_DIST = \
diff --git a/iso_3166_2/Makefile.in b/iso_3166_2/Makefile.in
index fe8f24b..0edafe8 100644
--- a/iso_3166_2/Makefile.in
+++ b/iso_3166_2/Makefile.in
@@ -405,7 +405,7 @@ uninstall-am: uninstall-xmlDATA
iso_3166_2.pot: iso_3166_2.xml
- ../iso2pot.py --is-version ${VERSION} --comment code \
+ ../iso2pot.py --comment code \
--fields name --outfile $@ $<
check-local: check-content
diff --git a/iso_4217/Makefile.am b/iso_4217/Makefile.am
index cf6ac04..f3fe305 100644
--- a/iso_4217/Makefile.am
+++ b/iso_4217/Makefile.am
@@ -9,7 +9,7 @@ mofiles = $(patsubst $(srcdir)/%.po,%.mo, $(pofiles))
noinst_DATA = $(mofiles) $(xml_DATA:.xml=.pot)
iso_4217.pot: iso_4217.xml
- ../iso2pot.py --is-version ${VERSION} --comments letter_code \
+ ../iso2pot.py --comments letter_code \
--fields currency_name --outfile $@ $<
EXTRA_DIST = \
diff --git a/iso_4217/Makefile.in b/iso_4217/Makefile.in
index b26e31b..4a2d053 100644
--- a/iso_4217/Makefile.in
+++ b/iso_4217/Makefile.in
@@ -405,7 +405,7 @@ uninstall-am: uninstall-xmlDATA
iso_4217.pot: iso_4217.xml
- ../iso2pot.py --is-version ${VERSION} --comments letter_code \
+ ../iso2pot.py --comments letter_code \
--fields currency_name --outfile $@ $<
check-local: check-content
diff --git a/iso_639/Makefile.am b/iso_639/Makefile.am
index 3bf05c4..5d47553 100644
--- a/iso_639/Makefile.am
+++ b/iso_639/Makefile.am
@@ -9,7 +9,7 @@ mofiles = $(patsubst $(srcdir)/%.po,%.mo, $(pofiles))
noinst_DATA = $(mofiles) iso_639.pot
iso_639.pot: iso_639.xml
- $(top_srcdir)/iso2pot.py --is-version $(VERSION) \
+ $(top_srcdir)/iso2pot.py \
--comments iso_639_2T_code \
--comments iso_639_1_code \
--fields name,common_name --outfile $@ iso_639.xml
diff --git a/iso_639/Makefile.in b/iso_639/Makefile.in
index 6955135..3b1c199 100644
--- a/iso_639/Makefile.in
+++ b/iso_639/Makefile.in
@@ -405,7 +405,7 @@ uninstall-am: uninstall-xmlDATA
iso_639.pot: iso_639.xml
- $(top_srcdir)/iso2pot.py --is-version $(VERSION) \
+ $(top_srcdir)/iso2pot.py \
--comments iso_639_2T_code \
--comments iso_639_1_code \
--fields name,common_name --outfile $@ iso_639.xml
diff --git a/iso_639_3/Makefile.am b/iso_639_3/Makefile.am
index 6153985..ca074e9 100644
--- a/iso_639_3/Makefile.am
+++ b/iso_639_3/Makefile.am
@@ -9,7 +9,7 @@ mofiles = $(patsubst $(srcdir)/%.po,%.mo, $(pofiles))
noinst_DATA = $(mofiles) $(xml_DATA:.xml=.pot)
iso_639_3.pot: iso_639_3.xml
- ../iso2pot.py --is-version ${VERSION} --comment id \
+ ../iso2pot.py --comment id \
--fields name,inverted_name,reference_name,common_name --outfile $@ $<
EXTRA_DIST = \
diff --git a/iso_639_3/Makefile.in b/iso_639_3/Makefile.in
index 83f640a..9600c12 100644
--- a/iso_639_3/Makefile.in
+++ b/iso_639_3/Makefile.in
@@ -405,7 +405,7 @@ uninstall-am: uninstall-xmlDATA
iso_639_3.pot: iso_639_3.xml
- ../iso2pot.py --is-version ${VERSION} --comment id \
+ ../iso2pot.py --comment id \
--fields name,inverted_name,reference_name,common_name --outfile $@ $<
check-local: check-content
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-isocodes/iso-codes.git
More information about the Pkg-isocodes-devel
mailing list