# HG changeset patch # User Sylvain Thénault # Date 1320408215 -3600 # Node ID 11b6589352b606d66e5d7615cab8622dc110abcc # Parent 41398fa1a90fe237bf4dd9c8e2e338c4ed0ccdb5# Parent fcb2d83de8506ae6bc5f4ed5cda71fc3bfa194ae backport stable diff -r 41398fa1a90f -r 11b6589352b6 web/component.py --- a/web/component.py Thu Nov 03 16:01:41 2011 +0100 +++ b/web/component.py Fri Nov 04 13:03:35 2011 +0100 @@ -166,7 +166,7 @@ start = max(0, start - self.page_size) stop = start + self.page_size - 1 url = xml_escape(self.page_url(path, params, start, stop)) - return self.previous_page_link_templ % (url, title, content) + return self.previous_page_link_templ % (url, self._cw._(title), content) def next_link(self, path, params, content=None, title=_('next_results')): if not content: @@ -176,7 +176,7 @@ return self.no_next_page_link stop = start + self.page_size - 1 url = xml_escape(self.page_url(path, params, start, stop)) - return self.next_page_link_templ % (url, title, content) + return self.next_page_link_templ % (url, self._cw._(title), content) # new contextual components system ############################################# diff -r 41398fa1a90f -r 11b6589352b6 web/views/navigation.py --- a/web/views/navigation.py Thu Nov 03 16:01:41 2011 +0100 +++ b/web/views/navigation.py Fri Nov 04 13:03:35 2011 +0100 @@ -294,7 +294,7 @@ basepath = req.relative_path(includeparams=False) params['__force_display'] = 1 url = nav.page_url(basepath, params) - w(u'
%s
\n' + w(u'\n' % (xml_escape(url), req._('show %s results') % len(rset))) rset.limit(offset=start, limit=stop-start, inplace=True)