From 0847c79aec7bf2137258bc245fa03dbd6acab8bd Mon Sep 17 00:00:00 2001 From: Antoine Durand-Gasselin Date: Wed, 29 Apr 2009 04:02:22 +0200 Subject: [PATCH] =?UTF-8?q?[wiki/macro/EventCalendar.py]=20on=20aspire=20?= =?UTF-8?q?=C3=A0=20la=20conformit=C3=A9=20=20HTML4.01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit darcs-hash:20090429020222-bd074-8fed01b5be8da5f4d851f2a27bb548e0eccf8296.gz --- wiki/macro/EventCalendar.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/wiki/macro/EventCalendar.py b/wiki/macro/EventCalendar.py index f53e5ce9..eda4cb3d 100644 --- a/wiki/macro/EventCalendar.py +++ b/wiki/macro/EventCalendar.py @@ -550,10 +550,10 @@ def getquerystring(req_fields): if not tmp_form_vals.has_key('prevcalaction'): m_query.append(u'%s=%s' % ('prevcalaction', tmp_form_vals['calaction']) ) - m_query = u'&'.join(m_query) + m_query = u'&'.join(m_query) if m_query: - m_query = '&%s' % m_query + m_query = '&%s' % m_query return m_query @@ -581,7 +581,7 @@ def showmenubar(): # Go Today year, month, day = gettodaydate() - mnu_curmonthcal = u'[Aujourd\'hui]' % (page_url, cal_action, year, month, day, getquerystring(['numcal'])) + mnu_curmonthcal = u'[Aujourd\'hui]' % (page_url, cal_action, year, month, day, getquerystring(['numcal'])) # List View mnu_listview = u'[Liste]' % (page_url, getquerystring(['caldate', 'numcal'])) @@ -2355,7 +2355,7 @@ def converttext(targettext): # Converts some special characters of html to plain-text style # What else to handle? - targettext = targettext.replace(u'&', '&') + targettext = targettext.replace(u'&', '&') targettext = targettext.replace(u'>', '>') targettext = targettext.replace(u'<', '<') targettext = targettext.replace(u'\n', '
') @@ -3347,9 +3347,9 @@ def calhead_yearmonth(year, month, headclass): nextyear, nextmonth = yearmonthplusoffset(year, month, 1) prevyear, prevmonth = yearmonthplusoffset(year, month, -1) - prevlink = u'%s?calaction=%s&caldate=%d%02d%s' % (page_url, cal_action, prevyear, prevmonth, getquerystring(['numcal']) ) - nextlink = u'%s?calaction=%s&caldate=%d%02d%s' % (page_url, cal_action, nextyear, nextmonth, getquerystring(['numcal'])) - curlink = u'%s?calaction=%s&caldate=%d%02d%s' % (page_url, cal_action, year, month, getquerystring(['numcal'])) + prevlink = u'%s?calaction=%s&caldate=%d%02d%s' % (page_url, cal_action, prevyear, prevmonth, getquerystring(['numcal']) ) + nextlink = u'%s?calaction=%s&caldate=%d%02d%s' % (page_url, cal_action, nextyear, nextmonth, getquerystring(['numcal'])) + curlink = u'%s?calaction=%s&caldate=%d%02d%s' % (page_url, cal_action, year, month, getquerystring(['numcal'])) if monthstyle_us: stryearmonth = u'%s %d' % (months[month-1], year) @@ -3389,9 +3389,9 @@ def calhead_yearmonthday(year, month, day, headclass, colspan): prevdate = date_today - datetime.timedelta(days=1) nextdate = date_today + datetime.timedelta(days=1) - prevlink = u'%s?calaction=%s&caldate=%d%02d%02d%s' % (page_url, cal_action, prevdate.year, prevdate.month, prevdate.day, getquerystring(['numcal']) ) - nextlink = u'%s?calaction=%s&caldate=%d%02d%02d%s' % (page_url, cal_action, nextdate.year, nextdate.month, nextdate.day, getquerystring(['numcal'])) - curlink = u'%s?calaction=%s&caldate=%d%02d%02d%s' % (page_url, cal_action, year, month, day, getquerystring(['numcal'])) + prevlink = u'%s?calaction=%s&caldate=%d%02d%02d%s' % (page_url, cal_action, prevdate.year, prevdate.month, prevdate.day, getquerystring(['numcal']) ) + nextlink = u'%s?calaction=%s&caldate=%d%02d%02d%s' % (page_url, cal_action, nextdate.year, nextdate.month, nextdate.day, getquerystring(['numcal'])) + curlink = u'%s?calaction=%s&caldate=%d%02d%02d%s' % (page_url, cal_action, year, month, day, getquerystring(['numcal'])) if monthstyle_us: stryearmonth = u'%s %d, %d' % (months[month-1], day, year) @@ -3446,9 +3446,9 @@ def calhead_yearmonthday2(year, month, day, headclass, colspan): prevdate_l = last_date_week - datetime.timedelta(days=7) nextdate_l = last_date_week + datetime.timedelta(days=7) - prevlink = u'%s?calaction=%s&caldate=%d%02d%02d%s' % (page_url, cal_action, prevdate.year, prevdate.month, prevdate.day, getquerystring(['numcal']) ) - nextlink = u'%s?calaction=%s&caldate=%d%02d%02d%s' % (page_url, cal_action, nextdate.year, nextdate.month, nextdate.day, getquerystring(['numcal'])) - curlink = u'%s?calaction=%s&caldate=%d%02d%02d%s' % (page_url, cal_action, year, month, day, getquerystring(['numcal'])) + prevlink = u'%s?calaction=%s&caldate=%d%02d%02d%s' % (page_url, cal_action, prevdate.year, prevdate.month, prevdate.day, getquerystring(['numcal']) ) + nextlink = u'%s?calaction=%s&caldate=%d%02d%02d%s' % (page_url, cal_action, nextdate.year, nextdate.month, nextdate.day, getquerystring(['numcal'])) + curlink = u'%s?calaction=%s&caldate=%d%02d%02d%s' % (page_url, cal_action, year, month, day, getquerystring(['numcal'])) if monthstyle_us: stryearmonth = u'%s %d, %d ~ %s %d, %d' % (months[first_date_week.month-1], first_date_week.day, first_date_week.year, months[last_date_week.month-1], last_date_week.day, last_date_week.year) @@ -3572,7 +3572,7 @@ def calhead_day(year, month, day, wkday): html_text = u'%s' % day page_url = Globs.pageurl - html_text = u'%s' % (page_url, year, month, day, html_text) + html_text = u'%s' % (page_url, year, month, day, html_text) cyear, cmonth, cday = gettodaydate()