From f18679bfff85e26f188fa2675870d299ee94d0d8 Mon Sep 17 00:00:00 2001 From: tooomm Date: Sat, 29 Apr 2017 22:06:53 +0200 Subject: [PATCH] fix attempt --- cockatrice/src/dlg_update.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/cockatrice/src/dlg_update.cpp b/cockatrice/src/dlg_update.cpp index 61ad7b44..8fd68123 100644 --- a/cockatrice/src/dlg_update.cpp +++ b/cockatrice/src/dlg_update.cpp @@ -115,10 +115,10 @@ void DlgUpdate::finishedUpdateCheck(bool needToUpdate, bool isCompatible, Releas //If there's no need to update, tell them that. However we still allow them to run the //downloader themselves if there's a compatible build QMessageBox::information(this, tr("Cockatrice Update"), - tr("Cockatrice is up to date!") + QString ("

") - + tr("You are already running the latest version available in the chosen release channel.") + QString("
") - + tr("Current version") + QString(": %2
") - + tr("Current release channel") + QString(": %1").arg(settingsCache->getUpdateReleaseChannel()->getName().toUtf8()).arg(VERSION_STRING)); + tr("Cockatrice is up to date!") + "

" + + tr("You are already running the latest version available in the chosen release channel.") + "
" + + tr("Current version") + ": %2
" + + tr("Current release channel") + ": %1").arg(settingsCache->getUpdateReleaseChannel()->getName().toUtf8()).arg(VERSION_STRING); return; } @@ -129,21 +129,21 @@ void DlgUpdate::finishedUpdateCheck(bool needToUpdate, bool isCompatible, Releas int reply; reply = QMessageBox::question(this, tr("Update Available"), - tr("A new version of Cockatrice is available!") + QString("

") - + tr("New version") + QString(": %1
") - + tr("Publishing date") + QString(": %2 (") + tr("Changelog") + QString(")

") - + tr("Do you want to update now?").arg(release->getName(), publishDate, release->getDescriptionUrl()), + tr("A new version of Cockatrice is available!") + "

" + + tr("New version") + ": %1
" + + tr("Publishing date") + ": %2 (" + tr("Changelog") + ")

" + + tr("Do you want to update now?")).arg(release->getName(), publishDate, release->getDescriptionUrl(), QMessageBox::Yes | QMessageBox::No); if (reply == QMessageBox::Yes) downloadUpdate(); } else { QMessageBox::information(this, tr("Cockatrice Update"), - tr("A new version of Cockatrice is available!") + Qstring("

") - + tr("New version") + QString(": %1
") - + tr("Publishing date") + QString(": %2 (") + tr("Changelog") + QString(")

") - + tr("Unfortunately there are no download packages available for your operating system. \nYou may have to build from source yourself.") + QString("

") - + tr("Please check the download page manually and visit the wiki for instructions on compiling.").arg(release->getName(), publishDate, release->getDescriptionUrl())); + tr("A new version of Cockatrice is available!") + "

" + + tr("New version") + ": %1
" + + tr("Publishing date") + ": %2 (" + tr("Changelog") + ")

" + + tr("Unfortunately there are no download packages available for your operating system. \nYou may have to build from source yourself.") + "

" + + tr("Please check the download page manually and visit the wiki for instructions on compiling.")).arg(release->getName(), publishDate, release->getDescriptionUrl()); } } @@ -194,7 +194,7 @@ void DlgUpdate::downloadSuccessful(QUrl filepath) { } else { setLabel(tr("Error")); QMessageBox::critical(this, tr("Update Error"), - tr("Unable to open the installer.") + QString("

") + tr("Unable to open the installer.") + "

" + tr("You might be able to manually update by closing Cockatrice and running the installer downloaded to \n%1.").arg(filepath.toLocalFile())); } }