Commits

Anonymous committed 23e60ca

Merged [295:296] via svnmerge from [source:trunk].

Comments (0)

Files changed (2)

babel/messages/frontend.py

             format = u'%%-%ds %%s' % (longest + 1)
             for identifier in localedata.list():
                 locale = Locale.parse(identifier)
-                print format % (identifier, locale.english_name)
+                output = format % (identifier, locale.english_name)
+                print output.encode(sys.stdout.encoding or 'ascii', 'replace')
             return 0
 
         if not args:
 The ``python`` extractor is by default mapped to the glob pattern ``**.py``,
 meaning it'll be applied to all files with the ``.py`` extension in any 
 directory. If you specify your own mapping configuration, this default mapping
-is not discarded, so you need to explicitly add it to your mapping (as shown in
-the example above.)
+is discarded, so you need to explicitly add it to your mapping (as shown in the
+example above.)
 
 
 .. _`referencing extraction methods`: