X-Git-Url: https://code.wpia.club/?p=motion.git;a=blobdiff_plain;f=motion.py;h=23d91f59ca1074e7e361f76dd8ec1dc763e5ca1a;hp=1f276e193bdcfee73c5e555253171a90b38cd528;hb=e6ca1be9954f155a7e96988793b5ab32ec3badda;hpb=d4e0c331afc48405981dea20b0311b50d7e075a3 diff --git a/motion.py b/motion.py index 1f276e1..23d91f5 100644 --- a/motion.py +++ b/motion.py @@ -29,6 +29,7 @@ gettext.install('motion') class EscapeHtml(Extension): def extendMarkdown(self, md, md_globals): del md.preprocessors['html_block'] + del md.postprocessors['raw_html'] del md.inlinePatterns['html'] md = Markdown(app, extensions=[EscapeHtml()]) @@ -296,7 +297,10 @@ def put_motion(): if len(sr) == 0 or sr[0][0] is None: ident=prefix.per_host[cat]+"."+t.strftime("%Y%m%d")+".001" else: - ident=prefix.per_host[cat]+"."+t.strftime("%Y%m%d")+"."+("%03d" % (int(sr[0][0].split(".")[2])+1)) + nextId = int(sr[0][0].split(".")[2])+1 + if nextId >= 1000: + return _('Too many motions for this day'), 500 + ident=prefix.per_host[cat]+"."+t.strftime("%Y%m%d")+"."+("%03d" % nextId) p = db.prepare("INSERT INTO motion(\"name\", \"content\", \"deadline\", \"posed_by\", \"type\", \"identifier\", \"host\") VALUES($1, $2, CURRENT_TIMESTAMP + $3 * interval '1 days', $4, $5, $6, $7)") p(title, content, time, g.voter, cat, ident, request.host) return rel_redirect("/") @@ -453,8 +457,8 @@ def create_user(email): db = get_db() with db.xact(): rv = db.prepare("SELECT id FROM voter WHERE lower(email)=lower($1)")(email) - messagetext="User '%s' already exists." % (email) + messagetext=_("User '%s' already exists.") % (email) if len(rv) == 0: db.prepare("INSERT INTO voter(\"email\") VALUES($1)")(email) - messagetext="User '%s' inserted." % (email) + messagetext=_("User '%s' inserted.") % (email) click.echo(messagetext)