[pim/eventviews] src: Use "tag" terminology consistently in the UI

Glen Ditchfield null at kde.org
Fri Feb 26 17:29:47 GMT 2021


Git commit 385775fc0450f8927df9a754a7a3bd149f217e90 by Glen Ditchfield, on behalf of Glen Ditchfield.
Committed on 26/02/2021 at 15:26.
Pushed by gditchfield into branch 'master'.

Use "tag" terminology consistently in the UI

The user interface uses "tag" and "category" as terms for the same thing.
Settle on "tag", for consistency among Akonadi applications.

GUI:

M  +1    -1    src/list/listview.cpp
M  +2    -2    src/todo/todomodel.cpp
M  +3    -3    src/todo/todoviewquicksearch.cpp

https://invent.kde.org/pim/eventviews/commit/385775fc0450f8927df9a754a7a3bd149f217e90

diff --git a/src/list/listview.cpp b/src/list/listview.cpp
index 5abcea6..575760c 100644
--- a/src/list/listview.cpp
+++ b/src/list/listview.cpp
@@ -281,7 +281,7 @@ ListView::ListView(const Akonadi::ETMCalendar::Ptr &calendar, QWidget *parent, b
     d->mTreeWidget->headerItem()->setText(Summary_Column, i18n("Summary"));
     d->mTreeWidget->headerItem()->setText(StartDateTime_Column, i18n("Start Date/Time"));
     d->mTreeWidget->headerItem()->setText(EndDateTime_Column, i18n("End Date/Time"));
-    d->mTreeWidget->headerItem()->setText(Categories_Column, i18n("Categories"));
+    d->mTreeWidget->headerItem()->setText(Categories_Column, i18n("Tags"));
 
     d->mTreeWidget->setWordWrap(true);
     d->mTreeWidget->setAllColumnsShowFocus(true);
diff --git a/src/todo/todomodel.cpp b/src/todo/todomodel.cpp
index 95393ae..52e5d86 100644
--- a/src/todo/todomodel.cpp
+++ b/src/todo/todomodel.cpp
@@ -263,7 +263,7 @@ QVariant TodoModel::data(const QModelIndex &index, int role) const
         case DueDateColumn:
             return todo->hasDueDate() ? QLocale().toString(todo->dtDue().toLocalTime().date(), QLocale::ShortFormat) : QVariant(QString());
         case CategoriesColumn: {
-            QString categories = todo->categories().join(i18nc("delimiter for joining category names", ","));
+            QString categories = todo->categories().join(i18nc("delimiter for joining category/tag names", ","));
             return QVariant(categories);
         }
         case DescriptionColumn:
@@ -579,7 +579,7 @@ QVariant TodoModel::headerData(int column, Qt::Orientation orientation, int role
         case DueDateColumn:
             return QVariant(i18n("Due Date"));
         case CategoriesColumn:
-            return QVariant(i18n("Categories"));
+            return QVariant(i18n("Tags"));
         case DescriptionColumn:
             return QVariant(i18n("Description"));
         case CalendarColumn:
diff --git a/src/todo/todoviewquicksearch.cpp b/src/todo/todoviewquicksearch.cpp
index 79e23b2..b2e7966 100644
--- a/src/todo/todoviewquicksearch.cpp
+++ b/src/todo/todoviewquicksearch.cpp
@@ -44,11 +44,11 @@ TodoViewQuickSearch::TodoViewQuickSearch(const Akonadi::ETMCalendar::Ptr &calend
 
     mCategoryCombo = new Akonadi::TagSelectionComboBox(this);
     mCategoryCombo->setCheckable(true);
-    mCategoryCombo->setToolTip(i18nc("@info:tooltip", "Filter on these categories"));
+    mCategoryCombo->setToolTip(i18nc("@info:tooltip", "Filter on these tags"));
     mCategoryCombo->setWhatsThis(i18nc("@info:whatsthis",
                                        "Use this combobox to filter the to-dos that are shown by "
-                                       "a list of selected categories."));
-    const QString defaultText = i18nc("@item:inlistbox", "Select Categories");
+                                       "a list of selected tags."));
+    const QString defaultText = i18nc("@item:inlistbox", "Select Tags");
     mCategoryCombo->lineEdit()->setPlaceholderText(defaultText);
 
     connect(mCategoryCombo, &Akonadi::TagSelectionComboBox::selectionChanged, this, [this]() {


More information about the kde-doc-english mailing list