# HG changeset patch # User Dennis Fink # Date 2015-10-28 01:08:12 # Node ID 1e9bc98a5eec8bf73ebb4019d612828807775cf3 # Parent 2fa1557d478ecf8208bdb0fc91fdebad9f650db5 # Parent d31c8347ebe6ce00185b73ba9331711b7ed85e42 Merged dev diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -23,7 +23,7 @@ TOC - `Feature Requests`_ - `Pull Requests`_ -_ Authors_ +- Authors_ - `Development Lead`_ - `Contributors`_ diff --git a/dev-requirements.txt b/dev-requirements.txt --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -14,6 +14,6 @@ jinja2==2.8 # via flask, s markupsafe==0.23 # via jinja2 pip-tools==1.1.3 pygments==2.0.2 # via sphinx -six==1.9.0 # via pip-tools +six==1.10.0 # via pip-tools Sphinx==1.2.3 werkzeug==0.10.4 # via flask diff --git a/ennstatus/donate/views.py b/ennstatus/donate/views.py --- a/ennstatus/donate/views.py +++ b/ennstatus/donate/views.py @@ -14,10 +14,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from decimal import Decimal from flask import (Blueprint, render_template, request, redirect, url_for, current_app) +from babel.numbers import parse_decimal, format_decimal + from ennstatus.donate.forms import DateForm from ennstatus.donate.functions import load_csv, get_choices @@ -108,7 +109,12 @@ def received(): form.month.data = '{:02d}'.format(int(month)) csv_file = load_csv(filename) - total = str(sum(Decimal(row[2].replace(',', '.')) for row in csv_file)) + total = format_decimal( + sum( + parse_decimal(row[2], locale='de') for row in csv_file + ), + locale='de' + ) csv_file = load_csv(filename) current_app.logger.info('Return result') diff --git a/requirements.in b/requirements.in --- a/requirements.in +++ b/requirements.in @@ -1,3 +1,4 @@ +Babel==2.1.1 click==5.1 Flask-Bootstrap==3.3.5.6 Flask-HTTPAuth==2.6.0 diff --git a/requirements.txt b/requirements.txt --- a/requirements.txt +++ b/requirements.txt @@ -4,9 +4,10 @@ # # pip-compile requirements.in # +Babel==2.1.1 blinker==1.4 # via flask-mail click==5.1 -dominate==2.1.12 # via flask-bootstrap +dominate==2.1.16 # via flask-bootstrap Flask-Bootstrap==3.3.5.6 Flask-HTTPAuth==2.6.0 Flask-Mail==0.9.1 @@ -19,6 +20,7 @@ jsonschema==2.5.1 markupsafe==0.23 # via jinja2 pygeoip==0.3.2 python-gnupg==0.3.7 +pytz==2015.7 # via babel requests==2.7.0 strict-rfc3339==0.5 werkzeug==0.10.4 # via flask, flask-wtf diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ def _get_requirements(): setup(name='Ennstatus', - version='5.2.1', + version='5.3.0', description=('Ennstatus provides the user with vital information about ' 'the status of the organizations Tor servers.'), author='Frënn vun der Ënn',