Skip to content

Commit

Permalink
Do not replace strings in action links coming from the notification api.
Browse files Browse the repository at this point in the history
Signed-off-by: Camila <hello@camila.codes>
  • Loading branch information
Camila committed May 12, 2022
1 parent 952eefc commit e4a0d57
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
4 changes: 0 additions & 4 deletions src/gui/tray/activitylistmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -798,10 +798,6 @@ QVariant ActivityListModel::convertLinkToActionButton(const OCC::ActivityLink &a
QString(replyButtonPath + "/" + OCC::Theme::instance()->wizardHeaderTitleColor().name());
}

if (activityLink._verb == QStringLiteral("DELETE")) {
activityLinkCopy._label = QObject::tr("Mark as read");
}

return QVariant::fromValue(activityLinkCopy);
}

Expand Down
4 changes: 2 additions & 2 deletions test/testactivitylistmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -705,10 +705,10 @@ private slots:
// in case total actions is longer than ActivityListModel::maxActionButtons, then a sum of action buttons and action menu entries must be equal to a total of action links
QVERIFY(actionButtonsLinks.size() + actionsLinksContextMenu.size() == actionsLinks.size());
} else {
// in case a total of actions is less or equal to than ActivityListModel::maxActionButtons, then the length of action buttons must be greater than 1 and should contain "Mark as read" button at the end
// in case a total of actions is less or equal to than ActivityListModel::maxActionButtons, then the length of action buttons must be greater than 1 and should contain "Dismiss" button at the end
QVERIFY(actionButtonsLinks.size() > 1);
QVERIFY(actionButtonsLinks[1].value<OCC::ActivityLink>()._label
== QObject::tr("Mark as read"));
== QObject::tr("Dismiss"));
}
} else if ((objectType == QStringLiteral("call"))) {
QVERIFY(
Expand Down

0 comments on commit e4a0d57

Please sign in to comment.