rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#5657 Tweak plurality of trial countdown

This commit is contained in:
Andrew Nelless 2016-10-20 17:59:03 +01:00
parent a59c437fd3
commit b66043e000
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/src/ActivationDialog.cpp
View File

@ -91,11 +91,14 @@ void ActivationDialog::accept()
} }
Edition edition = m_LicenseManager->activeEdition(); Edition edition = m_LicenseManager->activeEdition();
time_t daysLeft = m_LicenseManager->serialKey().daysLeft(::time(0));
if (edition != kUnregistered) { if (edition != kUnregistered) {
QString thanksMessage = tr("Thanks for trying %1! %3\n\n%2 days of " QString thanksMessage = tr("Thanks for trying %1! %5\n\n%2 day%3 of "
"your trial remain"). "your trial remain%4").
arg (m_LicenseManager->getEditionName(edition)). 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) { if (edition == kPro) {
thanksMessage = thanksMessage.arg("If you're using SSL, " thanksMessage = thanksMessage.arg("If you're using SSL, "

7
src/gui/src/MainWindow.cpp
View File

@ -1077,7 +1077,7 @@ void MainWindow::beginTrial(bool isExpiring)
time_t daysLeft = m_LicenseManager->serialKey().daysLeft(::time(0)); time_t daysLeft = m_LicenseManager->serialKey().daysLeft(::time(0));
QString expiringNotice ("<html><head/><body><p><span style=\"" QString expiringNotice ("<html><head/><body><p><span style=\""
"font-weight:600;\">%1</span> day%3 of " "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\">" "\"https://symless.com/synergy/trial/thanks?id=%4\">"
"<span style=\"text-decoration: underline;" "<span style=\"text-decoration: underline;"
" color:#0000ff;\">Buy now!</span></a>" " color:#0000ff;\">Buy now!</span></a>"
@ -1087,8 +1087,9 @@ void MainWindow::beginTrial(bool isExpiring)
.arg (LicenseManager::getEditionName .arg (LicenseManager::getEditionName
(m_LicenseManager->activeEdition())) (m_LicenseManager->activeEdition()))
.arg ((daysLeft == 1) ? "" : "s") .arg ((daysLeft == 1) ? "" : "s")
.arg(QString::fromStdString .arg (QString::fromStdString
(m_LicenseManager->serialKey().toString())); (m_LicenseManager->serialKey().toString()))
.arg ((daysLeft == 1) ? "s" : "");
this->m_trialLabel->setText(expiringNotice); this->m_trialLabel->setText(expiringNotice);
this->m_trialWidget->show(); this->m_trialWidget->show();
//} //}