Show more useful information when sorting by date (in all folders, not

only on those with pictures).

With the current architecture it is impossible to create different rules
depending on the items that each category contains. All categories are
similar to the rest. That also helps to quickly find what you are
looking for.

BUG: 149655

svn path=/trunk/KDE/kdebase/apps/; revision=715740

diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp
index 26221a094ed5da31c38b5c5076353eb7c08fea67..03bdb16b43d5042b058d92765765c7adfb66129b 100644 (file)
--- a/src/dolphinmodel.cpp
+++ b/src/dolphinmodel.cpp
@@ -144,18 +144,7 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
                 modifiedTime.setTime_t(item.time(KIO::UDSEntry::UDS_MODIFICATION_TIME));
                 modifiedTime = modifiedTime.toLocalZone();
 
-                if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) == 0)
-                    retString = i18nc("@title:group Date", "Today");
-                else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) == 1)
-                    retString = i18nc("@title:group Date", "Yesterday");
-                else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) < 7)
-                    retString = i18nc("@title:group Date", "Less than a week");
-                else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) < 31)
-                    retString = i18nc("@title:group Date", "Less than a month");
-                else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) < 365)
-                    retString = i18nc("@title:group Date", "Less than a year");
-                else
-                    retString = i18nc("@title:group Date", "More than a year");
+                retString = modifiedTime.toString(i18nc("Prints out the month and year: %B is full month name in current locale, and %Y is full year number", "%B, %Y"));
                 break;
             }