diff --git a/src/sakia/core/community.py b/src/sakia/core/community.py index e9fcdd9d3d02c5040588620ca96132f54e90ae80..285b7ef7f017a70f7a83a01bc559181ae99f1665 100644 --- a/src/sakia/core/community.py +++ b/src/sakia/core/community.py @@ -169,9 +169,8 @@ class Community(QObject): else: return None except errors.DuniterError as e: - if e.ucode == errors.BLOCK_NOT_FOUND: - logging.debug(str(e)) - return None + logging.debug(str(e)) + return None except NoPeerAvailable as e: logging.debug(str(e)) return None diff --git a/src/sakia/core/money/relative_to_past.py b/src/sakia/core/money/relative_to_past.py index b92e5dc10a398f586827a8cec8007c1ad2da050c..83229eb2a1bc054831a3006265c804ec793ffc05 100644 --- a/src/sakia/core/money/relative_to_past.py +++ b/src/sakia/core/money/relative_to_past.py @@ -96,6 +96,13 @@ class RelativeToPast(BaseReferential): from . import Relative value = await self.differential() block = await self.community.get_ud_block(0, self._block_number) + if block: + date = QLocale.toString( + QLocale(), + QDateTime.fromTime_t(block['medianTime']).date(), + QLocale.dateFormat(QLocale(), QLocale.ShortFormat)) + else: + date = "###" prefix = "" if international_system and value != 0: localized_value, prefix = Relative.to_si(value, self.app.preferences['digits_after_comma']) @@ -104,13 +111,7 @@ class RelativeToPast(BaseReferential): if units or international_system: return QCoreApplication.translate("RelativeToPast", RelativeToPast._REF_STR_)\ - .format(localized_value, - prefix, - QLocale.toString( - QLocale(), - QDateTime.fromTime_t(block['medianTime']).date(), - QLocale.dateFormat(QLocale(), QLocale.ShortFormat) - ), + .format(localized_value,prefix,date, self.community.short_currency if units else "") else: return localized_value