Merge branch 'Plasma/5.18'

applets/notifications/package/contents/ui/FullRepresentation.qml

@@ -206,7 +206,7 @@ PlasmaComponents3.Page {
                     var sections = [];
 
                     // Show until time if valid but not if too far int he future
-                    if (!isNaN(inhibitedUntil.getTime()) && inhibitedUntil.getTime() - new Date().getTime() < 365 * 24 * 60 * 60 * 1000 /* 1 year*/) {
+                    if (!isNaN(inhibitedUntil.getTime()) && inhibitedUntil.getTime() - new Date().getTime() < 100 * 24 * 60 * 60 * 1000 /* 1 year*/) {
                         sections.push(i18nc("Do not disturb until date", "Until %1",
                                             KCoreAddons.Format.formatRelativeDateTime(inhibitedUntil, Locale.ShortFormat)));
                     }

applets/notifications/package/contents/ui/main.qml

@@ -78,7 +78,7 @@ Item {
                 // Show until time if valid but not if too far in the future
                 // TODO check app inhibition, too
                 if (inhibitedUntilValid
-                        && inhibitedUntil.getTime() - new Date().getTime() < 365 * 24 * 60 * 60 * 1000 /* 1 year*/) {
+                        && inhibitedUntil.getTime() - new Date().getTime() < 100 * 24 * 60 * 60 * 1000 /* 100 days*/) {
                         lines.push(i18n("Do not disturb until %1",
                                      KCoreAddons.Format.formatRelativeDateTime(inhibitedUntil, Locale.ShortFormat)));
                 } else {