This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

#5657 Tweak plurality of trial countdown

  • Loading branch information...
nlyan committed Oct 20, 2016
1 parent a59c437 commit b66043e0008379054a179411046afc211a502ec5
Showing with 10 additions and 6 deletions.
  1. +6 −3 src/gui/src/ActivationDialog.cpp
  2. +4 −3 src/gui/src/MainWindow.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, "
@@ -1077,7 +1077,7 @@ void MainWindow::beginTrial(bool isExpiring)
time_t daysLeft = m_LicenseManager->serialKey().daysLeft(::time(0));
QString expiringNotice ("<html><head/><body><p><span style=\""
"font-weight:600;\">%1</span> day%3 of "
- "your %2 trial remain. <a href="
+ "your %2 trial remain%5. <a href="
"\"https://symless.com/synergy/trial/thanks?id=%4\">"
"<span style=\"text-decoration: underline;"
" color:#0000ff;\">Buy now!</span></a>"
@@ -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();
//}

0 comments on commit b66043e

Please sign in to comment.