[Python-modules-commits] r1188 - in /packages/turbogears/trunk/debian: changelog patches/03_fix_admi18n.diff

[kov at users.alioth.debian.org]

Author: kov
Date: Mon Jul 24 23:51:37 2006
New Revision: 1188

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1188
Log:
new patch by Joseph Wenninger <jowenn at kde.org> fixing problems
when collecting strings and generating the pot file

Added:
    packages/turbogears/trunk/debian/patches/03_fix_admi18n.diff
Modified:
    packages/turbogears/trunk/debian/changelog

Modified: packages/turbogears/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/turbogears/trunk/debian/changelog?rev=1188&op=diff
==============================================================================
--- packages/turbogears/trunk/debian/changelog (original)
+++ packages/turbogears/trunk/debian/changelog Mon Jul 24 23:51:37 2006
@@ -1,3 +1,12 @@
+turbogears (0.9a8-2) UNRELEASED; urgency=low
+
+  * debian/patches/03_fix_admi18n.diff:
+  - added; fixes string collection and pot file generation in
+    admi18n - patch by Joseph Wenninger <jowenn at kde.org> grabbed from
+    the project's trac ticket #945
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Mon, 24 Jul 2006 19:51:11 -0300
+
 turbogears (0.9a8-1) experimental; urgency=low
 
   * New upstream release (Closes: #379078)

Added: packages/turbogears/trunk/debian/patches/03_fix_admi18n.diff
URL: http://svn.debian.org/wsvn/python-modules/packages/turbogears/trunk/debian/patches/03_fix_admi18n.diff?rev=1188&op=file
==============================================================================
--- packages/turbogears/trunk/debian/patches/03_fix_admi18n.diff (added)
+++ packages/turbogears/trunk/debian/patches/03_fix_admi18n.diff Mon Jul 24 23:51:37 2006
@@ -1,0 +1,45 @@
+Index: turbogears/toolbox/admi18n/catalog.py
+===================================================================
+--- turbogears.old/toolbox/admi18n/catalog.py	(Revision 1535)
++++ turbogears/toolbox/admi18n/catalog.py	(Arbeitskopie)
+@@ -63,6 +63,7 @@
+ 
+ def save(path,message_list):
+     txt = []
++    
+     m = message_list[0]['message']
+     txt.append(m)
+     txt.append(u'\n\n');
+@@ -71,7 +72,7 @@
+         message = p['message'] or ''
+         context = p['context']
+         id = p['id']
+-        txt.append(u'#: %s'% context) 
++        txt.append(u'#: %s\n'% context) #a newline has been missing
+         txt.append(u'msgid %s\n'% normalize(id) )
+         txt.append(u'msgstr %s\n\n'% normalize(message) )
+     txt=u''.join(txt)
+@@ -149,7 +150,9 @@
+         if heading:
+             if l.startswith('#: '): heading=False
+             if l.startswith('msgid "') and header and 'Generated-By:' in header[-1]:heading=False
+-            if l.strip() and heading: header.append(l)
++            if l.strip() and heading:
++                header.append(l)
++                header.append('\n')  #Fix output of the header information for saving
+             
+         # If we get a comment line after a msgstr, this is a new entry
+         if l[0] == '#' and section == STR:
+Index: turbogears/toolbox/admi18n/pygettext.py
+===================================================================
+--- turbogears.old/toolbox/admi18n/pygettext.py	(Revision 1535)
++++ turbogears/toolbox/admi18n/pygettext.py	(Arbeitskopie)
+@@ -466,7 +466,7 @@
+         # to force interpration as coded string
+         # then we decode it using already known file's encoding
+         if not iskidstring:
+-            msg = eval(repr(msg)[1:])
++            #msg = eval(repr(msg)[1:]) this causes an exception because    somestring'   can't be evaluated
+             msg = msg.decode(self.__encoding)
+         if lineno is None:
+             lineno = self.__lineno