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

qTox · Apr 21, 2019 · 15d72a9 · 15d72a9
1 parent 8e13d96
commit 15d72a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/src/widget/form/chatform.cpp b/src/widget/form/chatform.cpp
@@ -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)
     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),

diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
@@ -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);