[Zope3-checkins] CVS: Zope3/src/zope/app/translation_files - extract.py:1.16 zope.pot:1.20

[Philipp von Weitershausen]

Update of /cvs-repository/Zope3/src/zope/app/translation_files
In directory cvs.zope.org:/tmp/cvs-serv22571

Modified Files:
	extract.py zope.pot 
Log Message:
Use UTF-8 charset and 8bit encoding for gettext message catalogs by
default.


=== Zope3/src/zope/app/translation_files/extract.py 1.15 => 1.16 ===
--- Zope3/src/zope/app/translation_files/extract.py:1.15	Wed Dec 17 09:06:54 2003
+++ Zope3/src/zope/app/translation_files/extract.py	Thu Feb 19 10:20:37 2004
@@ -29,6 +29,9 @@
 
 __meta_class__ = type
 
+DEFAULT_CHARSET = 'UTF-8'
+DEFAULT_ENCODING = '8bit'
+
 pot_header = '''\
 ##############################################################################
 #
@@ -51,8 +54,8 @@
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\\n"
 "Language-Team: Zope 3 Developers <zope3-dev at zope.org>\\n"
 "MIME-Version: 1.0\\n"
-"Content-Type: text/plain; charset=CHARSET\\n"
-"Content-Transfer-Encoding: ENCODING\\n"
+"Content-Type: text/plain; charset=%(charset)s\\n"
+"Content-Transfer-Encoding: %(encoding)s\\n"
 "Generated-By: zope/app/translation_files/extract.py\\n"
 
 '''
@@ -123,8 +126,10 @@
 
     def write(self):
         file = open(self._output_filename, 'w')
-        file.write(pot_header % {'time':    time.ctime(),
-                                 'version': self._getProductVersion()})
+        file.write(pot_header % {'time':     time.ctime(),
+                                 'version':  self._getProductVersion(),
+                                 'charset':  DEFAULT_CHARSET,
+                                 'encoding': DEFAULT_ENCODING})
 
         # Sort the catalog entries by filename
         catalog = self.catalog.values()


=== Zope3/src/zope/app/translation_files/zope.pot 1.19 => 1.20 ===
--- Zope3/src/zope/app/translation_files/zope.pot:1.19	Thu Feb 19 09:10:28 2004
+++ Zope3/src/zope/app/translation_files/zope.pot	Thu Feb 19 10:20:37 2004
@@ -14,13 +14,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Zope X3 Pre-M4\n"
-"POT-Creation-Date: Thu Feb 19 15:14:45 2004\n"
+"POT-Creation-Date: Thu Feb 19 16:20:19 2004\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope3-dev at zope.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Generated-By: zope/app/translation_files/extract.py\n"
 
 #: src/zope/app/browser/absoluteurl.py:25