Changeset 950

Timestamp:

04/23/03 11:58:17 (22 years ago)

Author:

jalet

Message:

Prices per page/job are now displayed

Location:

pykota/trunk

Files:

• bin/repykota (modified) (2 diffs)
• NEWS (modified) (1 diff)
• po/en/pykota.po (modified) (3 diffs)
• po/fr/pykota.mo (modified) (previous)
• po/fr/pykota.po (modified) (3 diffs)
• po/pykota.pot (modified) (3 diffs)
• pykota/version.py (modified) (1 diff)

pykota/trunk/bin/repykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.31  2003/04/23 09:58:17  jalet
+# Prices per page/job are now displayed
+#
 # Revision 1.30  2003/04/18 08:34:51  jalet
 # Minor fix.
@@ -187 +190 @@
         for (printerid, printer) in printers :
             print _("*** Report for %s quota on printer %s") % ((options["groups"] and "group") or "user", printer)
-            print _("Pages grace time: %idays") % self.config.getGraceDelay(printer)
+            print _("Pages grace time: %i days") % self.config.getGraceDelay(printer)
+            prices = self.storage.getPrinterPrices(printerid)
+            if prices is None :
+                (perpage, perjob) = None
+            else :    
+                (perpage, perjob) = prices
+                if perjob is not None :
+                    print _("Price per job: %.3f") % perjob
+                if perpage is not None :    
+                    print _("Price per page: %.3f") % perpage
             total = 0
             totalmoney = 0.0

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.04pre1 :
+    
+        - repykota now displays prices per job and per page for each
+          printer, if they are defined.
+          
     - 1.04pre0 :
     

pykota/trunk/po/en/pykota.po

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.20  2003/04/23 09:58:17  jalet
+# Prices per page/job are now displayed
+#
 # Revision 1.19  2003/04/17 09:26:21  jalet
 # repykota now reports account balances too.
@@ -112 +115 @@
 msgstr ""
 
-msgid "Pages grace time: %idays"
+msgid "Pages grace time: %i days"
 msgstr ""
 
@@ -310 +313 @@
 msgid "Totals may be inaccurate if some users are members of several groups."
 msgstr ""
+
+msgid "Price per job: %.3f"
+msgstr ""
+
+msgid "Price per page: %.3f"
+msgstr ""

pykota/trunk/po/fr/pykota.po

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.19  2003/04/23 09:58:17  jalet
+# Prices per page/job are now displayed
+#
 # Revision 1.18  2003/04/17 09:32:13  jalet
 # Translation
@@ -119 +122 @@
 msgstr "l'option --groups n'est pas encore impl�nt�"
 
-msgid "Pages grace time: %idays"
-msgstr "D�i de gr�: %ijours"
+msgid "Pages grace time: %i days"
+msgstr "D�i de gr�: %i jours"
 
 msgid "unused arguments [%s]. Aborting."
@@ -323 +326 @@
 msgid "Totals may be inaccurate if some users are members of several groups."
 msgstr "Les totaux peuvent �e faux si des utilisateurs sont dans plusieurs groupes."
+
+msgid "Price per job: %.3f"
+msgstr "Prix par job: %.3f"
+
+msgid "Price per page: %.3f"
+msgstr "Prix par page: %.3f"

pykota/trunk/po/pykota.pot

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.20  2003/04/23 09:58:17  jalet
+# Prices per page/job are now displayed
+#
 # Revision 1.19  2003/04/17 09:26:21  jalet
 # repykota now reports account balances too.
@@ -112 +115 @@
 msgstr ""
 
-msgid "Pages grace time: %idays"
+msgid "Pages grace time: %i days"
 msgstr ""
 
@@ -310 +313 @@
 msgid "Totals may be inaccurate if some users are members of several groups."
 msgstr ""
+
+msgid "Price per job: %.3f"
+msgstr ""
+
+msgid "Price per page: %.3f"
+msgstr ""

pykota/trunk/pykota/version.py

@@ -21 +21 @@
 #
 
-__version__ = "1.04pre0-unofficial"
+__version__ = "1.04pre1-unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS."""