Support nouvelle signature de la fonction « translate ».

diff --git a/skins/order_cancel_form.pt b/skins/order_cancel_form.pt
index b976045aa6e4f0721fd463f579eb170a4020bbb2..8f37263e56e763827d255581b1d15ca58368cde3 100644 (file)
--- a/skins/order_cancel_form.pt
+++ b/skins/order_cancel_form.pt
@@ -24,7 +24,7 @@
             <td tal:define="_ python:modules['Products.photoprint.utils'].translate">
               <input type="text" size="58"
                 name="subject"
             <td tal:define="_ python:modules['Products.photoprint.utils'].translate">
               <input type="text" size="58"
                 name="subject"

-                tal:attributes="value python:_('[%s] order %s canceling notification', here) % (here.portal_photo_print.store_name, here.getId())"/>
+                tal:attributes="value python:_('[%s] order %s canceling notification') % (here.portal_photo_print.store_name, here.getId())"/>

             </td>
           </tr>
           <tr>
             </td>
           </tr>
           <tr>


@@ -48,7 +48,7 @@
               <label tal:repeat="member python:mtool.getMembers(here.listCreators())">
                 <input type="checkbox" name="recipients:list" tal:attributes="value member/id" checked="checked" />
                 <span tal:replace="member/getMemberFullName">Membre full name</span>
               <label tal:repeat="member python:mtool.getMembers(here.listCreators())">
                 <input type="checkbox" name="recipients:list" tal:attributes="value member/id" checked="checked" />
                 <span tal:replace="member/getMemberFullName">Membre full name</span>

-                &lt;<span tal:replace="member/email">member email</span>&gt;
+                &lt;<span tal:replace="python:member.getProperty('email')">member email</span>&gt;

               </label>
             </td>
           </tr>
               </label>
             </td>
           </tr>

diff --git a/skins/order_view_template.pt b/skins/order_view_template.pt
index f3ba7d18c62e6bdd36d39dce175f36d78f266b3e..0678456d6f24f2565ce09e5ae07593f17eac28c2 100644 (file)
--- a/skins/order_view_template.pt
+++ b/skins/order_view_template.pt
@@ -75,8 +75,7 @@
             </table>
           </td>
           <td>
             </table>
           </td>
           <td>

-            <img tal:define="translate nocall:modules/Products/photoprint/utils/translate;
-                             tr python:lambda msg: translate(msg, here)"
+            <img tal:define="tr nocall:modules/Products/photoprint/utils/translate"

                  tal:attributes="src python:'%s/order_states/%s' % (portal_url, tr('%s-en.gif' % options['wfstate']))"
                  style="float:right"/>
           </td>
                  tal:attributes="src python:'%s/order_states/%s' % (portal_url, tr('%s-en.gif' % options['wfstate']))"
                  style="float:right"/>
           </td>

diff --git a/skins/photoprint_templates_edit_form.py b/skins/photoprint_templates_edit_form.py
index 94851be2f24ae797b0326717f1a08f55cc4a1a07..b70ce310d5886dee42dac76504dcb69586d8bce9 100755 (executable)
--- a/skins/photoprint_templates_edit_form.py
+++ b/skins/photoprint_templates_edit_form.py
@@ -1,7 +1,6 @@
 ##parameters=addTemplate='', edit='', deleteOptionContainer='', createOptionsContainer=''
 from Products.CMFCore.utils import getToolByName
 ##parameters=addTemplate='', edit='', deleteOptionContainer='', createOptionsContainer=''
 from Products.CMFCore.utils import getToolByName

-from Products.photoprint.utils import translate
-_ = lambda msg : translate(msg, context)
+from Products.photoprint.utils import translate as _

 
 utool = getToolByName(context, 'portal_url')
 pptool = getToolByName(context, 'portal_photo_print')
 
 utool = getToolByName(context, 'portal_url')
 pptool = getToolByName(context, 'portal_photo_print')