Changeset 3303

Timestamp:

01/28/08 19:36:24 (16 years ago)

Author:

jerome

Message:

PDF generation routines now use unicode everywhere.
Ensure translations are used for PDF document's titles and subjects.

Location:

pykota/trunk/bin

Files:

• pkbanner (modified) (3 diffs)
• pkinvoice (modified) (3 diffs)
• pkrefund (modified) (3 diffs)

pykota/trunk/bin/pkbanner

@@ -49 +49 @@
 from pykota.errors import PyKotaToolError, PyKotaCommandLineError
 from pykota.tool import Tool
+from pykota import version
 
 __doc__ = N_("""pkbanner v%(__version__)s (c) %(__years__)s %(__author__)s
@@ -122 +123 @@
         canvas.setFillColorRGB(r, g, b)
         message = "%s :" % _(label)
-        canvas.drawRightString(x, y, self.userCharsetToUTF8(message))
+        canvas.drawRightString(x, y, message)
         canvas.setFont("Courier-Bold", size)
         (r, g, b) =  [ color + (savetoner * (1.0 - color)) for color in (1, 0, 0) ] # Red * savetoner
         canvas.setFillColorRGB(r, g, b)
-        canvas.drawString(x + 0.5*cm, y, self.userCharsetToUTF8(value))
+        canvas.drawString(x + 0.5*cm, y, value)
         canvas.restoreState()
         return (size + 4)
@@ -135 +136 @@
         c = canvas.Canvas(document, pagesize=pagesize, pageCompression=1)
         
-        c.setAuthor("Jerome Alet")
-        c.setTitle("PyKota generated Banner")
-        c.setSubject("This is a print banner generated with PyKota")
+        c.setAuthor(self.effectiveUserName)
+        c.setTitle(_("PyKota generated Banner"))
+        c.setSubject(_("This is a print banner generated with PyKota"))
         
         xcenter = pagesize[0] / 2.0

pykota/trunk/bin/pkinvoice

@@ -163 +163 @@
         self.canvas.setFont("Helvetica-Bold", size)
         self.canvas.setFillColorRGB(0, 0, 0)
-        self.canvas.drawRightString(xcenter, self.ypos, "%s :" % self.userCharsetToUTF8(label))
+        self.canvas.drawRightString(xcenter, self.ypos, "%s :" % label)
         self.canvas.setFont("Courier-Bold", size)
         self.canvas.setFillColorRGB(0, 0, 1)
-        self.canvas.drawString(xcenter + 0.5*cm, self.ypos, self.userCharsetToUTF8(value))
+        self.canvas.drawString(xcenter + 0.5*cm, self.ypos, value)
         self.canvas.restoreState()
         self.ypos -= (size + 4)
@@ -203 +203 @@
         
         c.setAuthor(self.effectiveUserName)
-        c.setTitle("PyKota invoices")
-        c.setSubject("Invoices generated with PyKota")
+        c.setTitle(_("PyKota invoices"))
+        c.setSubject(_("Invoices generated with PyKota"))
         
         self.canvas.beginForm("background")
@@ -231 +231 @@
         self.canvas.setFillColorRGB(0, 0, 0)
         msg = _("Here's the invoice for your printouts")
-        self.canvas.drawCentredString(xcenter, self.ypos, "%s :" % self.userCharsetToUTF8(msg))
+        self.canvas.drawCentredString(xcenter, self.ypos, "%s :" % msg)
         
         self.yorigine = self.ypos

pykota/trunk/bin/pkrefund

@@ -179 +179 @@
         self.canvas.setFont("Helvetica-Bold", size)
         self.canvas.setFillColorRGB(0, 0, 0)
-        self.canvas.drawRightString(xcenter, self.ypos, "%s :" % self.userCharsetToUTF8(label))
+        self.canvas.drawRightString(xcenter, self.ypos, "%s :" % label)
         self.canvas.setFont("Courier-Bold", size)
         self.canvas.setFillColorRGB(0, 0, 1)
-        self.canvas.drawString(xcenter + 0.5*cm, self.ypos, self.userCharsetToUTF8(value))
+        self.canvas.drawString(xcenter + 0.5*cm, self.ypos, value)
         self.canvas.restoreState()
         self.ypos -= (size + 4)
@@ -214 +214 @@
         
         c.setAuthor(self.effectiveUserName)
-        c.setTitle("PyKota print job refunding receipts")
-        c.setSubject("Print job refunding receipts generated with PyKota")
+        c.setTitle(_("PyKota print job refunding receipts"))
+        c.setSubject(_("Print job refunding receipts generated with PyKota"))
         
         self.canvas.beginForm("background")
@@ -242 +242 @@
         self.canvas.setFillColorRGB(0, 0, 0)
         msg = _("Here's the receipt for the refunding of your print jobs")
-        self.canvas.drawCentredString(xcenter, self.ypos, "%s :" % self.userCharsetToUTF8(msg))
+        self.canvas.drawCentredString(xcenter, self.ypos, "%s :" % msg)
         
         self.yorigine = self.ypos