summaryrefslogtreecommitdiff
path: root/src/networkaccessmanager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/networkaccessmanager.cpp')
-rw-r--r--src/networkaccessmanager.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index d92edbd6..c9b94a8d 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -109,8 +109,9 @@ void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthent
passwordWidget.iconLabel->setText(QString());
passwordWidget.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
- QString introMessage = i18n("<qt>Enter username and password for ") +
- Qt::escape(reply->url().toString()) + i18n(" at ") + Qt::escape(reply->url().toString()) + "</qt>";
+ QString introMessage = i18n("<qt>Enter username and password for %1 at %2</qt>",
+ Qt::escape(reply->url().toString()),
+ Qt::escape(reply->url().toString()) );
passwordWidget.introLabel->setText(introMessage);
passwordWidget.introLabel->setWordWrap(true);
@@ -121,6 +122,7 @@ void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthent
}
}
+
void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth)
{
MainWindow *mainWindow = Application::instance()->mainWindow();
@@ -137,7 +139,7 @@ void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &prox
proxyWdg.iconLabel->setText(QString());
proxyWdg.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
- QString introMessage = i18n("<qt>Connect to proxy ") + Qt::escape(proxy.hostName()) + i18n(" using:</qt>");
+ QString introMessage = i18n("<qt>Connect to proxy %1 using:</qt>", Qt::escape(proxy.hostName()) );
proxyWdg.introLabel->setText(introMessage);
proxyWdg.introLabel->setWordWrap(true);
@@ -148,6 +150,7 @@ void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &prox
}
}
+
#ifndef QT_NO_OPENSSL
void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QList<QSslError> &error)
{