From 3cb5a5026bae3bbe0fba32c44fe406a2fcab812d Mon Sep 17 00:00:00 2001
From: Inso <insomniak.fr@gmail.com>
Date: Mon, 14 Sep 2015 23:12:03 +0200
Subject: [PATCH] Fix bugs in referentials
---
src/cutecoin/core/money/quant_zerosum.py | 8 +++-----
src/cutecoin/core/money/relative_zerosum.py | 14 +++++---------
2 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/cutecoin/core/money/quant_zerosum.py b/src/cutecoin/core/money/quant_zerosum.py
index 9c410877..01330dc5 100644
--- a/src/cutecoin/core/money/quant_zerosum.py
+++ b/src/cutecoin/core/money/quant_zerosum.py
@@ -49,10 +49,8 @@ class QuantitativeZSum:
@asyncio.coroutine
def localized(self, units=False, international_system=False):
value = yield from self.value()
- if international_system:
- pass
- else:
- localized_value = QLocale().toString(float(value), 'f', 0)
+
+ localized_value = QLocale().toString(float(value), 'f', 0)
if units:
return QCoreApplication.translate("QuantitativeZSum",
@@ -64,5 +62,5 @@ class QuantitativeZSum:
@asyncio.coroutine
def diff_localized(self, units=False, international_system=False):
- localized = yield from Quantitative(self.amount, self.community, self.app).localized(units, international_system)
+ localized = yield from Quantitative(self.amount, self.community, self.app).localized(units, international_system)
return localized
\ No newline at end of file
diff --git a/src/cutecoin/core/money/relative_zerosum.py b/src/cutecoin/core/money/relative_zerosum.py
index 4202a72a..974faa07 100644
--- a/src/cutecoin/core/money/relative_zerosum.py
+++ b/src/cutecoin/core/money/relative_zerosum.py
@@ -41,6 +41,7 @@ class RelativeZSum:
relative_value = self.amount / float(dividend)
relative_median = median / dividend
else:
+ relative_value = self.amount
relative_median = 0
return relative_value - relative_median
@@ -51,10 +52,8 @@ class RelativeZSum:
@asyncio.coroutine
def localized(self, units=False, international_system=False):
value = yield from self.value()
- if international_system:
- pass
- else:
- localized_value = QLocale().toString(float(value), 'f', self.app.preferences['digits_after_comma'])
+
+ localized_value = QLocale().toString(float(value), 'f', self.app.preferences['digits_after_comma'])
if units:
return QCoreApplication.translate("RelativeZSum", RelativeZSum._REF_STR_)\
@@ -64,12 +63,9 @@ class RelativeZSum:
return localized_value
def diff_localized(self, units=False, international_system=False):
- value = self.differential()
+ value = yield from self.differential()
- if international_system:
- pass
- else:
- localized_value = QLocale().toString(float(value), 'f', self.app.preferences['digits_after_comma'])
+ localized_value = QLocale().toString(float(value), 'f', self.app.preferences['digits_after_comma'])
if units:
return QCoreApplication.translate("RelativeZSum", RelativeZSum._REF_STR_)\
--
GitLab