From: Camila <hello@camila.codes>
Date: Wed, 1 Feb 2023 15:21:25 +0000 (+0100)
Subject: Improve warning message code readability.
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~15^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=37184fb968d173634594f5242c033968a37770e7;p=nextcloud-desktop.git

Improve warning message code readability.

Signed-off-by: Camila <hello@camila.codes>
---

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index b74943093..f82604e73 100644
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -172,23 +172,18 @@ bool Application::configVersionMigration()
     }
 
     if (showWarning || backupFilesList.count() > 0) {
-        QString boldMessage;
-        if (!deleteKeys.isEmpty()) {
-            boldMessage = tr("Continuing will mean <b>deleting these settings</b>.");
-        } else {
-            boldMessage = tr("Continuing will mean <b>ignoring these settings</b>.");
-        }
-
         QMessageBox box(
             QMessageBox::Warning,
             APPLICATION_SHORTNAME,
             tr("Some settings were configured in %1 versions of this client and "
                "use features that are not available in this version.<br>"
                "<br>"
-               "%2<br>"
+               "Continuing will mean <b>%2 these settings</b><br>"
                "<br>"
                "The current configuration file was already backed up to <i>%3</i>.")
-                .arg((downgrading ? tr("newer", "newer software version") : tr("older", "older software version")), boldMessage, backupFilesList.join("<br>")));
+                .arg((downgrading ? tr("newer", "newer software version") : tr("older", "older software version")),
+                     deleteKeys.isEmpty()? tr("ignoring") : tr("deleting"),
+                     backupFilesList.join("<br>")));
         box.addButton(tr("Quit"), QMessageBox::AcceptRole);
         auto continueBtn = box.addButton(tr("Continue"), QMessageBox::DestructiveRole);