get_languages() patch from fedora bugtracker

rst2pdf-bz709119.patch (text/plain), 3.40 KB, created by Morozov Alexandr on 2011-06-08 13:44:31 UTC

diff -ur rst2pdf-0.16/rst2pdf/createpdf.py rst2pdf-0.16.new/rst2pdf/createpdf.py
--- rst2pdf-0.16/rst2pdf/createpdf.py	2010-10-06 23:21:41.000000000 +0200
+++ rst2pdf-0.16.new/rst2pdf/createpdf.py	2011-05-31 13:07:00.078550074 +0200
@@ -166,11 +166,11 @@
         self.basedir=basedir
         self.language = language
         try:
-            get_language (self.language)
+            get_language (self.language, None)
         except ImportError:
             try:
                 language = self.language.split('_', 1)[0]
-                get_language (language)
+                get_language (language, None)
                 self.language = language
             except ImportError:
                 log.warning("Can't load Docutils module "\
@@ -246,11 +246,11 @@
         # Load the docutils language modules for all required languages
         for lang in self.styles.languages:
             try:
-                self.docutils_languages[lang] = get_language(lang)
+                self.docutils_languages[lang] = get_language(lang, None)
             except ImportError:
                 try:
                     self.docutils_languages[lang] = \
-                         get_language(lang.split('_', 1)[0])
+                         get_language(lang.split('_', 1)[0], None)
                 except ImportError:
                     log.warning("Can't load Docutils module \
                         for language %s", lang)
diff -ur rst2pdf-0.16/rst2pdf/pdfbuilder.py rst2pdf-0.16.new/rst2pdf/pdfbuilder.py
--- rst2pdf-0.16/rst2pdf/pdfbuilder.py	2010-10-06 22:17:48.000000000 +0200
+++ rst2pdf-0.16.new/rst2pdf/pdfbuilder.py	2011-06-08 11:23:11.548136067 +0200
@@ -185,15 +185,15 @@
         if self.config.language:
             lang = self.config.language
             try:
-                self.docutils_languages[lang] = get_language(lang)
+                self.docutils_languages[lang] = get_language(lang, None)
             except ImportError:
                 try:
                     self.docutils_languages[lang] = \
-                         get_language(lang.split('_', 1)[0])
+                         get_language(lang.split('_', 1)[0], None)
                 except ImportError:
                     log.warning("Can't load Docutils module \
                         for language %s", lang)
-                langmod = languages.get_language('en')
+                langmod = languages.get_language('en', None)
 
         if self.opts.get('pdf_use_index',self.config.pdf_use_index):
             # Add index at the end of the document
@@ -530,17 +530,17 @@
         self.document.walkabout(visitor)
         self.docutils_languages = {}
         lang = self.config.language or 'en'
-        langmod = languages.get_language('en')
+        langmod = languages.get_language('en', None)
         try:
-            langmod = get_language(lang)
+            langmod = get_language(lang, None)
         except ImportError:
             try:
                 self.docutils_languages[lang] = \
-                    get_language(lang.split('_', 1)[0])
+                    get_language(lang.split('_', 1)[0], None)
             except ImportError:
                 log.warning("Can't load Docutils module "\
                     "for language %s", lang)
-                langmod = languages.get_language('en')
+                langmod = languages.get_language('en', None)
             
         # Generate Contents topic manually
         if self.use_toc: