From b66043e0008379054a179411046afc211a502ec5 Mon Sep 17 00:00:00 2001
From: Andrew Nelless
Date: Thu, 20 Oct 2016 17:59:03 +0100
Subject: [PATCH] #5657 Tweak plurality of trial countdown
---
src/gui/src/ActivationDialog.cpp | 9 ++++++---
src/gui/src/MainWindow.cpp | 7 ++++---
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/gui/src/ActivationDialog.cpp b/src/gui/src/ActivationDialog.cpp
index 26392d98..6abbc938 100644
--- a/src/gui/src/ActivationDialog.cpp
+++ b/src/gui/src/ActivationDialog.cpp
@@ -91,11 +91,14 @@ void ActivationDialog::accept()
}
Edition edition = m_LicenseManager->activeEdition();
+ time_t daysLeft = m_LicenseManager->serialKey().daysLeft(::time(0));
if (edition != kUnregistered) {
- QString thanksMessage = tr("Thanks for trying %1! %3\n\n%2 days of "
- "your trial remain").
+ QString thanksMessage = tr("Thanks for trying %1! %5\n\n%2 day%3 of "
+ "your trial remain%4").
arg (m_LicenseManager->getEditionName(edition)).
- arg (m_LicenseManager->serialKey().daysLeft(::time(0)));
+ arg (daysLeft).
+ arg ((daysLeft == 1) ? "" : "s").
+ arg ((daysLeft == 1) ? "s" : "");
if (edition == kPro) {
thanksMessage = thanksMessage.arg("If you're using SSL, "
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 77a9a841..8a2888fe 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -1077,7 +1077,7 @@ void MainWindow::beginTrial(bool isExpiring)
time_t daysLeft = m_LicenseManager->serialKey().daysLeft(::time(0));
QString expiringNotice ("%1 day%3 of "
- "your %2 trial remain. "
"Buy now!"
@@ -1087,8 +1087,9 @@ void MainWindow::beginTrial(bool isExpiring)
.arg (LicenseManager::getEditionName
(m_LicenseManager->activeEdition()))
.arg ((daysLeft == 1) ? "" : "s")
- .arg(QString::fromStdString
- (m_LicenseManager->serialKey().toString()));
+ .arg (QString::fromStdString
+ (m_LicenseManager->serialKey().toString()))
+ .arg ((daysLeft == 1) ? "s" : "");
this->m_trialLabel->setText(expiringNotice);
this->m_trialWidget->show();
//}