[Translate-cvs] src/translate/convert dtd2po.py,1.4,1.5 prop2po.py,1.2,1.3

[<dav...@us...>]

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

Modified Files:
	dtd2po.py prop2po.py 
Log Message:
po headers should be fuzzy, for templates the charset should not be set
also escapes need to be escaped when converting .properties files to .po files


Index: dtd2po.py
===================================================================
RCS file: /cvsroot/translate/src/translate/convert/dtd2po.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dtd2po.py	26 Jan 2004 07:12:11 -0000	1.4
+++ dtd2po.py	6 Feb 2004 10:32:14 -0000	1.5
@@ -178,6 +178,7 @@
     # create a header for the file
     headerpo = po.poelement()
     headerpo.othercomments.append("# extracted from %s\n" % filename)
+    headerpo.typecomments.append("#, fuzzy\n")
     headerpo.msgid = ['""']
     headeritems = [""]
 # SOME DESCRIPTIVE TITLE.
@@ -191,7 +192,7 @@
     headeritems.append("Last-Translator: FULL NAME <EMAIL@ADDRESS>\\n")
     headeritems.append("Language-Team: LANGUAGE <LL...@li...>\\n")
     headeritems.append("MIME-Version: 1.0\\n")
-    headeritems.append("Content-Type: text/plain; charset=ISO-8859-1\\n")
+    headeritems.append("Content-Type: text/plain; charset=CHARSET\\n")
     headeritems.append("Content-Transfer-Encoding: ENCODING\\n")
     headerpo.msgstr = [quote.quotestr(headerstr) for headerstr in headeritems]
     thepofile.poelements.append(headerpo)

Index: prop2po.py
===================================================================
RCS file: /cvsroot/translate/src/translate/convert/prop2po.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- prop2po.py	20 Jan 2004 12:10:40 -0000	1.2
+++ prop2po.py	6 Feb 2004 10:32:14 -0000	1.3
@@ -42,6 +42,7 @@
   def outputheader(self, outputfile):
     # TODO: handle this properly in the pofile class
     outputfile.write('''# extracted from unknown file
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\\n"
@@ -50,7 +51,7 @@
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\\n"
 "Language-Team: LANGUAGE <LL...@li...>\\n"
 "MIME-Version: 1.0\\n"
-"Content-Type: text/plain; charset=ISO-8859-1\\n"
+"Content-Type: text/plain; charset=CHARSET\\n"
 "Content-Transfer-Encoding: ENCODING\\n"
 '''+eol)
 
@@ -68,7 +69,7 @@
       if self.inmultilinemsgid:
         # strip the backslash
         msgid = msgid[:-1]
-      outputlines.append(quote.quotestr(msgid)+eol)
+      outputlines.append(quote.quotestr(msgid, escapeescapes=1)+eol)
       if not self.inmultilinemsgid:
         # we're finished, print the msgstr
         outputlines.append('msgstr ""'+eol+eol)
@@ -91,9 +92,9 @@
           if msgid[-1:] == '\\':
             self.inmultilinemsgid = 1
             outputlines.append('msgid ""'+eol)
-            outputlines.append(quote.quotestr(msgid[:-1])+eol) # don't print the backslash
+            outputlines.append(quote.quotestr(msgid[:-1], escapeescapes=1)+eol) # don't print the backslash
           else:
-            outputlines.append("msgid "+quote.quotestr(msgid)+eol)
+            outputlines.append("msgid "+quote.quotestr(msgid, escapeescapes=1)+eol)
             outputlines.append('msgstr ""'+eol+eol)
     return outputlines