From c5cb22ff346891dc2921fa5442ae754298e35a0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B0=E7=B3=96=E9=9B=AA=E7=8B=B8?= Date: Sat, 6 Apr 2024 20:08:34 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E4=B8=AD=E8=8B=B1?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/App.pro | 3 + App/language_EN.ts | 184 +++++++++++++++++++++++++++++++- App/language_zh_CN.ts | 190 +++++++++++++++++++++++++++++++++- App/main.cpp | 6 +- App/resource.qrc | 4 + App/tcpclient.cpp | 22 ++-- App/tcpserver.cpp | 15 +-- App/uil_addchat.cpp | 4 +- App/uil_chatboxwidget.cpp | 34 +++--- App/uil_chatlist.cpp | 6 +- App/uil_loginwidget.cpp | 7 +- Tester/tst_PolyChatTester.cpp | 16 +-- 12 files changed, 440 insertions(+), 51 deletions(-) diff --git a/App/App.pro b/App/App.pro index 9c4cabb..5fdc24f 100644 --- a/App/App.pro +++ b/App/App.pro @@ -47,4 +47,7 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin RESOURCES += \ resource.qrc +TRANSLATIONS += language_zh_CN.ts \ + language_EN.ts + RC_ICONS = logo_fox.ico diff --git a/App/language_EN.ts b/App/language_EN.ts index 358b234..4fce81e 100644 --- a/App/language_EN.ts +++ b/App/language_EN.ts @@ -11,6 +11,7 @@ + Add new chat Add new chat @@ -34,6 +35,16 @@ Return Return + + + Warning + Warning + + + + Name can not be empty + Name can not be empty + ChatBoxWidget @@ -145,6 +156,7 @@ + Send file Send file @@ -200,7 +212,6 @@ - Number of online user: Number of online user: 0 Number of online user: @@ -240,6 +251,91 @@ IP IP address + + Chat %1 on port %2 + [Chat] %1 on port %2 + Chat %1 on port %2 + + + + Clean all message + Clean all message + + + + Are you sure you want to clear all messages? + Are you sure you want to clear all messages? + + + + + + Warning + Warning + + + + Can not save! +Message box is empty + Can not save! +Message box is empty + + + + Save file + Save file + + + + Save cancel + Save cancel + + + + Cancel sending file + Cancel sending file + + + + Error + Error + + + + File size cannot exceed 1Gb + File size cannot exceed 1GB + + + + File reception request + File reception request + + + + [%1] from group [%2] wants to send you a file, do you want to receive it? + +--------------------- +File information: +Name: %3 +Size: %4Kb + [%1] from group [%2] wants to send you a file, do you want to receive it? + +--------------------- +File information: +Name: %3 +Size: %4Kb + + + + %1 online + %1 online！ + %1 online + + + + %1 left on %2 + %1 left on %2 + ChatList @@ -303,6 +399,21 @@ XXXX/XXXXXX + + + PolyChat Chat list + PolyChat Chat list + + + + Warning + Warning + + + + Chat with the same name already exists + Chat with the same name already exists + LoginWidget @@ -341,6 +452,16 @@ Return Return + + + PolyChat Login + PolyChat Login + + + + Name or Group number can not be empty + Name or Group number can not be empty + TcpClient @@ -442,6 +563,40 @@ Receipter Return + + + File receipter + File receipter + + + + Save file to + Save file to + + + + ERROR + ERROR + + + + File path is empty, you did not specify a save directory. +You can click on the `Save` button to receive the file again + File path is empty, you did not specify a save directory. +You can click on the `Save` button to receive the file again + + + + Cancel receive + Cancel receive + + + + If the file is not received, it will be stopped and disconnected. +Are you sure you want to cancel receiving files? + If the file is not received, it will be stopped and disconnected. +Are you sure you want to cancel receiving files? + TcpServer @@ -521,5 +676,32 @@ Receipter Esc + + + File sender + File sender + + + + ERROR + ERROR + + + + You have not selected any files + You have not selected any files + + + + Cancel send + Cancel send + + + + The current file transfer will be cancelled if it is not completed and all connections will be disconnected. +Are you sure you want to cancel sending files? + The current file transfer will be cancelled if it is not completed and all connections will be disconnected. +Are you sure you want to cancel sending files? + diff --git a/App/language_zh_CN.ts b/App/language_zh_CN.ts index 744ffd5..9507b9a 100644 --- a/App/language_zh_CN.ts +++ b/App/language_zh_CN.ts @@ -10,6 +10,7 @@ + Add new chat 新建群聊 @@ -33,6 +34,16 @@ Return 返回 + + + Warning + 警告 + + + + Name can not be empty + 名称不能为空 + ChatBoxWidget @@ -144,6 +155,7 @@ + Send file 发送文件 @@ -199,7 +211,6 @@ - Number of online user: Number of online user: 0 当前在线人数: @@ -239,6 +250,91 @@ IP IP 地址 + + Chat %1 on port %2 + [Chat] %1 on port %2 + 群聊 %1 在端口 %2 + + + + Clean all message + 清空聊天框 + + + + Are you sure you want to clear all messages? + 您确定要清空聊天框吗？ + + + + + + Warning + 警告 + + + + Can not save! +Message box is empty + 无法保存！ +信息框为空 + + + + Save file + 保存文件 + + + + Save cancel + 取消保存 + + + + Cancel sending file + 取消文件发送 + + + + Error + 错误 + + + + File size cannot exceed 1Gb + 文件大小不能超过 1GB + + + + File reception request + 文件接收请求 + + + + [%1] from group [%2] wants to send you a file, do you want to receive it? + +--------------------- +File information: +Name: %3 +Size: %4Kb + 来自 [%2] 的 [%1] 希望向您发送一个文件，您想接收吗？ + +--------------------- +文件信息： +文件名： %3 +大小： %4Kb + + + + %1 online + %1 online！ + %1 上线 + + + + %1 left on %2 + %1 在 %2 退出 + ChatList @@ -302,6 +398,21 @@ XXXX/XXXXXX + + + PolyChat Chat list + PolyChat 群聊列表 + + + + Warning + 警告 + + + + Chat with the same name already exists + 已存在同名群聊 + LoginWidget @@ -340,6 +451,16 @@ Return 返回 + + + PolyChat Login + 登录 PolyChat + + + + Name or Group number can not be empty + 名称或班级号不能为空 + TcpClient @@ -441,6 +562,46 @@ Receipter Return + + + File receipter + 文件接收器 + + + + Save file to + 文件保存至 + + + + ERROR + 错误 + + + + File path is empty, you did not specify a save directory. +You can click on the `Save` button to receive the file again + 文件路径为空，您没有指定保存目录 +您可以点击 "保存 "按钮再次接收文件 + + + File path is empty, because the file save path is empty (You did not specify a save directory). +You can click on the `Save` button to receive the file again + 文件路径为空，您没有指定保存目录 +您可以点击 "保存 "按钮再次接收文件 + + + + Cancel receive + 取消接收 + + + + If the file is not received, it will be stopped and disconnected. +Are you sure you want to cancel receiving files? + 如果没有接收完文件，此操作会停止并断开连接 +您确定要取消接收文件吗？ + TcpServer @@ -520,5 +681,32 @@ Receipter Esc + + + File sender + 文件发送器 + + + + ERROR + 错误 + + + + You have not selected any files + 您没有选择任何文件 + + + + Cancel send + 取消发送 + + + + The current file transfer will be cancelled if it is not completed and all connections will be disconnected. +Are you sure you want to cancel sending files? + 如果当前文件传输未完成，则将取消传输，并断开所有连接 +您确定要取消发送文件吗？ + diff --git a/App/main.cpp b/App/main.cpp index 5db51f4..f90f062 100644 --- a/App/main.cpp +++ b/App/main.cpp @@ -1,4 +1,5 @@ #include +#include #include "uil_chatboxwidget.h" #include "uil_loginwidget.h" @@ -15,7 +16,10 @@ ChatList* chatList = nullptr; // Widget ChatList (Onl int main(int argc, char *argv[]) { QApplication a(argc, argv); - a.setWindowIcon(QIcon(":/icon/icons/logo_fox.png")); + a.setWindowIcon(QIcon(":/icon/icons/logo_fox.png")); + +// QString appDirPath = QCoreApplication::applicationDirPath(); //程序所在路径 +// qDebug() << appDirPath; LoginWidget login; login.show(); diff --git a/App/resource.qrc b/App/resource.qrc index d08dba0..e4ccd92 100644 --- a/App/resource.qrc +++ b/App/resource.qrc @@ -29,4 +29,8 @@ background/bg-login.png + + language_EN.qm + language_zh_CN.qm + diff --git a/App/tcpclient.cpp b/App/tcpclient.cpp index ab7cfb7..2b922f4 100644 --- a/App/tcpclient.cpp +++ b/App/tcpclient.cpp @@ -13,7 +13,7 @@ TcpClient::TcpClient(QWidget *parent, const QString &fileName, qint64 fileSizeBy ui(new Ui::TcpClient) { ui->setupUi(this); - this->setWindowTitle("File receipter"); + this->setWindowTitle(tr("File receipter")); this->setAttribute(Qt::WA_DeleteOnClose); appendTextBrowser(Qt::blue, "[INFO] TCP client start"); @@ -89,12 +89,12 @@ void TcpClient::connectTcpServerAndOpenFile() { /* 获取保存路径 */ ui->lbFileSavePath->setText("[EMPTY] Click `Save` to receive the file"); - QString savePath = QFileDialog::getSaveFileName(this, "Save file to", fileName); + QString savePath = QFileDialog::getSaveFileName(this, tr("Save file to"), fileName); if (savePath.isEmpty()) { appendTextBrowser(Qt::red, "[ERROR] Save cancel, because the file save path is empty. Click on the `Save` button to receive the file again"); - QMessageBox::critical(this, "ERROR", "File path is empty, because the file save path is empty (You did not specify a save directory).\n" - "You can click on the `Save` button to receive the file again"); + QMessageBox::critical(this, tr("ERROR"), tr("File path is empty, you did not specify a save directory.\n" + "You can click on the `Save` button to receive the file again")); return; } @@ -183,11 +183,12 @@ void TcpClient::receiveTcpDataAndSave() void TcpClient::closeEvent(QCloseEvent* event) { - QMessageBox::StandardButton btnPush = QMessageBox::warning(this, "Cancel receive", - "If the file is not received, it will be stopped and disconnected.\n" - "Are you sure you want to cancel receiving files?", - QMessageBox::No | QMessageBox::Yes, - QMessageBox::No); + QMessageBox::StandardButton btnPush = + QMessageBox::warning(this, tr("Cancel receive"), + tr("If the file is not received, it will be stopped and disconnected.\n" + "Are you sure you want to cancel receiving files?"), + QMessageBox::No | QMessageBox::Yes, + QMessageBox::No); if (btnPush == QMessageBox::No) { event->ignore(); @@ -196,8 +197,9 @@ void TcpClient::closeEvent(QCloseEvent* event) { tcpSocket->disconnectFromHost(); //断开连接 tcpSocket->close(); //关闭套接字 + event->accept(); - QWidget::closeEvent(event); + QWidget::closeEvent(event); // 向上传递 } } diff --git a/App/tcpserver.cpp b/App/tcpserver.cpp index 916e4f0..5a81686 100644 --- a/App/tcpserver.cpp +++ b/App/tcpserver.cpp @@ -13,7 +13,7 @@ TcpServer::TcpServer(QWidget *parent, QString filePath, QHostAddress ip, qint16 ui(new Ui::TcpServer) { ui->setupUi(this); - this->setWindowTitle("File sender"); + this->setWindowTitle(tr("File sender")); this->setAttribute(Qt::WA_DeleteOnClose); appendTextBrowser(Qt::blue, "[INFO] TCP server start"); @@ -27,7 +27,7 @@ TcpServer::TcpServer(QWidget *parent, QString filePath, QHostAddress ip, qint16 if (filePath.isEmpty()) { appendTextBrowser(Qt::red, "[ERROR] Send Cancel"); - QMessageBox::critical(this, "ERROR", "File path is empty"); + QMessageBox::critical(this, tr("ERROR"), tr("You have not selected any files")); return; } @@ -187,11 +187,12 @@ void TcpServer::appendTextBrowser(Qt::GlobalColor color, QString text) void TcpServer::closeEvent(QCloseEvent* event) { - QMessageBox::StandardButton btnPush = QMessageBox::warning(this, "Cancel send", - "The current file transfer will be cancelled if it is not completed and all connections will be disconnected.\n" - "Are you sure you want to cancel sending files?", - QMessageBox::No | QMessageBox::Yes, - QMessageBox::No); + QMessageBox::StandardButton btnPush = + QMessageBox::warning(this, tr("Cancel send"), + tr("The current file transfer will be cancelled if it is not completed and all connections will be disconnected.\n" + "Are you sure you want to cancel sending files?"), + QMessageBox::No | QMessageBox::Yes, + QMessageBox::No); if (btnPush == QMessageBox::No) { event->ignore(); diff --git a/App/uil_addchat.cpp b/App/uil_addchat.cpp index f38e04c..c53b8b2 100644 --- a/App/uil_addchat.cpp +++ b/App/uil_addchat.cpp @@ -10,7 +10,7 @@ AddChat::AddChat(QWidget *parent) : ui(new Ui::AddChat) { ui->setupUi(this); - this->setWindowTitle("Add new chat"); + this->setWindowTitle(tr("Add new chat")); this->setWindowIcon(QIcon(":/icon/icons/register-add-friend.png")); this->setAttribute(Qt::WA_DeleteOnClose); this->setWindowModality(Qt::ApplicationModal); @@ -22,7 +22,7 @@ AddChat::AddChat(QWidget *parent) : this, [=](){ if (ui->leNameNewChat->text().isEmpty()) { - QMessageBox::warning(this, "Warning", "Name can not be empty"); + QMessageBox::warning(this, tr("Warning"), tr("Name can not be empty")); return; } diff --git a/App/uil_chatboxwidget.cpp b/App/uil_chatboxwidget.cpp index 4197696..338cb5b 100644 --- a/App/uil_chatboxwidget.cpp +++ b/App/uil_chatboxwidget.cpp @@ -21,9 +21,11 @@ ChatBoxWidget::ChatBoxWidget(QWidget* parent, QString name, qint16 port) port(port) { ui->setupUi(this); - this->setWindowTitle(QString("[Chat] %1 on port %2").arg(name).arg(port)); this->setAttribute(Qt::WA_DeleteOnClose); this->setWindowIcon(QIcon(":/icon/icons/user-group.png")); + this->setWindowTitle(QString("Chat %1 on port %2").arg(name, port)); +// this->setWindowTitle(tr("Chat %1 on port %2").arg(name, port)); + /* 对所有窗口的同样地址广播 8888 (告诉 ChatList 本窗口存在) */ this->udpSocketOnPortChatList = new QUdpSocket(this); @@ -94,7 +96,7 @@ ChatBoxWidget::ChatBoxWidget(QWidget* parent, QString name, qint16 port) /* 更改颜色 */ connect(ui->btnColor, &QToolButton::clicked, this, [=](){ - QColor color = QColorDialog::getColor(Qt::black); + QColor color = QColorDialog::getColor(Qt::black); // getColor 参数中颜色是默认开启颜色对话框中的颜色 ui->msgTextEdit->setTextColor(color); }); @@ -104,8 +106,8 @@ ChatBoxWidget::ChatBoxWidget(QWidget* parent, QString name, qint16 port) if (QMessageBox::Ok == QMessageBox::question(this, - "Clean all message", - "Are you sure you want to clear all messages?", + tr("Clean all message"), + tr("Are you sure you want to clear all messages?"), QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Cancel)) { @@ -117,14 +119,14 @@ ChatBoxWidget::ChatBoxWidget(QWidget* parent, QString name, qint16 port) this, [=](){ if (ui->msgTextBrowser->document()->isEmpty()) { - QMessageBox::warning(this, "Warning", "Can not save!\nMessage box is empty"); + QMessageBox::warning(this, tr("Warning"), tr("Can not save!\nMessage box is empty")); return; } - QString path = QFileDialog::getSaveFileName(this, "Save file", "PolyChat-MsgLog", "(*.txt)"); + QString path = QFileDialog::getSaveFileName(this, tr("Save file"), "PolyChat-MsgLog", "(*.txt)"); if (path.isEmpty()) { - QMessageBox::warning(this, "Warning", "Save cancel"); + QMessageBox::warning(this, tr("Warning"), tr("Save cancel")); return; } @@ -138,18 +140,18 @@ ChatBoxWidget::ChatBoxWidget(QWidget* parent, QString name, qint16 port) /* 发送文件 */ connect(ui->btnFileSend, &QToolButton::clicked, this, [=](){ - QString path = QFileDialog::getOpenFileName(this, "Send file", "."); + QString path = QFileDialog::getOpenFileName(this, tr("Send file"), "."); if (path.isEmpty()) { - QMessageBox::warning(this, "Warning", "File sending cancellation"); + QMessageBox::warning(this, tr("Warning"), tr("Cancel sending file")); return; } QFileInfo info(path); if (info.size() > FILE_SEND_MAX_BYTES) { - QMessageBox::critical(this, "Error", "File size cannot exceed 1Gb"); + QMessageBox::critical(this, tr("Error"), tr("File size cannot exceed 1Gb")); return; } @@ -217,7 +219,7 @@ void ChatBoxWidget::sendUDPSignal(const SignalType type) break; // END SignalType::ChatExist case SignalType::ChatDestory: - dataStream << QString("SignalType::ChatDestory"); + dataStream << QString("SignalType::ChatDestory"); udpSocketOnPortChatList->writeDatagram(resByteArray, QHostAddress(QHostAddress::Broadcast), DAL::getPortChatList()); @@ -249,14 +251,14 @@ void ChatBoxWidget::sendUDPSignal(const SignalType type) break; // END SignalType::File case SignalType::UserJoin: - dataStream << QString("SignalType::UserJoin"); + dataStream << QString("SignalType::UserJoin"); udpSocketOnPortChatBox->writeDatagram(resByteArray, QHostAddress(QHostAddress::Broadcast), port); break; // END SignalType::UserJoin case UserLeft: - dataStream << QString("SignalType::UserLeft"); + dataStream << QString("SignalType::UserLeft"); udpSocketOnPortChatBox->writeDatagram(resByteArray, QHostAddress(QHostAddress::Broadcast), port); @@ -343,7 +345,7 @@ void ChatBoxWidget::receiveUDPMessage() */ if (localIpAddress_6 == DAL::getLocalIpAddress()) { return; } // 如果文件接收方和发送方都是本机，那么不需要弹出文件接收请求 #endif - if (QMessageBox::Yes == QMessageBox::information(this, "File reception request", QString( + if (QMessageBox::Yes == QMessageBox::information(this, tr("File reception request"), tr( "[%1] from group [%2] wants to send you a file, do you want to receive it?\n\n" "---------------------\n" "File information:\n" @@ -386,7 +388,7 @@ void ChatBoxWidget::userJoin(QString name, QString groupNumber, QHostAddress ip) /* 追加聊天记录 */ ui->msgTextBrowser->setTextColor(Qt::gray); - ui->msgTextBrowser->append(QString("%1 online！").arg(name)); + ui->msgTextBrowser->append(tr("%1 online").arg(name)); /* 在线用户更新 */ ui->lbNumberOnlineUse->setText(QString::number(ui->tbUser->rowCount())); @@ -407,7 +409,7 @@ void ChatBoxWidget::userLeft(QString name, QString time) /* 追加聊天记录 */ ui->msgTextBrowser->setTextColor(Qt::gray); - ui->msgTextBrowser->append(QString("%1 left on %2").arg(name, time)); + ui->msgTextBrowser->append(tr("%1 left on %2").arg(name, time)); /* 在线用户更新 */ ui->lbNumberOnlineUse->setText(QString::number(ui->tbUser->rowCount())); diff --git a/App/uil_chatlist.cpp b/App/uil_chatlist.cpp index bbdcabf..3453bf6 100644 --- a/App/uil_chatlist.cpp +++ b/App/uil_chatlist.cpp @@ -13,7 +13,7 @@ ChatList::ChatList(QWidget* parent, QString localUserName, QString localUserGrou ui(new Ui::ChatList) { ui->setupUi(this); - this->setWindowTitle("PolyChat Chat list"); + this->setWindowTitle(tr("PolyChat Chat list")); this->setWindowIcon(QIcon(":/icon/icons/logo_fox.png")); @@ -41,7 +41,7 @@ ChatList::ChatList(QWidget* parent, QString localUserName, QString localUserGrou if (isChatExist(name)) { - QMessageBox::warning(this, "Warning", "Chat with the same name already exists"); + QMessageBox::warning(this, tr("Warning"), tr("Chat with the same name already exists")); return; } @@ -379,7 +379,7 @@ bool ChatList::isNeedHideBtn(QString textOnBtn) /* 如果文本框中的内容为空，则不需要隐藏 */ if (ui->leSearch->text().isEmpty()) return false; - QString strRegExp("\\S*" + ui->leSearch->text() + "\\S*"); + QString strRegExp("\\S*" + ui->leSearch->text() + "\\S*"); // 正则表达式 QRegularExpression regExp; regExp.setPattern(strRegExp); diff --git a/App/uil_loginwidget.cpp b/App/uil_loginwidget.cpp index bcc73a2..b9b9845 100644 --- a/App/uil_loginwidget.cpp +++ b/App/uil_loginwidget.cpp @@ -4,6 +4,9 @@ #include #include +#include +#include + LoginWidget::LoginWidget(QWidget *parent) : QWidget(parent), @@ -11,7 +14,7 @@ LoginWidget::LoginWidget(QWidget *parent) : { ui->setupUi(this); - this->setWindowTitle("PolyChat Login"); + this->setWindowTitle(tr("PolyChat Login")); this->setWindowIcon(QIcon(":/icon/icons/nekosilverfox.png")); ui->leUserName->setFocus(); // this->setAttribute(Qt::WA_DeleteOnClose); @@ -52,7 +55,7 @@ void LoginWidget::userLogin() bool isSuccInitLocalUser = DAL::initLocalUser(ui->leUserName->text(), ui->leUserGroupNumber->text()); if (!isSuccInitLocalUser) { - QMessageBox::warning(this, "Warning", "Name or Group number can not be empty"); + QMessageBox::warning(this, ("Warning"), tr("Name or Group number can not be empty")); return; } this->close(); diff --git a/Tester/tst_PolyChatTester.cpp b/Tester/tst_PolyChatTester.cpp index efbce94..9023ec9 100644 --- a/Tester/tst_PolyChatTester.cpp +++ b/Tester/tst_PolyChatTester.cpp @@ -946,7 +946,7 @@ void PolyChatTester::ut_tcpserver_textBrowser() void PolyChatTester::ut_chatbox_title() { ChatBoxWidget chatBox(nullptr, "3530409/90102", 2333); - QCOMPARE(chatBox.windowTitle(), QString("[Chat] %1 on port %2").arg("3530409/90102").arg(2333)); + QCOMPARE(chatBox.windowTitle(), QString("Chat %1 on port %2").arg("3530409/90102", 2333)); } /** 保证 btnBold 是可选按钮（Checkable-QToolButton），且文字显示被禁用 @@ -1495,7 +1495,7 @@ void PolyChatTester::mt_chatbox_userjoin_msgTextBrowser() chatBox.userJoin("Fox", "5140904/30202", DAL::getLocalIpAddress()); QVERIFY(initString != msgTextBrowser->toPlainText()); - QCOMPARE(msgTextBrowser->toPlainText(), QString("%1 online！").arg("Fox")); + QCOMPARE(msgTextBrowser->toPlainText(), QString("%1 online").arg("Fox")); } /** 用户离开（用户列表正确刷新） @@ -1593,7 +1593,7 @@ void PolyChatTester::mt_chatbox_userleft_msgTextBrowser() chatBox.userJoin("Fox", "5140904/30202", DAL::getLocalIpAddress()); QVERIFY(curString != msgTextBrowser->toPlainText()); - QCOMPARE(msgTextBrowser->toPlainText(), QString("%1 online！").arg("Fox")); + QCOMPARE(msgTextBrowser->toPlainText(), QString("%1 online").arg("Fox")); QString time = QDateTime::currentDateTime().toString("dd-MM-yyyy hh:mm:ss"); curString = msgTextBrowser->toPlainText(); @@ -2241,7 +2241,7 @@ void PolyChatTester::e2e_send_message() QTest::keyClicks(textEdit, "HelloThere"); QCOMPARE(textEdit->toPlainText(), "HelloThere"); - QCOMPARE(msgTextBrowser->toPlainText(), QString("%1 online！").arg("Fox")); + QCOMPARE(msgTextBrowser->toPlainText(), QString("%1 online").arg("Fox")); QPushButton* button = chatBox.findChild("btnSend"); QTest::mouseClick(button, Qt::LeftButton); @@ -2312,7 +2312,7 @@ void PolyChatTester::e2e_send_special_message() QToolButton* btnUnderLine = chatBox.findChild("btnUnderLine"); QTest::mouseClick(btnUnderLine, Qt::LeftButton); - QCOMPARE(msgTextBrowser->toPlainText(), QString("%1 online！").arg("Fox")); + QCOMPARE(msgTextBrowser->toPlainText(), QString("%1 online").arg("Fox")); QPushButton* button = chatBox.findChild("btnSend"); QTest::mouseClick(button, Qt::LeftButton); @@ -2506,7 +2506,7 @@ void PolyChatTester::e2e_clean_chat() QCOMPARE(label->text(), QString::number(table->rowCount())); QVERIFY(initString != msgTextBrowser->toPlainText()); - QCOMPARE(msgTextBrowser->toPlainText(), QString("%1 online！").arg("Fox")); + QCOMPARE(msgTextBrowser->toPlainText(), QString("%1 online").arg("Fox")); timer->start(TIMER_STEP); QToolButton* btnClean = chatBox.findChild("btnClean"); @@ -2565,7 +2565,7 @@ void PolyChatTester::e2e_save_chat() QCOMPARE(label->text(), QString::number(table->rowCount())); QVERIFY(initString != msgTextBrowser->toPlainText()); - QCOMPARE(msgTextBrowser->toPlainText(), QString("%1 online！").arg("Fox")); + QCOMPARE(msgTextBrowser->toPlainText(), QString("%1 online").arg("Fox")); timer->start(TIMER_STEP); QToolButton* btnSave = chatBox.findChild("btnSave"); @@ -2628,7 +2628,7 @@ void PolyChatTester::e2e_leave_chat() QTest::keyClicks(textEdit, "HelloThere"); QCOMPARE(textEdit->toPlainText(), "HelloThere"); - QCOMPARE(msgTextBrowser->toPlainText(), QString("%1 online！").arg("Fox")); + QCOMPARE(msgTextBrowser->toPlainText(), QString("%1 online").arg("Fox")); QPushButton* button = chatBox.findChild("btnSend"); QTest::mouseClick(button, Qt::LeftButton); From 43a329af34439da4e850e1e9ca6b756880176a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B0=E7=B3=96=E9=9B=AA=E7=8B=B8?= Date: Sat, 6 Apr 2024 20:21:02 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20ignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1ae9d03..3628172 100644 --- a/.gitignore +++ b/.gitignore @@ -32,7 +32,6 @@ ui_*.h *.jsc Makefile* *build-* -# *.qm *.prl # Qt unit tests From c9a6eae83e5b50bf3cdd24fe8fcf9b4093e4c053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B0=E7=B3=96=E9=9B=AA=E7=8B=B8?= Date: Sat, 6 Apr 2024 20:22:12 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E4=BA=8C=E8=BF=9B?= =?UTF-8?q?=E5=88=B6=E7=BF=BB=E8=AF=91=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/language_EN.qm | Bin 0 -> 10341 bytes App/language_zh_CN.qm | Bin 0 -> 8296 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 App/language_EN.qm create mode 100644 App/language_zh_CN.qm diff --git a/App/language_EN.qm b/App/language_EN.qm new file mode 100644 index 0000000000000000000000000000000000000000..f9adf490083203edfa404073a46456413e3eadf9 GIT binary patch literal 10341 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