X-Git-Url: https://code.wpia.club/?p=motion.git;a=blobdiff_plain;f=motion.py;h=23d91f59ca1074e7e361f76dd8ec1dc763e5ca1a;hp=9326152ae8d99b9e96cea21005b0e2d5e35db293;hb=e6ca1be9954f155a7e96988793b5ab32ec3badda;hpb=2efb3a16046ae08c91b6096a42e8825337612356 diff --git a/motion.py b/motion.py index 9326152..23d91f5 100644 --- a/motion.py +++ b/motion.py @@ -9,7 +9,9 @@ import filters from flaskext.markdown import Markdown from markdown.extensions import Extension from datetime import date, time, datetime +from flask_language import Language, current_language import gettext +import click def get_db(): db = getattr(g, '_database', None) @@ -21,11 +23,13 @@ def get_db(): app = Flask(__name__) app.register_blueprint(filters.blueprint) babel = Babel(app) +lang = Language(app) 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()]) @@ -36,6 +40,7 @@ class default_settings(object): COPYRIGHTLINK="https://wpia.club" IMPRINTLINK="https://documents.wpia.club/imprint.html" DATAPROTECTIONLINK="https://documents.wpia.club/data_privacy_policy_html_pages_en.html" + MAX_PROXY=2 # Load config @@ -61,7 +66,21 @@ max_proxy=app.config.get("MAX_PROXY") @babel.localeselector def get_locale(): - return request.accept_languages.best_match(app.config['LANGUAGES'].keys()) + return str(current_language) + +@lang.allowed_languages +def get_allowed_languages(): + return app.config['LANGUAGES'].keys() + +@lang.default_language +def get_default_language(): + return 'en' + +def get_languages(): + return app.config['LANGUAGES'] + +# Manually add vote options to the translation strings. They are used as keys in loops. +TRANSLATION_STRINGS={_('yes'), _('no'), _('abstain')} @app.before_request def lookup_user(): @@ -85,11 +104,11 @@ def lookup_user(): roles = env.get("ROLES") if user is None: - return "Server misconfigured", 500 + return _('Server misconfigured'), 500 roles = roles.split(" ") if user == "": - return "Access denied", 403; + return _('Access denied'), 403; db = get_db() with db.xact(): @@ -245,7 +264,7 @@ def main(): else: prev = -1 return render_template('index.html', motions=rv[:10], more=rv[10]["id"] if len(rv) == 11 else None, times=times.per_host, prev=prev, - categories=get_allowed_cats("create"), singlemotion=False, may_proxyadmin=may_admin("proxyadmin")) + categories=get_allowed_cats("create"), singlemotion=False, may_proxyadmin=may_admin("proxyadmin"), languages=get_languages()) def rel_redirect(loc): r = redirect(loc) @@ -278,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("/") @@ -354,7 +376,7 @@ def show_motion(motion): if may("audit", resultmotion[0].get("type")) and not resultmotion[0].get("running") and not resultmotion[0].get("canceled"): votes = get_db().prepare("SELECT vote.result, voter.email FROM vote INNER JOIN voter ON voter.id = vote.voter_id WHERE vote.motion_id=$1")(resultmotion[0].get("id")); votes = get_db().prepare("SELECT vote.result, voter.email, CASE voter.email WHEN proxy.email THEN NULL ELSE proxy.email END as proxyemail FROM vote INNER JOIN voter ON voter.id = vote.voter_id INNER JOIN voter as proxy ON proxy.id = vote.proxy_id WHERE vote.motion_id=$1")(resultmotion[0].get("id")); - return render_template('single_motion.html', motion=resultmotion[0], may_vote=may("vote", resultmotion[0].get("type")), may_cancel=may("cancel", resultmotion[0].get("type")), votes=votes, proxyvote=resultproxyvote, proxyname=resultproxyname) + return render_template('single_motion.html', motion=resultmotion[0], may_vote=may("vote", resultmotion[0].get("type")), may_cancel=may("cancel", resultmotion[0].get("type")), votes=votes, proxyvote=resultproxyvote, proxyname=resultproxyname, languages=get_languages()) @app.route("/motion//vote/", methods=['POST']) @validate_motion_access_vote('vote') @@ -381,7 +403,7 @@ def vote(motion, voter, id): def proxy(): if not may_admin("proxyadmin"): return _('Forbidden'), 403 - return render_template('proxy.html', voters=get_voters(), proxies=get_all_proxies(), may_proxyadmin=may_admin("proxyadmin")) + return render_template('proxy.html', voters=get_voters(), proxies=get_all_proxies(), may_proxyadmin=may_admin("proxyadmin"), languages=get_languages()) @app.route("/proxy/add", methods=['POST']) def add_proxy(): @@ -404,8 +426,8 @@ def add_proxy(): return _('Error, proxy allready given.'), 400 rv = get_db().prepare("SELECT COUNT(id) as c FROM proxy WHERE proxy_id=$1 AND revoked is NULL GROUP BY proxy_id")(proxyid); if len(rv) != 0: - if rv[0].get("c") >= max_proxy: - return "Error, Max proxy for '%s' reached." % (proxy), 400 + if rv[0].get("c") is None or rv[0].get("c") >= max_proxy: + return _("Error, Max proxy for '%s' reached.") % (proxy), 400 rv = get_db().prepare("INSERT INTO proxy(voter_id, proxy_id, granted_by) VALUES ($1,$2,$3)")(voterid, proxyid, g.voter) return rel_redirect("/proxy") @@ -424,3 +446,19 @@ def revoke_proxy_all(): rv = get_db().prepare("UPDATE proxy SET revoked=CURRENT_TIMESTAMP, revoked_by=$1 WHERE revoked IS NULL")(g.voter) return rel_redirect("/proxy") +@app.route("/language/") +def set_language(language): + lang.change_language(language) + return rel_redirect("/") + +@app.cli.command("create-user") +@click.argument("email") +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) + if len(rv) == 0: + db.prepare("INSERT INTO voter(\"email\") VALUES($1)")(email) + messagetext=_("User '%s' inserted.") % (email) + click.echo(messagetext)