I either misunderstood Daniel or he changed his mind.

Revert "Add year to all 'long' form date strings from PI. After discussing it with Daniel in IRC it was decided not to wait until 0.26 to fix this properly. As implemented the year will only be added to the strings if the date falls outside the current year."

This reverts commit fe42d2d.

Author: stuartm

mythtv/libs/libmyth/programinfo.cpp

@@ -1405,11 +1405,11 @@ void ProgramInfo::ToMap(InfoMap &progMap,
     else // if (IsRecording())
     {
         progMap["starttime"] = MythDateTimeToString(startts, kTime);
-        progMap["startdate"] = MythDateTimeToString(startts, kDateFull | kAddYear | kSimplify);
+        progMap["startdate"] = MythDateTimeToString(startts, kDateFull | kSimplify);
         progMap["shortstartdate"] = MythDateTimeToString(startts, kDateShort);
         progMap["startyear"] = startts.toString("yyyy");
         progMap["endtime"] = MythDateTimeToString(endts, kTime);
-        progMap["enddate"] = MythDateTimeToString(endts, kDateFull | kAddYear | kSimplify);
+        progMap["enddate"] = MythDateTimeToString(endts, kDateFull | kSimplify);
         progMap["shortenddate"] = MythDateTimeToString(endts, kDateShort);
         progMap["endyear"] = endts.toString("yyyy");
         progMap["recstarttime"] = MythDateTimeToString(recstartts, kTime);
@@ -1421,24 +1421,24 @@ void ProgramInfo::ToMap(InfoMap &progMap,
     }
 
     progMap["timedate"] = MythDateTimeToString(recstartts,
-                                            kDateTimeFull | kAddYear | kSimplify) + " - " +
+                                            kDateTimeFull | kSimplify) + " - " +
                           MythDateTimeToString(recendts, kTime);
 
     progMap["shorttimedate"] = MythDateTimeToString(recstartts,
                                             kDateTimeShort | kSimplify) + " - " +
                                MythDateTimeToString(recendts, kTime);
 
     progMap["starttimedate"] = MythDateTimeToString(recstartts,
-                                            kDateTimeFull | kAddYear | kSimplify);
+                                            kDateTimeFull | kSimplify);
 
     progMap["shortstarttimedate"] = MythDateTimeToString(recstartts,
                                             kDateTimeShort | kSimplify);
 
     progMap["lastmodifiedtime"] = MythDateTimeToString(lastmodified, kTime);
     progMap["lastmodifieddate"] = MythDateTimeToString(lastmodified,
-                                                       kDateFull | kAddYear | kSimplify);
+                                                       kDateFull | kSimplify);
     progMap["lastmodified"] = MythDateTimeToString(lastmodified,
-                                            kDateTimeFull | kAddYear | kSimplify);
+                                            kDateTimeFull | kSimplify);
 
     progMap["channum"] = chanstr;
     progMap["chanid"] = chanid;

mythtv/libs/libmythbase/util.cpp

@@ -104,8 +104,6 @@ QString MythDateTimeToString(const QDateTime& datetime, uint format)
     return result;
 }
 
-static QRegExp stripYear("(\.|-|/)?(yyyy|yy)(\.|-|/)?");
-
 /** \fn MythDateToString
  *  \brief Returns a formatted QString based on the supplied QDate
  * 
@@ -126,27 +124,20 @@ QString MythDateToString(const QDate& date, uint format)
         else
             stringformat = gCoreContext->GetSetting("DateFormat", "ddd d MMMM");
 
-        if ((format & kAddYear) && (format & ~kSimplify))
+        if (format & kAddYear)
         {
             if (!stringformat.contains("yy")) // Matches both 2 or 4 digit year
                 stringformat.append(" yyyy");
         }
 
-        if ((format & ~kDateShort) && (format & kSimplify))
+        if (format & ~kDateShort)
         {
-            if (now == date)
+            if ((format & kSimplify) && (now == date))
                 result = QObject::tr("Today");
-            else if (now.addDays(-1) == date)
+            else if ((format & kSimplify) && (now.addDays(-1) == date))
                 result = QObject::tr("Yesterday");
-            else if (now.addDays(1) == date)
+            else if ((format & kSimplify) && (now.addDays(1) == date))
                 result = QObject::tr("Tomorrow");
-            else if ((now.year() == date.year()) && stringformat.contains("yy"))
-            {
-                // Best effort attempt to strip year when it was already
-                // present in the string - maybe unnecessary if the user
-                // explicitly chose a string containing the year?
-                stringformat.replace(stripYear, "");
-            }
         }
 
         if (result.isEmpty())