Mise à jour (msgmerge) du fichier de localisation de CMF avec la version actuelle.

[Plinn.git] / skins / generic / batch_macros.pt

diff --git a/skins/generic/batch_macros.pt b/skins/generic/batch_macros.pt
index f5dedc1..b753a16 100644 (file)
--- a/skins/generic/batch_macros.pt
+++ b/skins/generic/batch_macros.pt
@@ -8,28 +8,28 @@
 <div class="listingBar"
      metal:define-macro="navigation"
      tal:define="request request|here/request|container/request|nothing;
 <div class="listingBar"
      metal:define-macro="navigation"
      tal:define="request request|here/request|container/request|nothing;

-                 form python:request.form.copy();
+                 form form|request/form/copy;

                  dummy python:form.has_key('ajax') and form.pop('ajax');
                  batch batch|nothing;
                  mq python:modules['ZTUtils'].make_query;
                  mpq python:lambda fv,pn=-1 : mq(fv, {batch.b_start_str : pn * (batch.size - batch.overlap) - batch.size}) ;
                  dummy python:form.has_key('ajax') and form.pop('ajax');
                  batch batch|nothing;
                  mq python:modules['ZTUtils'].make_query;
                  mpq python:lambda fv,pn=-1 : mq(fv, {batch.b_start_str : pn * (batch.size - batch.overlap) - batch.size}) ;

-                 url python:request.get('URL0');
+                 url python:options.get('batchBaseUrl', request.get('URL0'));

                  currentpage batch/pagenumber;"
      tal:attributes="id navBatchBarId|nothing"
      tal:condition="python: batch.next or  batch.previous"
      i18n:domain="plinn">
 
     <a href="" class="previous"
                  currentpage batch/pagenumber;"
      tal:attributes="id navBatchBarId|nothing"
      tal:condition="python: batch.next or  batch.previous"
      i18n:domain="plinn">
 
     <a href="" class="previous"

-        tal:define="p batch/previous | nothing"
-                        tal:attributes="href python: '%s?%s' % (url , mq( form, {batch.b_start_str:p.first} ))"
-                        tal:condition="p">
-       &laquo;&nbsp;<span i18n:translate="batch_previous_x_items" tal:omit-tag="">Previous<span i18n:name="number" tal:content="p/length" tal:omit-tag="">n</span></span>
+       tal:define="p batch/previous | nothing"
+       tal:attributes="href python: '%s?%s' % (url , mq( form, {batch.b_start_str:p.first} ))"
+       tal:condition="p">
+       « <span i18n:translate="batch_previous_x_items" tal:omit-tag="">previous <span i18n:name="number" tal:content="p/length" tal:omit-tag="">n</span></span>

     </a>
     <a href="" class="next"
        tal:define="n batch/next | nothing"
        tal:condition="n"
         tal:attributes="href python: '%s?%s' % (url , mq( form, {batch.b_start_str:n.first} ))">
     </a>
     <a href="" class="next"
        tal:define="n batch/next | nothing"
        tal:condition="n"
         tal:attributes="href python: '%s?%s' % (url , mq( form, {batch.b_start_str:n.first} ))">

-       <span i18n:translate="batch_next_x_items" tal:omit-tag="">Next<span i18n:name="number" tal:content="n/length">n</span>items</span>&nbsp;&raquo;
+       <span i18n:translate="batch_next_x_items" tal:omit-tag="">next <span i18n:name="number" tal:content="n/length">n</span></span> »

     </a>
 
     <span tal:condition="python: 1 not in batch.navlist">
     </a>
 
     <span tal:condition="python: 1 not in batch.navlist">