From 70ea5e572c6004acec342cf89b882e5644245953 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Fri, 7 Feb 2025 10:18:54 +1000 Subject: [PATCH] Update some auth strings --- src/core/auth/qgsauthmanager.cpp | 18 +++++++++--------- src/core/expression/qgsexpressionutils.h | 2 +- src/gui/auth/qgsauthauthoritieseditor.cpp | 18 +++++++++--------- src/gui/auth/qgsautheditorwidgets.cpp | 4 ++-- src/gui/auth/qgsauthguiutils.cpp | 4 ++-- src/gui/auth/qgsauthidentitieseditor.cpp | 4 ++-- src/gui/auth/qgsauthmasterpassresetdialog.cpp | 4 ++-- src/gui/auth/qgsauthserverseditor.cpp | 2 +- src/gui/auth/qgsauthsslconfigwidget.cpp | 2 +- src/ui/auth/qgsauthauthoritieseditor.ui | 4 ++-- src/ui/auth/qgsauthcertificatemanager.ui | 2 +- src/ui/auth/qgsauthconfigedit.ui | 2 +- src/ui/auth/qgsauthconfiguriedit.ui | 2 +- src/ui/auth/qgsautheditorwidgets.ui | 2 +- src/ui/auth/qgsauthidentitieseditor.ui | 4 ++-- src/ui/auth/qgsauthsettingswidget.ui | 2 +- 16 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/core/auth/qgsauthmanager.cpp b/src/core/auth/qgsauthmanager.cpp index a85c2bfb6ee5..3f29df9dac50 100644 --- a/src/core/auth/qgsauthmanager.cpp +++ b/src/core/auth/qgsauthmanager.cpp @@ -440,7 +440,7 @@ bool QgsAuthManager::createAndStoreRandomMasterPasswordInKeyChain() } else { - emit passwordHelperMessageLog( tr( "Master password could not be written to your %1" ).arg( passwordHelperDisplayName() ), authManTag(), Qgis::MessageLevel::Warning ); + emit passwordHelperMessageLog( tr( "Master password could not be written to the %1" ).arg( passwordHelperDisplayName() ), authManTag(), Qgis::MessageLevel::Warning ); return false; } @@ -1518,7 +1518,7 @@ bool QgsAuthManager::backupAuthenticationDatabase( QString *backuppath ) if ( sqliteDatabasePath().isEmpty() ) { - const char *err = QT_TR_NOOP( "The authentication database is not filesystem-based" ); + const char *err = QT_TR_NOOP( "The authentication storage is not filesystem-based" ); QgsDebugError( err ); emit messageLog( tr( err ), authManTag(), Qgis::MessageLevel::Warning ); return false; @@ -1526,7 +1526,7 @@ bool QgsAuthManager::backupAuthenticationDatabase( QString *backuppath ) if ( !QFile::exists( sqliteDatabasePath() ) ) { - const char *err = QT_TR_NOOP( "No authentication database found" ); + const char *err = QT_TR_NOOP( "No authentication database file found" ); QgsDebugError( err ); emit messageLog( tr( err ), authManTag(), Qgis::MessageLevel::Warning ); return false; @@ -3368,7 +3368,7 @@ QString QgsAuthManager::passwordHelperRead() if ( job.error() ) { mPasswordHelperErrorCode = job.error(); - mPasswordHelperErrorMessage = tr( "Retrieving password from your %1 failed: %2." ).arg( passwordHelperDisplayName(), job.errorString() ); + mPasswordHelperErrorMessage = tr( "Retrieving password from the %1 failed: %2." ).arg( passwordHelperDisplayName(), job.errorString() ); // Signals used in the tests to exit main application loop emit passwordHelperFailure(); } @@ -3379,7 +3379,7 @@ QString QgsAuthManager::passwordHelperRead() if ( password.isEmpty() ) { mPasswordHelperErrorCode = QKeychain::EntryNotFound; - mPasswordHelperErrorMessage = tr( "Empty password retrieved from your %1." ).arg( passwordHelperDisplayName( true ) ); + mPasswordHelperErrorMessage = tr( "Empty password retrieved from the %1." ).arg( passwordHelperDisplayName( true ) ); // Signals used in the tests to exit main application loop emit passwordHelperFailure(); } @@ -3413,7 +3413,7 @@ bool QgsAuthManager::passwordHelperWrite( const QString &password ) if ( job.error() ) { mPasswordHelperErrorCode = job.error(); - mPasswordHelperErrorMessage = tr( "Storing password in your %1 failed: %2." ).arg( passwordHelperDisplayName(), job.errorString() ); + mPasswordHelperErrorMessage = tr( "Storing password in the %1 failed: %2." ).arg( passwordHelperDisplayName(), job.errorString() ); // Signals used in the tests to exit main application loop emit passwordHelperFailure(); result = false; @@ -3478,7 +3478,7 @@ void QgsAuthManager::passwordHelperProcessError() // we also want to disable the wallet system to prevent annoying // notification on each subsequent access. setPasswordHelperEnabled( false ); - mPasswordHelperErrorMessage = tr( "There was an error and integration with your %1 system has been disabled. " + mPasswordHelperErrorMessage = tr( "There was an error and integration with your %1 has been disabled. " "You can re-enable it at any time through the \"Utilities\" menu " "in the Authentication pane of the options dialog. %2" ) .arg( passwordHelperDisplayName(), mPasswordHelperErrorMessage ); @@ -3518,7 +3518,7 @@ bool QgsAuthManager::masterPasswordInput() } else { - emit passwordHelperMessageLog( tr( "Master password stored in your %1 is not valid" ).arg( passwordHelperDisplayName() ), authManTag(), Qgis::MessageLevel::Warning ); + emit passwordHelperMessageLog( tr( "Master password stored in the %1 is not valid" ).arg( passwordHelperDisplayName() ), authManTag(), Qgis::MessageLevel::Warning ); } } } @@ -3536,7 +3536,7 @@ bool QgsAuthManager::masterPasswordInput() { if ( !passwordHelperWrite( pass ) ) { - emit passwordHelperMessageLog( tr( "Master password could not be written to your %1" ).arg( passwordHelperDisplayName() ), authManTag(), Qgis::MessageLevel::Warning ); + emit passwordHelperMessageLog( tr( "Master password could not be written to the %1" ).arg( passwordHelperDisplayName() ), authManTag(), Qgis::MessageLevel::Warning ); } } return true; diff --git a/src/core/expression/qgsexpressionutils.h b/src/core/expression/qgsexpressionutils.h index 67fea59714ab..0c3512b1f554 100644 --- a/src/core/expression/qgsexpressionutils.h +++ b/src/core/expression/qgsexpressionutils.h @@ -201,7 +201,7 @@ class CORE_EXPORT QgsExpressionUtils return v.userType() == QMetaType::Type::QVariantList || v.userType() == QMetaType::Type::QStringList; } -// implicit conversion to string + // implicit conversion to string static QString getStringValue( const QVariant &value, QgsExpression * ) { return value.toString(); diff --git a/src/gui/auth/qgsauthauthoritieseditor.cpp b/src/gui/auth/qgsauthauthoritieseditor.cpp index 003d258c2e1c..11e324d2e881 100644 --- a/src/gui/auth/qgsauthauthoritieseditor.cpp +++ b/src/gui/auth/qgsauthauthoritieseditor.cpp @@ -430,7 +430,7 @@ void QgsAuthAuthoritiesEditor::btnAddCa_clicked() const QList &certs( dlg->certificatesToImport() ); if ( !QgsApplication::authManager()->storeCertAuthorities( certs ) ) { - messageBar()->pushMessage( tr( "ERROR storing CA(s) in authentication database" ), Qgis::MessageLevel::Critical ); + messageBar()->pushMessage( tr( "ERROR storing CA(s) in authentication storage" ), Qgis::MessageLevel::Critical ); } QgsApplication::authManager()->rebuildCaCertsCache(); @@ -501,19 +501,19 @@ void QgsAuthAuthoritiesEditor::btnRemoveCa_clicked() if ( cert.isNull() ) { - messageBar()->pushMessage( tr( "Certificate could not be found in database for id %1:" ).arg( digest ), Qgis::MessageLevel::Warning ); + messageBar()->pushMessage( tr( "Certificate could not be found in the authentication storage for id %1:" ).arg( digest ), Qgis::MessageLevel::Warning ); return; } if ( !QgsApplication::authManager()->removeCertAuthority( cert ) ) { - messageBar()->pushMessage( tr( "ERROR removing CA from authentication database for id %1:" ).arg( digest ), Qgis::MessageLevel::Critical ); + messageBar()->pushMessage( tr( "ERROR removing CA from the authentication storage for id %1:" ).arg( digest ), Qgis::MessageLevel::Critical ); return; } if ( !QgsApplication::authManager()->removeCertTrustPolicy( cert ) ) { - messageBar()->pushMessage( tr( "ERROR removing cert trust policy from authentication database for id %1:" ).arg( digest ), Qgis::MessageLevel::Critical ); + messageBar()->pushMessage( tr( "ERROR removing cert trust policy from the authentication storage for id %1:" ).arg( digest ), Qgis::MessageLevel::Critical ); return; } @@ -646,11 +646,11 @@ void QgsAuthAuthoritiesEditor::btnCaFile_clicked() if ( !QgsApplication::authManager()->storeAuthSetting( QStringLiteral( "cafile" ), QVariant( fn ) ) ) { - logMessage( QObject::tr( "Could not store 'CA file path' in authentication database." ), QObject::tr( "Authorities Manager" ), Qgis::MessageLevel::Warning ); + logMessage( QObject::tr( "Could not store 'CA file path' in authentication storage." ), QObject::tr( "Authorities Manager" ), Qgis::MessageLevel::Warning ); } if ( !QgsApplication::authManager()->storeAuthSetting( QStringLiteral( "cafileallowinvalid" ), QVariant( dlg->allowInvalidCerts() ) ) ) { - logMessage( QObject::tr( "Could not store 'CA file allow invalids' setting in authentication database." ), QObject::tr( "Authorities Manager" ), Qgis::MessageLevel::Warning ); + logMessage( QObject::tr( "Could not store 'CA file allow invalids' setting in authentication storage." ), QObject::tr( "Authorities Manager" ), Qgis::MessageLevel::Warning ); } QgsApplication::authManager()->rebuildCaCertsCache(); @@ -682,12 +682,12 @@ void QgsAuthAuthoritiesEditor::btnCaFileClear_clicked() { if ( !QgsApplication::authManager()->removeAuthSetting( QStringLiteral( "cafile" ) ) ) { - logMessage( QObject::tr( "Could not remove 'CA file path' from authentication database." ), QObject::tr( "Authorities Manager" ), Qgis::MessageLevel::Warning ); + logMessage( QObject::tr( "Could not remove 'CA file path' from authentication storage." ), QObject::tr( "Authorities Manager" ), Qgis::MessageLevel::Warning ); return; } if ( !QgsApplication::authManager()->removeAuthSetting( QStringLiteral( "cafileallowinvalid" ) ) ) { - logMessage( QObject::tr( "Could not remove 'CA file allow invalids' setting from authentication database." ), QObject::tr( "Authorities Manager" ), Qgis::MessageLevel::Warning ); + logMessage( QObject::tr( "Could not remove 'CA file allow invalids' setting from authentication storage." ), QObject::tr( "Authorities Manager" ), Qgis::MessageLevel::Warning ); return; } @@ -702,7 +702,7 @@ void QgsAuthAuthoritiesEditor::btnCaFileClear_clicked() { if ( !QgsApplication::authManager()->removeCertTrustPolicies( certs ) ) { - messageBar()->pushMessage( tr( "ERROR removing cert(s) trust policy from authentication database." ), Qgis::MessageLevel::Critical ); + messageBar()->pushMessage( tr( "ERROR removing cert(s) trust policy from authentication storage." ), Qgis::MessageLevel::Critical ); return; } QgsApplication::authManager()->rebuildCertTrustCache(); diff --git a/src/gui/auth/qgsautheditorwidgets.cpp b/src/gui/auth/qgsautheditorwidgets.cpp index 518a0ebadb10..bce20c13641a 100644 --- a/src/gui/auth/qgsautheditorwidgets.cpp +++ b/src/gui/auth/qgsautheditorwidgets.cpp @@ -164,8 +164,8 @@ void QgsAuthEditorWidgets::setupUtilitiesMenu() mActionAutoClearAccessCache->setCheckable( true ); mActionAutoClearAccessCache->setChecked( QgsSettings().value( QStringLiteral( "clear_auth_cache_on_errors" ), true, QgsSettings::Section::Auth ).toBool() ); - mActionPasswordHelperDelete = new QAction( tr( "Clear the Master Password from your %1…" ).arg( QgsAuthManager::passwordHelperDisplayName( true ) ), this ); - mActionPasswordHelperEnable = new QAction( tr( "Integrate Master Password with your %1" ).arg( QgsAuthManager::passwordHelperDisplayName( true ) ), this ); + mActionPasswordHelperDelete = new QAction( tr( "Clear the Master Password from the %1…" ).arg( QgsAuthManager::passwordHelperDisplayName( true ) ), this ); + mActionPasswordHelperEnable = new QAction( tr( "Integrate Master Password with the %1" ).arg( QgsAuthManager::passwordHelperDisplayName( true ) ), this ); mActionPasswordHelperLoggingEnable = new QAction( tr( "Enable Password Helper Debug Log" ), this ); mActionPasswordHelperEnable->setCheckable( true ); diff --git a/src/gui/auth/qgsauthguiutils.cpp b/src/gui/auth/qgsauthguiutils.cpp index 920bacc9f7cb..3ce72b30e371 100644 --- a/src/gui/auth/qgsauthguiutils.cpp +++ b/src/gui/auth/qgsauthguiutils.cpp @@ -331,7 +331,7 @@ QString QgsAuthGuiUtils::getOpenFileName( QWidget *parent, const QString &title, void QgsAuthGuiUtils::passwordHelperDelete( QgsMessageBar *msgbar, QWidget *parent ) { - if ( QMessageBox::warning( parent, QObject::tr( "Delete Password" ), QObject::tr( "Do you really want to delete the master password from your %1?" ).arg( QgsAuthManager::passwordHelperDisplayName() ), QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Cancel ) == QMessageBox::Cancel ) + if ( QMessageBox::warning( parent, QObject::tr( "Delete Password" ), QObject::tr( "Do you really want to delete the master password from the %1?" ).arg( QgsAuthManager::passwordHelperDisplayName() ), QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Cancel ) == QMessageBox::Cancel ) { return; } @@ -344,7 +344,7 @@ void QgsAuthGuiUtils::passwordHelperDelete( QgsMessageBar *msgbar, QWidget *pare } else { - msg = QObject::tr( "Master password was successfully deleted from your %1" ) + msg = QObject::tr( "Master password was successfully deleted from the %1" ) .arg( QgsAuthManager::passwordHelperDisplayName() ); level = Qgis::MessageLevel::Info; diff --git a/src/gui/auth/qgsauthidentitieseditor.cpp b/src/gui/auth/qgsauthidentitieseditor.cpp index b2c032608a71..96e469707758 100644 --- a/src/gui/auth/qgsauthidentitieseditor.cpp +++ b/src/gui/auth/qgsauthidentitieseditor.cpp @@ -278,7 +278,7 @@ void QgsAuthIdentitiesEditor::btnAddIdentity_clicked() const QPair &bundle( dlg->certBundleToImport() ); if ( !QgsApplication::authManager()->storeCertIdentity( bundle.first, bundle.second ) ) { - messageBar()->pushMessage( tr( "ERROR storing identity bundle in authentication database." ), Qgis::MessageLevel::Critical ); + messageBar()->pushMessage( tr( "ERROR storing identity bundle in authentication storage." ), Qgis::MessageLevel::Critical ); } populateIdentitiesView(); mRootCertIdentItem->setExpanded( true ); @@ -326,7 +326,7 @@ void QgsAuthIdentitiesEditor::btnRemoveIdentity_clicked() if ( !QgsApplication::authManager()->removeCertIdentity( digest ) ) { - messageBar()->pushMessage( tr( "ERROR removing cert identity from authentication database for id %1:" ).arg( digest ), Qgis::MessageLevel::Critical ); + messageBar()->pushMessage( tr( "ERROR removing cert identity from authentication storage for id %1:" ).arg( digest ), Qgis::MessageLevel::Critical ); return; } diff --git a/src/gui/auth/qgsauthmasterpassresetdialog.cpp b/src/gui/auth/qgsauthmasterpassresetdialog.cpp index 6fd4c34d0924..5dde733766ad 100644 --- a/src/gui/auth/qgsauthmasterpassresetdialog.cpp +++ b/src/gui/auth/qgsauthmasterpassresetdialog.cpp @@ -48,10 +48,10 @@ QgsMasterPasswordResetDialog::QgsMasterPasswordResetDialog( QWidget *parent ) } } - QString warning = tr( "Your authentication database will be duplicated and re-encrypted using the new password." ); + QString warning = tr( "The authentication store will be re-encrypted using the new password." ); if ( QgsApplication::authManager()->passwordHelperEnabled() ) { - warning += QStringLiteral( "

%1

" ).arg( tr( "Your new password will automatically be stored in the system %1." ).arg( QgsAuthManager::passwordHelperDisplayName() ) ); + warning += QStringLiteral( "

%1

" ).arg( tr( "The new password will automatically be stored in the system %1." ).arg( QgsAuthManager::passwordHelperDisplayName() ) ); } lblWarning->setText( warning ); diff --git a/src/gui/auth/qgsauthserverseditor.cpp b/src/gui/auth/qgsauthserverseditor.cpp index 4f7c42ed42d1..195d5feabe95 100644 --- a/src/gui/auth/qgsauthserverseditor.cpp +++ b/src/gui/auth/qgsauthserverseditor.cpp @@ -303,7 +303,7 @@ void QgsAuthServersEditor::btnRemoveServer_clicked() if ( !QgsApplication::authManager()->removeSslCertCustomConfig( digest, hostport ) ) { - messageBar()->pushMessage( tr( "ERROR removing SSL custom config from authentication database for host:port, id %1:" ).arg( hostport, digest ), Qgis::MessageLevel::Critical ); + messageBar()->pushMessage( tr( "ERROR removing SSL custom config from authentication storage for host:port, id %1:" ).arg( hostport, digest ), Qgis::MessageLevel::Critical ); return; } diff --git a/src/gui/auth/qgsauthsslconfigwidget.cpp b/src/gui/auth/qgsauthsslconfigwidget.cpp index 9755311b4d01..2a15e143c9ee 100644 --- a/src/gui/auth/qgsauthsslconfigwidget.cpp +++ b/src/gui/auth/qgsauthsslconfigwidget.cpp @@ -294,7 +294,7 @@ void QgsAuthSslConfigWidget::saveSslCertConfig() } if ( !QgsApplication::authManager()->storeSslCertCustomConfig( sslCustomConfig() ) ) { - QgsDebugError( QStringLiteral( "SSL custom config FAILED to store in authentication database" ) ); + QgsDebugError( QStringLiteral( "SSL custom config FAILED to store in authentication storage" ) ); } } diff --git a/src/ui/auth/qgsauthauthoritieseditor.ui b/src/ui/auth/qgsauthauthoritieseditor.ui index d85912c6bf33..0ea828b34b07 100644 --- a/src/ui/auth/qgsauthauthoritieseditor.ui +++ b/src/ui/auth/qgsauthauthoritieseditor.ui @@ -107,7 +107,7 @@ - Import certificate(s) to authentication database + Import certificate(s) to authentication storage @@ -121,7 +121,7 @@ - Remove certificate from authentication database + Remove certificate from authentication storage diff --git a/src/ui/auth/qgsauthcertificatemanager.ui b/src/ui/auth/qgsauthcertificatemanager.ui index f8def8142efa..a9f18352a910 100644 --- a/src/ui/auth/qgsauthcertificatemanager.ui +++ b/src/ui/auth/qgsauthcertificatemanager.ui @@ -92,7 +92,7 @@ color: rgb(128, 128, 128); - Note: Editing writes directly to authentication database + Note: Editing writes directly to authentication storage Qt::AlignCenter diff --git a/src/ui/auth/qgsauthconfigedit.ui b/src/ui/auth/qgsauthconfigedit.ui index 0aa5294bf056..7b2f22ebfd3c 100644 --- a/src/ui/auth/qgsauthconfigedit.ui +++ b/src/ui/auth/qgsauthconfigedit.ui @@ -59,7 +59,7 @@ color: rgb(128, 128, 128); - Note: Saving writes directly to authentication database + Note: Saving writes directly to authentication storage Qt::AlignCenter diff --git a/src/ui/auth/qgsauthconfiguriedit.ui b/src/ui/auth/qgsauthconfiguriedit.ui index 035c93e3858d..83e8b7a579a4 100644 --- a/src/ui/auth/qgsauthconfiguriedit.ui +++ b/src/ui/auth/qgsauthconfiguriedit.ui @@ -62,7 +62,7 @@ color: rgb(128, 128, 128); - Note: Button actions above affect authentication database + Note: Button actions above affect authentication storage Qt::AlignCenter diff --git a/src/ui/auth/qgsautheditorwidgets.ui b/src/ui/auth/qgsautheditorwidgets.ui index 8358f7fffce8..3da9d184fb3a 100644 --- a/src/ui/auth/qgsautheditorwidgets.ui +++ b/src/ui/auth/qgsautheditorwidgets.ui @@ -145,7 +145,7 @@ QLabel {color: rgb(128, 128, 128);} - Note: Editing writes directly to authentication database + Note: Editing writes directly to authentication storage Qt::AlignCenter diff --git a/src/ui/auth/qgsauthidentitieseditor.ui b/src/ui/auth/qgsauthidentitieseditor.ui index 3c8ef986ade2..ea4fbe8f770c 100644 --- a/src/ui/auth/qgsauthidentitieseditor.ui +++ b/src/ui/auth/qgsauthidentitieseditor.ui @@ -55,7 +55,7 @@ - Import identity bundle to authentication database + Import identity bundle to authentication storage @@ -69,7 +69,7 @@ - Remove identity bundle from authentication database + Remove identity bundle from authentication storage diff --git a/src/ui/auth/qgsauthsettingswidget.ui b/src/ui/auth/qgsauthsettingswidget.ui index aaf624d849f9..e2862a735b65 100644 --- a/src/ui/auth/qgsauthsettingswidget.ui +++ b/src/ui/auth/qgsauthsettingswidget.ui @@ -101,7 +101,7 @@ - Configurations store encrypted credentials in the QGIS authentication database. + Configurations store encrypted credentials in the QGIS authentication storage. Qt::PlainText