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

duniter · Feb 12, 2016 · 820aa90 · 820aa90
2 parents ee0295c + caa1023
commit 820aa90
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/src/sakia/core/money/dividend_per_day.py b/src/sakia/core/money/dividend_per_day.py
@@ -82,10 +82,7 @@ async def differential(self):
     async def localized(self, units=False, international_system=False):
         value = await self.value()
         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:
             return QCoreApplication.translate("Relative", DividendPerDay._REF_STR_) \
@@ -98,10 +95,7 @@ async def localized(self, units=False, international_system=False):
     async def diff_localized(self, units=False, international_system=False):
         value = await self.differential()
         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:
             return QCoreApplication.translate("Relative", DividendPerDay._REF_STR_) \

diff --git a/src/sakia/gui/community_tile.py b/src/sakia/gui/community_tile.py
@@ -93,25 +93,27 @@ async def refresh(self):
                                             international_system=self.app.preferences['international_system_of_units'])
             else:
                 localized_monetary_mass = ""
-            status = self.tr("Member") if self.app.current_account.pubkey in members_pubkeys \
-                else self.tr("Non-Member")
+            status = self.app.current_account.pubkey in members_pubkeys
+            status_value = self.tr("Member") if status else self.tr("Non-Member")
+            status_color = '#00AA00' if status else self.tr('#FF0000')
             description = """<html>
             <body>
             <p>
             <span style=" font-size:16pt; font-weight:600;">{currency}</span>
             </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;">{status_label}</span> : {status}</p>
-            <p><span style=" font-weight:600;">{balance_label}</span> : {balance}</p>
+            <p><span style="font-weight:600;">{monetary_mass_label}</span> : {monetary_mass}</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>
             </body>
             </html>""".format(currency=self.community.currency,
                               nb_members=len(members_pubkeys),
                               members_label=self.tr("members"),
                               monetary_mass_label=self.tr("Monetary mass"),
                               monetary_mass=localized_monetary_mass,
+                              status_color=status_color,
                               status_label=self.tr("Status"),
-                              status=status,
+                              status=status_value,
                               balance_label=self.tr("Balance"),
                               balance=localized_amount)
             self.text_label.setText(description)