From f483c97935491b78b63c315a8f911acc93292008 Mon Sep 17 00:00:00 2001 From: leca Date: Sun, 30 Mar 2025 21:26:41 +0300 Subject: [PATCH] wrap with tr --- http_server/http_server.cpp | 10 +++++----- main.cpp | 2 +- settingsdialog.cpp | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/http_server/http_server.cpp b/http_server/http_server.cpp index 4d7404b..b165bfb 100644 --- a/http_server/http_server.cpp +++ b/http_server/http_server.cpp @@ -34,7 +34,7 @@ int HttpServer::start() { serverSocket = socket(AF_INET, SOCK_STREAM, 0); if (serverSocket < 0) { - std::cerr << "Could not obtain socket." << std::endl; + std::cerr << QObject::tr("Could not obtain socket.").toStdString() << std::endl; number_of_retries ++; continue; } @@ -43,20 +43,20 @@ int HttpServer::start() { serverAddress.sin_addr.s_addr = INADDR_ANY; if (bind(serverSocket, (sockaddr *)&serverAddress, sizeof(serverAddress)) < 0) { - std::cerr << "Port " << port << " seems to be occupied. Trying to generate another one" << std::endl; + std::cerr << QObject::tr("Port ").toStdString() << port << QObject::tr(" seems to be occupied. Trying to generate another one").toStdString() << std::endl; number_of_retries ++; generateRandomPort(); continue; } if (listen(serverSocket, 1) < 0) { - std::cerr << "Could not listen port." << std::endl; + std::cerr << QObject::tr("Could not listen port.").toStdString() << std::endl; number_of_retries ++; generateRandomPort(); continue; } started = true; - std::cout << "Listening on port: " << port << std::endl; + std::cout << QObject::tr("Listening on port: ").toStdString() << port << std::endl; listenClientsThread = std::thread(&HttpServer::acceptClients, this); return 0; } @@ -86,7 +86,7 @@ void HttpServer::handleClient(int clientSocket) { if (send(clientSocket, response.c_str(), response.length(), 0) < 0) { std::cerr << response.c_str() << std::endl; std::cerr << response.length() << std::endl; - std::cerr << "Could not send message" << std::endl; + std::cerr << QObject::tr("Could not send message").toStdString() << std::endl; } emit ((OFDScene *)caller)->httpNewMessage(QString::fromStdString(std::string(buffer))); } diff --git a/main.cpp b/main.cpp index 36435bc..767f83b 100644 --- a/main.cpp +++ b/main.cpp @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) { lang = QString::fromStdString("en_US"); } - std::cout << "Using locale: " << lang.toStdString() << std::endl; + std::cout << QObject::tr("Using locale: ").toStdString() << lang.toStdString() << std::endl; translator.load(":/translation/" + lang + ".qm"); app.installTranslator(&translator); diff --git a/settingsdialog.cpp b/settingsdialog.cpp index 50c7cb0..e90d2f7 100644 --- a/settingsdialog.cpp +++ b/settingsdialog.cpp @@ -37,7 +37,6 @@ SettingsDialog::SettingsDialog(QWidget *parent) ui->printHeaderCheckBox->setChecked(this->settings.get_all_settings()["print_header"]); ui->printTotalCheckBox->setChecked(this->settings.get_all_settings()["print_total"]); - std::cout << settings.get_all_settings() << std::endl; int currentLanguageIndex = 0; bool languageSettingPresent = false;