Browse Source

fix: Call 'tr' in place, where text is accessible

reviewable/pr5628/r2
Diadlo 6 years ago
parent
commit
15d72a9610
No known key found for this signature in database
GPG Key ID: 5AF9F2E29107C727
  1. 8
      src/widget/form/chatform.cpp
  2. 10
      src/widget/widget.cpp

8
src/widget/form/chatform.cpp

@ -72,12 +72,6 @@ const QString ChatForm::ACTION_PREFIX = QStringLiteral("/me "); @@ -72,12 +72,6 @@ const QString ChatForm::ACTION_PREFIX = QStringLiteral("/me ");
namespace
{
QString statusToString(const Status status)
{
QString result;
return ChatForm::tr(Widget::getStatusTitle(status).toLatin1().data(), "contact status");
}
QString secondsToDHMS(quint32 duration)
{
QString res;
@ -635,7 +629,7 @@ void ChatForm::onFriendStatusChanged(uint32_t friendId, Status status) @@ -635,7 +629,7 @@ void ChatForm::onFriendStatusChanged(uint32_t friendId, Status status)
updateCallButtons();
if (Settings::getInstance().getStatusChangeNotificationEnabled()) {
QString fStatus = statusToString(status);
QString fStatus = Widget::getStatusTitle(status);
addSystemInfoMessage(tr("%1 is now %2", "e.g. \"Dubslow is now online\"")
.arg(f->getDisplayedName())
.arg(fStatus),

10
src/widget/widget.cpp

@ -2266,15 +2266,15 @@ QString Widget::getStatusTitle(Status status) @@ -2266,15 +2266,15 @@ QString Widget::getStatusTitle(Status status)
{
switch (status) {
case Status::Online:
return QStringLiteral("online");
return tr("online", "contact status");
case Status::Away:
return QStringLiteral("away");
return tr("away", "contact status");
case Status::Busy:
return QStringLiteral("busy");
return tr("busy", "contact status");
case Status::Offline:
return QStringLiteral("offline");
return tr("offline", "contact status");
case Status::Blocked:
return QStringLiteral("blocked");
return tr("blocked", "contact status");
}
assert(false);

Loading…
Cancel
Save