From 260862fabc4527ad43db187e291d98c3379ea99f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 9 Mar 2021 14:31:46 +0100 Subject: [PATCH] [libcalamaresui] Move the format-string closer to where it is used --- src/libcalamaresui/utils/Paste.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index d2ef54a92..e30553272 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -52,7 +52,6 @@ ficheLogUpload( QObject* parent ) const QString& ficheHost = Calamares::Branding::instance()->uploadServer( Calamares::Branding::URL ); quint16 fichePort = Calamares::Branding::instance()->uploadServer( Calamares::Branding::Port ).toInt(); - QString pasteUrlFmt = parent->tr( "Install log posted to\n\n%1\n\nLink copied to clipboard" ); QByteArray pasteData = logFileContents(); if ( pasteData.isEmpty() ) @@ -101,7 +100,9 @@ ficheLogUpload( QObject* parent ) QUrl pasteUrl = QUrl( QString( resp ).trimmed(), QUrl::StrictMode ); QString pasteUrlStr = pasteUrl.toString(); QRegularExpression pasteUrlRegex( "^http[s]?://" + ficheHost ); - QString pasteUrlMsg = QString( pasteUrlFmt ).arg( pasteUrlStr ); + + QString pasteUrlFmt = parent->tr( "Install log posted to\n\n%1\n\nLink copied to clipboard" ); + QString pasteUrlMsg = pasteUrlFmt.arg( pasteUrlStr ); if ( nBytesRead >= 8 && pasteUrl.isValid() && pasteUrlRegex.match( pasteUrlStr ).hasMatch() ) {