diff --git a/src/sakia/gui/dialogs/certification/model.py b/src/sakia/gui/dialogs/certification/model.py
index cfabbe880e3d05188488451d5e869df6d20db1d8..0265447444944d00a0f7578dba7eb0399d486912 100644
--- a/src/sakia/gui/dialogs/certification/model.py
+++ b/src/sakia/gui/dialogs/certification/model.py
@@ -1,6 +1,7 @@
from PyQt5.QtCore import QObject
from sakia.data.processors import IdentitiesProcessor, CertificationsProcessor, \
BlockchainProcessor, ConnectionsProcessor
+from sakia.helpers import timestamp_to_dhms
import attr
@@ -51,10 +52,7 @@ class CertificationModel(QObject):
self.connection.pubkey,
parameters, blockchain_time)
- days, remainder = divmod(remaining_time, 3600 * 24)
- hours, remainder = divmod(remainder, 3600)
- minutes, seconds = divmod(remainder, 60)
- return days, hours, minutes, seconds
+ return timestamp_to_dhms(remaining_time)
def nb_certifications(self):
"""
diff --git a/src/sakia/gui/navigation/informations/model.py b/src/sakia/gui/navigation/informations/model.py
index 729eade25b96b9c935f3bdb035835d0bf5b6826e..8fdabcfd4ff71877d918fbb3c3128709c47fbd7d 100644
--- a/src/sakia/gui/navigation/informations/model.py
+++ b/src/sakia/gui/navigation/informations/model.py
@@ -3,7 +3,7 @@ import math
from PyQt5.QtCore import QLocale, QDateTime, pyqtSignal, QObject
from sakia.errors import NoPeerAvailable
-
+from sakia.helpers import timestamp_to_dhms
from sakia.money.currency import shortened
from sakia.money import Referentials
from duniterpy.api import errors
@@ -44,7 +44,7 @@ class InformationsModel(QObject):
return None
localized_data['growth'] = params.c
- localized_data['days_per_dividend'] = params.dt / 86400
+ localized_data['days_per_dividend'] = QLocale().toString(params.dt / 86400, 'f', 2)
last_ud, last_ud_base = self.blockchain_service.last_ud()
members_count = self.blockchain_service.last_members_count()
@@ -131,9 +131,7 @@ class InformationsModel(QObject):
outdistanced_text = self.tr("In WoT range")
if mstime_remaining > 0:
- days, remainder = divmod(mstime_remaining, 3600 * 24)
- hours, remainder = divmod(remainder, 3600)
- minutes, seconds = divmod(remainder, 60)
+ days, hours, minutes, seconds = timestamp_to_dhms(mstime_remaining)
mstime_remaining_text = self.tr("Expires in ")
if days > 0:
mstime_remaining_text += "{days} days".format(days=days)
diff --git a/src/sakia/gui/navigation/informations/view.py b/src/sakia/gui/navigation/informations/view.py
index cc8bae79cc966ba1e3575eab97cdd122d42ba0f2..05ed4736bf1119a29f470d99cf01c87d67fe4153 100644
--- a/src/sakia/gui/navigation/informations/view.py
+++ b/src/sakia/gui/navigation/informations/view.py
@@ -1,7 +1,8 @@
from PyQt5.QtWidgets import QWidget
-from PyQt5.QtCore import QEvent
+from PyQt5.QtCore import QEvent, QLocale
from .informations_uic import Ui_InformationsWidget
from enum import Enum
+from sakia.helpers import timestamp_to_dhms
class InformationsView(QWidget, Ui_InformationsWidget):
@@ -140,15 +141,13 @@ class InformationsView(QWidget, Ui_InformationsWidget):
""").format(
self.tr('{:2.0%} / {:} days').format(localized_data['growth'], localized_data['days_per_dividend']),
self.tr('Fundamental growth (c) / Delta time (dt)'),
- self.tr('UD(t+1) = MAX { UD(t) ; c × M(t) / N(t+1) }'),
+ self.tr('UDĞ(t) = UDĞ(t-1) + c²*M(t-1)/N(t-1)'),
self.tr('Universal Dividend (formula)'),
- self.tr('{:} = MAX {{ {:} {:} ; {:2.0%} × {:} {:} / {:} }}').format(
+ self.tr('{:} = {:} + {:2.0%}²* {:} / {:}').format(
localized_data.get('ud_plus_1', '####'),
localized_data.get('ud', '####'),
- localized_data['diff_units'],
localized_data.get('growth', '####'),
localized_data.get('mass', '####'),
- localized_data['diff_units'],
localized_data.get('members_count', '####')
),
self.tr('Universal Dividend (computed)')
@@ -190,6 +189,14 @@ class InformationsView(QWidget, Ui_InformationsWidget):
:param str currency: The currency
"""
+ dt_dhms = timestamp_to_dhms(params.dt)
+ if dt_dhms[0] > 0:
+ dt_as_str = self.tr("{:} day(s) {:} hour(s)").format(*dt_dhms)
+ else:
+ dt_as_str = self.tr("{:} hour(s)").format(dt_dhms[1])
+ if dt_dhms[2] > 0 or dt_dhms[3] > 0:
+ dt_dhms += ", {:} minute(s) and {:} second(s)".format(*dt_dhms[1:])
+
# set infos in label
self.label_money.setText(
self.tr("""
@@ -204,13 +211,13 @@ class InformationsView(QWidget, Ui_InformationsWidget):
</table>
""").format(
params.c,
- params.dt / 86400,
+ QLocale().toString(params.dt / 86400, 'f', 2),
self.tr('Fundamental growth (c)'),
params.ud0,
self.tr('Initial Universal Dividend UD(0) in'),
currency,
- params.dt / 86400,
- self.tr('Time period (dt) in days (86400 seconds) between two UD'),
+ dt_as_str,
+ self.tr('Time period between two UD'),
params.median_time_blocks,
self.tr('Number of blocks used for calculating median time'),
params.avg_gen_time,
@@ -243,9 +250,9 @@ class InformationsView(QWidget, Ui_InformationsWidget):
<tr><td align="right"><b>{:}</b></td><td>{:}</td></tr>
</table>
""").format(
- params.sig_period / 86400,
+ QLocale().toString(params.sig_period / 86400, 'f', 2),
self.tr('Minimum delay between 2 certifications (in days)'),
- params.sig_validity / 86400,
+ QLocale().toString(params.sig_validity / 86400, 'f', 2),
self.tr('Maximum age of a valid signature (in days)'),
params.sig_qty,
self.tr('Minimum quantity of signatures to be part of the WoT'),
diff --git a/src/sakia/helpers.py b/src/sakia/helpers.py
new file mode 100644
index 0000000000000000000000000000000000000000..05a9a018ae861d275198225348bf0c210800a06d
--- /dev/null
+++ b/src/sakia/helpers.py
@@ -0,0 +1,7 @@
+
+
+def timestamp_to_dhms(ts):
+ days, remainder = divmod(ts, 3600 * 24)
+ hours, remainder = divmod(remainder, 3600)
+ minutes, seconds = divmod(remainder, 60)
+ return days, hours, minutes, seconds
\ No newline at end of file