From a6c3e3562cdb1519326cf6237d0aa4beaaebbbae Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Thu, 30 Sep 2021 21:24:28 -0400
Subject: [PATCH] Fix some strings and translation stuff
---
resources/qml/NotificationWarning.qml | 2 +-
src/notifications/Manager.cpp | 10 ++--------
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/resources/qml/NotificationWarning.qml b/resources/qml/NotificationWarning.qml
index 95ca210be..75ef5f176 100644
--- a/resources/qml/NotificationWarning.qml
+++ b/resources/qml/NotificationWarning.qml
@@ -29,7 +29,7 @@ Item {
anchors.rightMargin: 10
anchors.bottom: parent.bottom
color: Nheko.theme.red
- text: qsTr("You will be pinging the whole room")
+ text: qsTr("You are about to notify the whole room")
textFormat: Text.PlainText
}
diff --git a/src/notifications/Manager.cpp b/src/notifications/Manager.cpp
index f24a48ff8..5d51c6c86 100644
--- a/src/notifications/Manager.cpp
+++ b/src/notifications/Manager.cpp
@@ -23,18 +23,12 @@ NotificationsManager::getMessageTemplate(const mtx::responses::Notification ¬
}
if (mtx::accessors::msg_type(notification.event) == mtx::events::MessageType::Emote) {
- return tr("* %1 %2",
- "Format an emote message in a notification, %1 is the sender, %2 the "
- "message")
- .arg(sender);
+ return QString("* %1 %2").arg(sender);
} else if (utils::isReply(notification.event)) {
return tr("%1 replied: %2",
"Format a reply in a notification. %1 is the sender, %2 the message")
.arg(sender);
} else {
- return tr("%1: %2",
- "Format a normal message in a notification. %1 is the sender, %2 the "
- "message")
- .arg(sender);
+ return QString("%1: %2").arg(sender);
}
}
--
GitLab