[Translate-cvs] src/translate/storage po.py,1.90,1.91

[F W. <fri...@us...>]

Update of /cvsroot/translate/src/translate/storage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13669

Modified Files:
	po.py 
Log Message:
always use encoding with multistring

Index: po.py
===================================================================
RCS file: /cvsroot/translate/src/translate/storage/po.py,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- po.py	28 Feb 2006 06:15:14 -0000	1.90
+++ po.py	28 Feb 2006 12:52:24 -0000	1.91
@@ -58,7 +58,7 @@
     if postr and postr[0] == '""': postr = postr[1:]
   else:
     joiner = ""
-  return multistring(joiner.join([extractpoline(line) for line in postr]))
+  return joiner.join([extractpoline(line) for line in postr])
 
 """
 From the GNU gettext manual:
@@ -98,7 +98,7 @@
 
   def getsource(self):
     """Returns the unescaped msgid"""
-    multi = unquotefrompo(self.msgid)
+    multi = multistring(unquotefrompo(self.msgid), self.encoding)
     if self.hasplural():
       multi.strings.append(self.msgid_plural)
     return multi
@@ -111,9 +111,9 @@
   def gettarget(self):
     """Returns the unescaped msgstr"""
     if isinstance(self.msgstr, dict):
-      multi = multistring(map(unquotefrompo, self.msgstr.values()))
+      multi = multistring(map(unquotefrompo, self.msgstr.values()), self.encoding)
     else:
-      multi = unquotefrompo(self.msgstr)
+      multi = multistring(unquotefrompo(self.msgstr), self.encoding)
     return multi
 
   def settarget(self, target):