mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-28 19:58:56 +03:00
Code Issues Projects Releases Packages Wiki Activity

Do not replace strings in action links coming from the notification api.

Browse source 
Signed-off-by: Camila <hello@camila.codes>
This commit is contained in:
Camila 2022-05-12 12:43:03 +02:00
parent 952eefcf69
commit e4a0d57bc8
No known key found for this signature in database
GPG key ID: 7A4A6121E88E2AD4
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/tray/activitylistmodel.cpp
View file

@ -798,10 +798,6 @@ QVariant ActivityListModel::convertLinkToActionButton(const OCC::ActivityLink &a
QString(replyButtonPath + "/" + OCC::Theme::instance()->wizardHeaderTitleColor().name()); QString(replyButtonPath + "/" + OCC::Theme::instance()->wizardHeaderTitleColor().name());
} }
if (activityLink._verb == QStringLiteral("DELETE")) {
activityLinkCopy._label = QObject::tr("Mark as read");
}
return QVariant::fromValue(activityLinkCopy); return QVariant::fromValue(activityLinkCopy);
} }

4
test/testactivitylistmodel.cpp
View file

@ -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 // 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()); QVERIFY(actionButtonsLinks.size() + actionsLinksContextMenu.size() == actionsLinks.size());
} else { } 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.size() > 1);
QVERIFY(actionButtonsLinks[1].value<OCC::ActivityLink>()._label QVERIFY(actionButtonsLinks[1].value<OCC::ActivityLink>()._label
== QObject::tr("Mark as read")); == QObject::tr("Dismiss"));
} }
} else if ((objectType == QStringLiteral("call"))) { } else if ((objectType == QStringLiteral("call"))) {
QVERIFY( QVERIFY(