Prise en compte de la nouvelle signature de « translate » et prise en charge des...

[photoprint.git] / price.py

diff --git a/price.py b/price.py
index f04e063..dae05fb 100755 (executable)
--- a/price.py
+++ b/price.py
@@ -11,15 +11,15 @@
 """
 Pricing types
 
 """
 Pricing types
 

-$Id: price.py 834 2009-03-28 15:11:54Z pin $
-$URL: http://svn.luxia.fr/svn/labo/projects/zope/photoprint/trunk/price.py $
+
+

 """
 
 from Globals import Persistent
 from AccessControl import ModuleSecurityInfo
 from utils import Message as _
 from utils import translate
 """
 
 from Globals import Persistent
 from AccessControl import ModuleSecurityInfo
 from utils import Message as _
 from utils import translate

-from Products.globalrequest import getRequest
+from zope.globalrequest import getRequest

 
 msecurity = ModuleSecurityInfo('Products.photoprint.price')
 msecurity.declarePublic('Price')
 
 msecurity = ModuleSecurityInfo('Products.photoprint.price')
 msecurity.declarePublic('Price')


@@ -70,7 +70,7 @@ class Price(object, Persistent) :
                        n = str(round(n, 2))
                        i, d = n.split('.')
                        ds = _(u'${i}.${d}', mapping={'i':i, 'd':d}, default=n)
                        n = str(round(n, 2))
                        i, d = n.split('.')
                        ds = _(u'${i}.${d}', mapping={'i':i, 'd':d}, default=n)

-                       return  translate(ds, getRequest()).encode('utf-8')
+                       return  translate(ds).encode('utf-8')

        
        def getValues(self) :
                values = {'value':self._price,
        
        def getValues(self) :
                values = {'value':self._price,