From 74b2fa6b687bcbe17596642b20f2433358deacfd Mon Sep 17 00:00:00 2001
From: inso <insomniak.fr@gmaiL.com>
Date: Wed, 4 May 2016 08:09:05 +0200
Subject: [PATCH] Fix text in certification dialog
---
src/sakia/gui/certification.py | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/sakia/gui/certification.py b/src/sakia/gui/certification.py
index b081fa6c..83942787 100644
--- a/src/sakia/gui/certification.py
+++ b/src/sakia/gui/certification.py
@@ -199,19 +199,20 @@ class CertificationDialog(QObject):
stock=params['sigStock'])
if remaining_time > 0:
cert_text += "\n"
- cert_text += self.tr("Remaining time before next available certification : {0}").format(
- QLocale.toString(
- QLocale(),
- QDateTime.fromTime_t(remaining_time),
- QLocale.timeFormat(QLocale(), QLocale.ShortFormat)
- ),
- )
+ remaining_localized = QDateTime.fromTime_t(remaining_time).toString("HH:ss.")\
+ .replace(":", self.tr(" hours and ")).replace(".", self.tr(" min"))
+ cert_text += self.tr("Remaining time before next certification validation : {0}".format(remaining_localized))
self.ui.label_cert_stock.setText(cert_text)
if is_member or not block_0:
- if remaining_time == 0 and (nb_certifications < params['sigStock'] or params['sigStock'] == 0):
+ if nb_certifications < params['sigStock'] or params['sigStock'] == 0:
self.ui.button_box.button(QDialogButtonBox.Ok).setEnabled(True)
- self.ui.button_box.button(QDialogButtonBox.Ok).setText(self.tr("&Ok"))
+ if remaining_time > 0:
+ self.ui.button_box.button(QDialogButtonBox.Ok).setText(self.tr("&Ok") +
+ self.tr(" (Not validated before ")
+ + remaining_localized + ")")
+ else:
+ self.ui.button_box.button(QDialogButtonBox.Ok).setText(self.tr("&Ok"))
else:
self.ui.button_box.button(QDialogButtonBox.Ok).setEnabled(False)
self.ui.button_box.button(QDialogButtonBox.Ok).setText(self.tr("No more certifications"))
--
GitLab