Language-specific cover pages

patch for the template to provide the additional language field

Cumulative patch to evaluate the language from the patched form, incl. patch from #4747 (PS+HTML output) and #4696 (titlefile keyword)

Cumulative patch to evaluate the language from the patched form, incl. patch from #4747 (PS+HTML output) and #4696 (titlefile keyword)

Cumulative patch to evaluate the language from the patched form, incl. patch from #4747 (PS+HTML output) and #4696 (titlefile keyword)

Sorry - somehow the server messes things up, I was not able to add the second patch correctly :(

Cumulative patch to evaluate the language from the patched form, incl. patch from #4747 (PS+HTML output) and #4696 (titlefile keyword)

Since the server does not store the uploaded diff, please copy and paste it from here:

--- formats.py.orig     2009-04-13 14:21:29.000000000 +0200
+++ formats.py  2009-04-13 14:43:06.000000000 +0200
@@ -24,12 +24,6 @@
 from api import IWikiToPdfFormat
 from wikitopdf import wiki_to_pdf, html_to_pdf

 class WikiToPdfOutput(Component):
     """Output wiki pages as a PDF/PS document using HTMLDOC."""

@@ -37,8 +31,10 @@

     def wikitopdf_formats(self, req):
         yield 'pdf', 'PDF'
+        yield 'ps', 'PS'
+        yield 'html', 'HTML'

-    def process_wikitopdf(self, req, format, title, subject, pages, version, date, pdfname):
+    def process_wikitopdf(self, req, format, title, subject, pages, version, date, pdfname, lang):

         os.system("rm -f /tmp/tmp*wikitopdf")

@@ -46,13 +42,19 @@
         files = [self._page_to_file('', req, p) for p in pages]

         #Setup the title and license pages
-        title_template = self.env.config.get('wikitopdf', 'pathtocover') + '/cover.html'
+       if lang: title_template = self.env.config.get('wikitopdf', 'titlefile') + '/cover.html' + '.' + lang
+       else:    title_template = self.env.config.get('wikitopdf', 'titlefile') + '/cover.html'
         titlefile = title_template and self.get_titlepage(title_template, title, subject, date, version) or None

+        if titlefile: tfile = titlefile
+       else: tfile = 'none'
+        self.log.debug('WikiToPdf => Using template %s and titlefile %s', title_template, tfile)
+
         # Prepare html doc arguments
         codepage = self.env.config.get('trac', 'default_charset', 'iso-8859-1')

-        htmldoc_args = { 'book': '', 'format': 'pdf14', 'charset': codepage }
+       oformat = { 'pdf':'pdf14', 'ps':'ps2', 'html':'html'}[format]
+        htmldoc_args = { 'book': '', 'format': oformat, 'charset': codepage }

         if titlefile: htmldoc_args['titlefile'] = titlefile
         else: htmldoc_args['no-title'] = ''
@@ -68,8 +70,8 @@

         # Send the output
         req.send_response(200)
-        req.send_header('Content-Type', {'pdf':'application/pdf', 'ps':'application/postscript'}[format])
-        req.send_header('Content-Disposition', 'attachment; filename=' + pdfname + '.pdf')
+        req.send_header('Content-Type', {'pdf':'application/pdf', 'ps':'application/postscript', 'html':'text/html'}[format])
+        req.send_header('Content-Disposition', 'attachment; filename=' + pdfname + {'pdf':'.pdf', 'ps':'.ps', 'html': '.html'}[format])
         req.send_header('Content-Length', len(out))
         req.end_headers()
         req.write(out)
@@ -94,6 +96,8 @@

     def get_titlepage(self, template_path, title, subject, version, date):

+        self.log.debug('WikiToPdf => Getting titlepage for tplpath "%s", title "%s", subject "%s", version "%s", date "%s"', template_path,title,subject,version,date)
+
         hfile, hfilename = mkstemp('wikitopdf')
         #codepage = Mimeview(self.env).default_charset
        string_page = ''
@@ -105,7 +109,7 @@
             string_page = string_page.replace('#SUBJECT#', subject)
             string_page = string_page.replace('#VERSION#', version)
             string_page = string_page.replace('#DATE#', date)
-           string_page = string_page.replace('#PATHTOCOVER#',  self.env.config.get('wikitopdf', 'pathtocover'))
+           string_page = string_page.replace('#PATHTOCOVER#',  self.env.config.get('wikitopdf', 'titlefile'))
         except:
             os.close(hfile)
             return None

Cumulative patch to evaluate the language from the patched form, incl. patch from #4747 (PS+HTML output) and #4696 (titlefile keyword)

Could you provide a clean patch?

So just what's left, you mean, right? titlefile you've got already fixed AFAIR, multiformat as well - so all you need is a patch for the multilang stuff? Please confirm - and I will try to create it ASAP (I'm quite busy recently, so not that much time anymore - please fogive my delay).

Yes, just the patch for the multi-language stuff. Don't worry about delay, since I think almost all of us are doing this in our spare time.

OK, thanks. First: The attached patch admin_wikitopdf.cs.lang.patch can be used for the template (it includes nothing else). Unfortunately, I no longer have my test server available to try out the latest version and create a clean patch for the remaining things (I don't want to try on my production server), so I can just "quote" the changes here (as taken from above code):

def process_wikitopdf(self, req, format, title, subject, pages, version, date, pdfname, lang):
  // ...
       #Setup the title and license pages
       //title_template = self.env.config.get('wikitopdf', 'pathtocover') + '/cover.html'
       if lang: title_template = self.env.config.get('wikitopdf', 'titlefile') + '/cover.html' + '.' + lang
       else:    title_template = self.env.config.get('wikitopdf', 'titlefile') + '/cover.html'
       titlefile = title_template and self.get_titlepage(title_template, title, subject, date, version) or None
  // ...

That's all that must be done, AFAIR (i.e.: Adding the lang parameter to the function call, and replacing the one line setting up the title_template by the two lines doing that conditionally). Optionally, for a "cleaner design", there could be some error-checking included if a language was specified but no corresponding language file found, to fall back to the "old behaviour" and use cover.html without a language suffix.

Patch for the formats.py file

patch for web_ui.py

Sorry for the delay. Working on the other issue (see #5915) I set up another test Trac, so I finally could create and attach the two missing patches. They apply fine against the latest repo code. So all you need for multi-lang support here is:

• admin_wikitopdf.cs.lang.patch
• formats.py.lang.diff
• web_ui.py.lang.diff

The names suggest where they belong to :) After that, one just creates language-specific cover pages like e.g. cover.html.de, and in the web form put "de" in the appropriate field to use it.

Once you applied them to the repo code, this ticket can be closed :)