PR#171: Update the TODO file and some miscellaneous fixes - fedocal

Pierre-Yves Chibon • 5 years ago

ac04974

Pierre-Yves Chibon • 5 years ago

d5c108c

Pierre-Yves Chibon • 5 years ago

3d04882

fedocal/fedocallib/__init__.py

file modified

+3 -1

		`@@ -702,12 +702,14 @@`
		`if meeting.recursion_frequency and meeting.recursion_ends:`
		`newrule = rrule.rruleset()`
		`freq = meeting.recursion_frequency / 7`
		`+ recursion_ends = datetime.combine(`
		`+ meeting.recursion_ends, time(0)).replace(tzinfo=pytz.utc)`
		`newrule.rrule(`
		`rrule.rrule(`
		`freq=rrule.WEEKLY,`
		`interval=freq,`
		`dtstart=start.value,`
		`- until=meeting.recursion_ends))`
		`+ until=recursion_ends))`
		`entry.rruleset = newrule`

		`if reminder:`

fedocal/i18nforms.py

file modified

+6 -2

		`@@ -24,7 +24,11 @@`
		`MA 02110-1301, USA.`
		`"""`

		`- from flask.ext import wtf`
		`+ try:`
		`+ from flask_wtf import FlaskForm as FlaskForm`
		`+ except ImportError:`
		`+ from flask_wtf import Form as FlaskForm`
		`+`
		`from fedocal.fedocal_babel import gettext, ngettext`


		`@@ -40,7 +44,7 @@`
		`self.ngettext = ngettext`


		`- class Form(wtf.Form):`
		`+ class Form(FlaskForm):`
		`"""I18n form"""`
		`def _get_translations(self):`
		`"""I18n form translation"""`