[Checkins] SVN: Products.DCWorkflow/trunk/Products/DCWorkflow/ - Strip final newline here when importing, otherwise it would not match against a translation msgid (see: http://dev.plone.org/plone/ticket/8525)

[Sidnei da Silva]

Log message for revision 92609:
   - Strip final newline here when importing, otherwise it would not match against a translation msgid (see: http://dev.plone.org/plone/ticket/8525)

Changed:
  U   Products.DCWorkflow/trunk/Products/DCWorkflow/CHANGES.txt
  U   Products.DCWorkflow/trunk/Products/DCWorkflow/exportimport.py

-=-
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/CHANGES.txt
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/CHANGES.txt	2008-10-27 00:14:30 UTC (rev 92608)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/CHANGES.txt	2008-10-27 05:39:26 UTC (rev 92609)
@@ -4,6 +4,9 @@
 2.2.0 (unreleased)
 ------------------
 
+- Strip trailing newlines in order to properly match with a msgid when
+  translating transition descriptions.
+
 - Workflow UI: Remove ancient cruft to accommodate the proprietary
   (and long dead) base_cms product.
 

Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/exportimport.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/exportimport.py	2008-10-27 00:14:30 UTC (rev 92608)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/exportimport.py	2008-10-27 05:39:26 UTC (rev 92609)
@@ -1261,7 +1261,7 @@
     if encoding is not None:
         joined = joined.encode( encoding )
 
-    return ''.join( [ line.lstrip() for line in joined.splitlines(True) ] )
+    return ''.join( [ line.lstrip() for line in joined.splitlines(True) ] ).rstrip()
 
 def _extractDescriptionNode(parent, encoding=None):