Updater: show the human readable version in the settings

The xml looks like this:

   <version>2.5.0.328</version>
   <versionstring>ownCloud Client 2.5.0 alpha1 (build 238)</versionstring>

And we should show the version string

Issue #6602
This commit is contained in:
Olivier Goffart 2018-12-04 15:21:49 +01:00
parent 3902b9b120
commit 21ac396bd1

View File

@ -141,19 +141,19 @@ void OCUpdater::backgroundCheckForUpdate()
QString OCUpdater::statusString() const
{
QString updateVersion = _updateInfo.version();
QString updateVersion = _updateInfo.versionString();
switch (downloadState()) {
case Downloading:
return tr("Downloading version %1. Please wait...").arg(updateVersion);
return tr("Downloading %1. Please wait...").arg(updateVersion);
case DownloadComplete:
return tr("%1 version %2 available. Restart application to start the update.").arg(Theme::instance()->appNameGUI(), updateVersion);
return tr("%1 available. Restart application to start the update.").arg(Theme::instance()->appNameGUI(), updateVersion);
case DownloadFailed:
return tr("Could not download update. Please click <a href='%1'>here</a> to download the update manually.").arg(_updateInfo.web());
case DownloadTimedOut:
return tr("Could not check for new updates.");
case UpdateOnlyAvailableThroughSystem:
return tr("New %1 version %2 available. Please use the system's update tool to install it.").arg(Theme::instance()->appNameGUI(), updateVersion);
return tr("New %1 available. Please use the system's update tool to install it.").arg(updateVersion);
case CheckingServer:
return tr("Checking update server...");
case Unknown: