Fix poor translation strings for blacklisted error reason strings

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
index 475f7aa3207be441b27423fe5bc5d319eeced493..cc61bfab548072dcc465db28ca1a25d1338391c7 100644 (file)
--- a/src/libsync/discovery.cpp
+++ b/src/libsync/discovery.cpp
@@ -436,19 +436,21 @@ bool ProcessDirectoryJob::handleExcluded(const QString &path, const Entries &ent
             item->_errorString = tr("The filename cannot be encoded on your file system.");
             break;
         case CSYNC_FILE_EXCLUDE_SERVER_BLACKLISTED:
-            item->_errorString = tr("The filename is blacklisted on the server.");
+            const auto errorString = tr("The filename is blacklisted on the server.");
+            QString reasonString;
             if (hasForbiddenFilename) {
-                item->_errorString += tr(" Reason: the entire filename is forbidden.");
+                reasonString = tr("Reason: the entire filename is forbidden.");
             }
             if (hasForbiddenBasename) {
-                item->_errorString += tr(" Reason: the filename has a forbidden base name (filename start).");
+                reasonString = tr("Reason: the filename has a forbidden base name (filename start).");
             }
             if (hasForbiddenExtension) {
-                item->_errorString += tr(" Reason: the file has a forbidden extension (.%1).").arg(extension);
+                reasonString = tr("Reason: the file has a forbidden extension (.%1).").arg(extension);
             }
             if (containsForbiddenCharacters) {
-                item->_errorString += tr(" Reason: the filename contains a forbidden character (%1).").arg(forbiddenCharMatch);
+                reasonString = tr("Reason: the filename contains a forbidden character (%1).").arg(forbiddenCharMatch);
             }
+            item->_errorString = reasonString.isEmpty() ? errorString : QString("%1 %2").arg(errorString, reasonString);
             item->_status = SyncFileItem::FileNameInvalidOnServer;
             break;
         }