Swiftdiff options
| author | Pavol Babincak <scroolik@gmail.com> | 2012-04-24 18:18:18 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-04-24 18:32:19 (GMT) |
| commit | f52b5f87cf21c9cd8dea4ff1fad8fe5a32dbae80 (patch) | |
| tree | 623f756a90525e0879037d7d9cc73ef73cfbe9c8 /Swift/Controllers | |
| parent | 02c18de062510e8061598bf492c68cb5b0624831 (diff) | |
| download | swift-f52b5f87cf21c9cd8dea4ff1fad8fe5a32dbae80.zip swift-f52b5f87cf21c9cd8dea4ff1fad8fe5a32dbae80.tar.bz2 | |
File transfer strings made translatable
License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Diffstat (limited to 'Swift/Controllers')
| -rw-r--r-- | Swift/Controllers/Chat/ChatController.cpp | 4 | ||||
| -rw-r--r-- | Swift/Controllers/FileTransfer/FileTransferController.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Swift/Controllers/Chat/ChatController.cpp b/Swift/Controllers/Chat/ChatController.cpp index 4352c8b..3f16071 100644 --- a/Swift/Controllers/Chat/ChatController.cpp +++ b/Swift/Controllers/Chat/ChatController.cpp @@ -185,9 +185,9 @@ void ChatController::handleSettingChanged(const std::string& settingPath) { void ChatController::checkForDisplayingDisplayReceiptsAlert() { if (userWantsReceipts_ && (contactSupportsReceipts_ == ChatWindow::No)) { - chatWindow_->setAlert("This chat doesn't support delivery receipts."); + chatWindow_->setAlert(QT_TRANSLATE_NOOP("", "This chat doesn't support delivery receipts.")); } else if (userWantsReceipts_ && (contactSupportsReceipts_ == ChatWindow::Maybe)) { - chatWindow_->setAlert("This chat may not support delivery receipts. You might not receive delivery receipts for the messages you sent."); + chatWindow_->setAlert(QT_TRANSLATE_NOOP("", "This chat may not support delivery receipts. You might not receive delivery receipts for the messages you sent.")); } else { chatWindow_->cancelAlert(); } diff --git a/Swift/Controllers/FileTransfer/FileTransferController.cpp b/Swift/Controllers/FileTransfer/FileTransferController.cpp index a25dfe6..3feaf49 100644 --- a/Swift/Controllers/FileTransfer/FileTransferController.cpp +++ b/Swift/Controllers/FileTransfer/FileTransferController.cpp @@ -12,6 +12,7 @@ #include <boost/bind.hpp> #include "Swift/Controllers/UIInterfaces/ChatWindow.h" #include <Swiften/Base/Log.h> +#include <Swift/Controllers/Intl.h> #include <boost/smart_ptr/make_shared.hpp> @@ -38,7 +39,7 @@ const JID &FileTransferController::getOtherParty() const { std::string FileTransferController::setChatWindow(ChatWindow* wnd, std::string nickname) { chatWindow = wnd; if (sending) { - uiID = wnd->addFileTransfer("me", true, filename, boost::filesystem::file_size(boost::filesystem::path(filename))); + uiID = wnd->addFileTransfer(QT_TRANSLATE_NOOP("", "me"), true, filename, boost::filesystem::file_size(boost::filesystem::path(filename))); } else { uiID = wnd->addFileTransfer(nickname, false, filename, transfer->fileSizeInBytes); } |