From 1e9d09525d8ff4365ac48cd3d00390d589fcc09c Mon Sep 17 00:00:00 2001 From: coles Date: Mon, 4 May 2009 22:04:19 +0000 Subject: Got rid of some 'word games' with i18n messages. Because word order etc. might need to change between different languages, it's best to roll sentences up into one i18n message with %1, %2 etc. rather than using string concatenation with fragments of messages. git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@963560 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/networkaccessmanager.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp index d92edbd6..bd1e8d8e 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("Enter username and password for ") + - Qt::escape(reply->url().toString()) + i18n(" at ") + Qt::escape(reply->url().toString()) + ""; + QString introMessage = i18n("Enter username and password for %1 at %2", + Qt::escape(reply->url().toString()), + Qt::escape(reply->url().toString()) ); passwordWidget.introLabel->setText(introMessage); passwordWidget.introLabel->setWordWrap(true); @@ -137,7 +138,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("Connect to proxy ") + Qt::escape(proxy.hostName()) + i18n(" using:"); + QString introMessage = i18n("Connect to proxy %1 using:", Qt::escape(proxy.hostName()) ); proxyWdg.introLabel->setText(introMessage); proxyWdg.introLabel->setWordWrap(true); -- cgit v1.2.1