# HG changeset patch # User Dennis Fink # Date 2015-10-27 23:11:53 # Node ID 2e387039df8d3c7ad8e10015a18e12ca9e67eb12 # Parent 9b7960273785ec72f66a2629838a5806131f4e88 # Parent c0de5deb271c7de21b624bdbf8994562f9801c65 Merged hotfix-received-total diff --git a/ennstatus/donate/views.py b/ennstatus/donate/views.py --- a/ennstatus/donate/views.py +++ b/ennstatus/donate/views.py @@ -14,6 +14,7 @@ # 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) @@ -107,7 +108,7 @@ def received(): form.month.data = '{:02d}'.format(int(month)) csv_file = load_csv(filename) - total = str(sum(int(row[2]) for row in csv_file)) + total = str(sum(Decimal(row[2].replace(',', '.')) for row in csv_file)) csv_file = load_csv(filename) current_app.logger.info('Return result') 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.0-dev', + version='5.2.1-dev', description=('Ennstatus provides the user with vital information about ' 'the status of the organizations Tor servers.'), author='Frënn vun der Ënn',