Skip to content
Snippets Groups Projects
Commit 6ddec0cf authored by Vincent Texier's avatar Vincent Texier
Browse files

Add semi colon in wallet range

Fix translation of download link in about window
parent 73c2d034
No related branches found
No related tags found
No related merge requests found
This diff is collapsed.
...@@ -234,13 +234,17 @@ class MainWindow(QMainWindow, Ui_MainWindow): ...@@ -234,13 +234,17 @@ class MainWindow(QMainWindow, Ui_MainWindow):
latest = self.app.available_version latest = self.app.available_version
version_info = "" version_info = ""
version_url = ""
if not latest[0]: if not latest[0]:
version_info = self.tr("Latest release : {version}") \ version_info = self.tr("Latest release : {version}") \
.format(version='.'.join(latest[1])) .format(version='.'.join(latest[1]))
version_url = latest[2]
new_version_text = self.tr(""" new_version_text = self.tr("""
<p><b>{version_info}</b></p> <p><b>{version_info}</b></p>
""").format(version_info=version_info) <p><a href="{version_url}">Download link</a></p>
""").format(version_info=version_info, version_url=version_url)
text = self.tr(""" text = self.tr("""
<h1>Cutecoin</h1> <h1>Cutecoin</h1>
...@@ -256,8 +260,8 @@ class MainWindow(QMainWindow, Ui_MainWindow): ...@@ -256,8 +260,8 @@ class MainWindow(QMainWindow, Ui_MainWindow):
<p>inso</p> <p>inso</p>
<p>vit</p> <p>vit</p>
<p>canercandan</p> <p>canercandan</p>
""").format(__version__, """).format(__version__, new_version_text=new_version_text)
new_version_text=new_version_text)
aboutUi.label.setText(text) aboutUi.label.setText(text)
aboutDialog.show() aboutDialog.show()
......
...@@ -103,12 +103,12 @@ class WalletsTabWidget(QWidget, Ui_WalletsTab): ...@@ -103,12 +103,12 @@ class WalletsTabWidget(QWidget, Ui_WalletsTab):
maximum = self.community.monetary_mass maximum = self.community.monetary_mass
if isinstance(self.get_referential_value(amount), int): if isinstance(self.get_referential_value(amount), int):
localized_amount = QLocale().toString(self.get_referential_value(amount)) localized_amount = QLocale().toString(float(self.get_referential_value(amount)), 'f', 0)
else: else:
localized_amount = QLocale().toString(self.get_referential_value(amount), 'f', 6) localized_amount = QLocale().toString(self.get_referential_value(amount), 'f', 6)
if isinstance(self.get_referential_value(maximum), int): if isinstance(self.get_referential_value(maximum), int):
localized_maximum = QLocale().toString(self.get_referential_value(maximum)) localized_maximum = QLocale().toString(float(self.get_referential_value(maximum)), 'f', 0)
else: else:
localized_maximum = QLocale().toString(self.get_referential_value(maximum), 'f', 6) localized_maximum = QLocale().toString(self.get_referential_value(maximum), 'f', 6)
...@@ -123,7 +123,7 @@ class WalletsTabWidget(QWidget, Ui_WalletsTab): ...@@ -123,7 +123,7 @@ class WalletsTabWidget(QWidget, Ui_WalletsTab):
self.tr("Your money share "), self.tr("Your money share "),
self.tr("{:.2f}%").format(amount / maximum * 100) if maximum != 0 else "0%", self.tr("{:.2f}%").format(amount / maximum * 100) if maximum != 0 else "0%",
self.tr("Your part "), self.tr("Your part "),
self.tr("{:} {:} in [{:.2f} - {:}] {:}") self.tr("{:} {:} in [{:.2f} ; {:}] {:}")
.format( .format(
localized_amount, localized_amount,
self.get_referential_name(), self.get_referential_name(),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment