Skip to content
Snippets Groups Projects
Commit 820aa908 authored by inso's avatar inso
Browse files

Merge branch 'dev' of https://github.com/ucoin-io/sakia into dev

parents ee0295cd caa10239
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
src/sakia/core/money/dividend_per_day.py
+ 2
− 8
View file @ 820aa908
...@@ -82,9 +82,6 @@ class DividendPerDay(BaseReferential): ...@@ -82,9 +82,6 @@ class DividendPerDay(BaseReferential):
async def localized(self, units=False, international_system=False): async def localized(self, units=False, international_system=False):
value = await self.value() value = await self.value()
prefix = "" prefix = ""
if international_system:
localized_value, prefix = DividendPerDay.to_si(value, self.app.preferences['digits_after_comma'])
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 or international_system: if units or international_system:
...@@ -98,9 +95,6 @@ class DividendPerDay(BaseReferential): ...@@ -98,9 +95,6 @@ class DividendPerDay(BaseReferential):
async def diff_localized(self, units=False, international_system=False): async def diff_localized(self, units=False, international_system=False):
value = await self.differential() value = await self.differential()
prefix = "" prefix = ""
if international_system and value != 0:
localized_value, prefix = DividendPerDay.to_si(value, self.app.preferences['digits_after_comma'])
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 or international_system: if units or international_system:
......
src/sakia/gui/community_tile.py
+ 8
− 6
View file @ 820aa908
...@@ -93,8 +93,9 @@ background-color: palette(base); ...@@ -93,8 +93,9 @@ background-color: palette(base);
international_system=self.app.preferences['international_system_of_units']) international_system=self.app.preferences['international_system_of_units'])
else: else:
localized_monetary_mass = "" localized_monetary_mass = ""
status = self.tr("Member") if self.app.current_account.pubkey in members_pubkeys \ status = self.app.current_account.pubkey in members_pubkeys
else self.tr("Non-Member") status_value = self.tr("Member") if status else self.tr("Non-Member")
status_color = '#00AA00' if status else self.tr('#FF0000')
description = """<html> description = """<html>
<body> <body>
<p> <p>
...@@ -102,7 +103,7 @@ background-color: palette(base); ...@@ -102,7 +103,7 @@ background-color: palette(base);
</p> </p>
<p>{nb_members} {members_label}</p> <p>{nb_members} {members_label}</p>
<p><span style="font-weight:600;">{monetary_mass_label}</span> : {monetary_mass}</p> <p><span style="font-weight:600;">{monetary_mass_label}</span> : {monetary_mass}</p>
<p><span style=" font-weight:600;">{status_label}</span> : {status}</p> <p><span style="font-weight:600;">{status_label}</span> : <span style="color:{status_color};">{status}</span></p>
<p><span style="font-weight:600;">{balance_label}</span> : {balance}</p> <p><span style="font-weight:600;">{balance_label}</span> : {balance}</p>
</body> </body>
</html>""".format(currency=self.community.currency, </html>""".format(currency=self.community.currency,
...@@ -110,8 +111,9 @@ background-color: palette(base); ...@@ -110,8 +111,9 @@ background-color: palette(base);
members_label=self.tr("members"), members_label=self.tr("members"),
monetary_mass_label=self.tr("Monetary mass"), monetary_mass_label=self.tr("Monetary mass"),
monetary_mass=localized_monetary_mass, monetary_mass=localized_monetary_mass,
status_color=status_color,
status_label=self.tr("Status"), status_label=self.tr("Status"),
status=status, status=status_value,
balance_label=self.tr("Balance"), balance_label=self.tr("Balance"),
balance=localized_amount) balance=localized_amount)
self.text_label.setText(description) self.text_label.setText(description)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment