summaryrefslogtreecommitdiff
path: root/timerconflict.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'timerconflict.cpp')
-rw-r--r--timerconflict.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/timerconflict.cpp b/timerconflict.cpp
index 6f2c95c..14f42f9 100644
--- a/timerconflict.cpp
+++ b/timerconflict.cpp
@@ -111,7 +111,18 @@ namespace vdrlive {
std::string TimerConflictNotifier::Message() const
{
int count = conflicts ? conflicts->size() : 0;
- return count > 0 ? tr("Timer conflicts detected! You should check the conflicting timers.") : "";
+ std::string msg = tr("Timer conflict check detected ");
+ if (count == 1)
+ msg += ConvertToString(count) + tr(" conflict");
+ else
+ msg += ConvertToString(count) + tr(" conflicts");
+ return count > 0 ? msg : "";
}
+ std::string TimerConflictNotifier::Url() const
+ {
+ return "timerconflicts.html";
+ }
+
+
} // namespace vdrlive