changeset 625:42958bb7e500

fix MonthCalendar macro for non-ascii page names, update CHANGES
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sat, 06 May 2006 17:59:03 +0200
parents 8cfff674409f
children 50c7a0cc1791
files MoinMoin/macro/MonthCalendar.py docs/CHANGES
diffstat 2 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/macro/MonthCalendar.py	Sat May 06 14:36:23 2006 +0200
+++ b/MoinMoin/macro/MonthCalendar.py	Sat May 06 17:59:03 2006 +0200
@@ -311,11 +311,11 @@
     p = Page(request, thispage)
     qpagenames = '*'.join(map(wikiutil.quoteWikinameURL, parmpagename))
     qtemplate = wikiutil.quoteWikinameURL(parmtemplate)
-    querystr = "calparms=%s,%d,%d,%d,%%d,%s" % (qpagenames, parmyear, parmmonth, parmoffset, qtemplate)
-    prevlink  = p.url(request, querystr % (parmoffset2 - 1), 0)
-    nextlink  = p.url(request, querystr % (parmoffset2 + 1), 0)
-    prevylink = p.url(request, querystr % (parmoffset2 - 12), 0)
-    nextylink = p.url(request, querystr % (parmoffset2 + 12), 0)
+    querystr = "calparms=%%s,%d,%d,%d,%%d,%%s" % (parmyear, parmmonth, parmoffset)
+    prevlink  = p.url(request, querystr % (qpagenames, parmoffset2 - 1, qtemplate), 0)
+    nextlink  = p.url(request, querystr % (qpagenames, parmoffset2 + 1, qtemplate), 0)
+    prevylink = p.url(request, querystr % (qpagenames, parmoffset2 - 12, qtemplate), 0)
+    nextylink = p.url(request, querystr % (qpagenames, parmoffset2 + 12, qtemplate), 0)
     prevmonth = formatter.url(1, prevlink, 'cal-link') + '&lt;' + formatter.url(0)
     nextmonth = formatter.url(1, nextlink, 'cal-link') + '&gt;' + formatter.url(0)
     prevyear  = formatter.url(1, prevylink, 'cal-link') + '&lt;&lt;' + formatter.url(0)
--- a/docs/CHANGES	Sat May 06 14:36:23 2006 +0200
+++ b/docs/CHANGES	Sat May 06 17:59:03 2006 +0200
@@ -33,6 +33,11 @@
     * We switched to Mercurial SCM, see here for more infos:
       http://moinmoin.wikiwikiweb.de/MoinDev/MercurialGuide
 
+  Bugfixes:
+    * fix MonthCalendar macro for non-ASCII pagenames (thanks to Jonas Smedegaard)
+    * remove 'search' and 'google' from bot user agent list and add some more
+      specific terms
+
 Version 1.5.3:
   New Features:
     * Added CSS classes for TableOfContents macro.