From bde12efd09a0a75031e6ad009c40f2b914da600e Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Mon, 19 Jun 2023 17:30:43 +0200 Subject: [PATCH 1/2] Fix misleading message Some servers do not provide activities at all. In that case, the label should not read "have activities enabled", because that implies that they could be provided, but are disabled. Which is misleading. Fixes: #10814 --- src/gui/activitywidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/activitywidget.cpp b/src/gui/activitywidget.cpp index 4e6d4fdb55c..bdd2cd819f5 100644 --- a/src/gui/activitywidget.cpp +++ b/src/gui/activitywidget.cpp @@ -155,7 +155,7 @@ void ActivityWidget::showLabels() t.clear(); QSetIterator i(_accountsWithoutActivities); while (i.hasNext()) { - t.append(tr("
Account %1 does not have activities enabled.").arg(i.next())); + t.append(tr("
Account %1 does not provide activities.").arg(i.next())); } _ui->_bottomLabel->setTextFormat(Qt::RichText); _ui->_bottomLabel->setText(t); From 71eb3287ffd59927704f155a55ff4157e3147543 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Fri, 23 Jun 2023 13:27:49 +0200 Subject: [PATCH 2/2] Update src/gui/activitywidget.cpp Co-authored-by: Hannah von Reth --- src/gui/activitywidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/activitywidget.cpp b/src/gui/activitywidget.cpp index bdd2cd819f5..80cdb0d2dc9 100644 --- a/src/gui/activitywidget.cpp +++ b/src/gui/activitywidget.cpp @@ -155,7 +155,7 @@ void ActivityWidget::showLabels() t.clear(); QSetIterator i(_accountsWithoutActivities); while (i.hasNext()) { - t.append(tr("
Account %1 does not provide activities.").arg(i.next())); + t.append(tr("
%1 does not provide activities.").arg(i.next())); } _ui->_bottomLabel->setTextFormat(Qt::RichText); _ui->_bottomLabel->setText(t);