Ticket #1695: admi18n.patch

turbogears/toolbox/admi18n/catalog.py

@@ -110 +110 @@
-
-def normalize(s):
-    # taken from pygettext module but changed a bit
+    s = s.strip()
-    lines = s.split('\n')
-    if len(lines) == 1:
-        s = '"' + quote(s) + '"'

turbogears/toolbox/admi18n/pygettext.py

@@ -265 +265 @@
-def normalize(s, escape=False):
-    # This converts the various Python string types into a format that is
-    # appropriate for .po files, namely much closer to C style.
+    s = s.strip()
-    lines = s.split('\n')
-    if len(lines) == 1:
-        s = '"' + escape_unicode(s) + '"'