summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--i18n-generated.h179
-rw-r--r--live/img/timerconflict.gifbin2962 -> 2812 bytes
-rw-r--r--pages/edit_timer.ecpp3
-rw-r--r--pages/timers.ecpp1
-rw-r--r--po/ca_ES.po4
-rw-r--r--po/cs_CZ.po4
-rw-r--r--po/da_DK.po4
-rw-r--r--po/de_DE.po4
-rw-r--r--po/el_GR.po4
-rw-r--r--po/es_ES.po4
-rw-r--r--po/et_EE.po4
-rw-r--r--po/fi_FI.po4
-rw-r--r--po/fr_FR.po4
-rw-r--r--po/hr_HR.po4
-rw-r--r--po/hu_HU.po4
-rw-r--r--po/it_IT.po4
-rw-r--r--po/nl_NL.po4
-rw-r--r--po/nn_NO.po4
-rw-r--r--po/pl_PL.po4
-rw-r--r--po/pt_PT.po4
-rw-r--r--po/ro_RO.po4
-rw-r--r--po/ru_RU.po4
-rw-r--r--po/sl_SI.po4
-rw-r--r--po/sv_SE.po4
-rw-r--r--po/tr_TR.po4
-rw-r--r--timerconflict.cpp17
-rw-r--r--timerconflict.h3
27 files changed, 239 insertions, 48 deletions
diff --git a/i18n-generated.h b/i18n-generated.h
index 223002d..785ce3d 100644
--- a/i18n-generated.h
+++ b/i18n-generated.h
@@ -1131,15 +1131,85 @@ const tI18nPhrase Phrases[] = {
"",
#endif
},
- { "Timer conflicts detected! You should check the conflicting timers.",
- "Timer Konflikte entdeckt! Sie sollten die entsprechenden Timer prüfen.",
+ { "Timer conflict check detected ",
+ "Die Timer Konflikt Überprüfung hat ",
"",
+ "Timer attivo.",
+ "Serie's opnemen",
+ "",
+ "Programmation est active.",
+ "",
+ "Aktiivinen ajastin",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+#if VDRVERSNUM >= 10302
+ "",
+#endif
+#if VDRVERSNUM >= 10307
+ "",
+#endif
+#if VDRVERSNUM >= 10313
+ "",
+#endif
+#if VDRVERSNUM >= 10316
"",
+#endif
+#if VDRVERSNUM >= 10342
"",
+#endif
+#if VDRVERSNUM >= 10502
"",
+#endif
+ },
+ { "conflict",
+ "Timerkonflikt entdeckt",
"",
+ "Timer attivo.",
+ "Serie's opnemen",
"",
+ "Programmation est active.",
"",
+ "Aktiivinen ajastin",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+#if VDRVERSNUM >= 10302
+ "",
+#endif
+#if VDRVERSNUM >= 10307
+ "",
+#endif
+#if VDRVERSNUM >= 10313
+ "",
+#endif
+#if VDRVERSNUM >= 10316
+ "",
+#endif
+#if VDRVERSNUM >= 10342
+ "",
+#endif
+#if VDRVERSNUM >= 10502
+ "",
+#endif
+ },
+ { "conflicts",
+ "Timerkonflikte entdeckt",
+ "",
+ "Timer attivo.",
+ "Serie's opnemen",
+ "",
+ "Programmation est active.",
+ "",
+ "Aktiivinen ajastin",
"",
"",
"",
@@ -4806,6 +4876,111 @@ const tI18nPhrase Phrases[] = {
"",
#endif
},
+ { "Your attention is required",
+ "Ihre Aufmerksamkeit ist erforderlich",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+#if VDRVERSNUM >= 10302
+ "",
+#endif
+#if VDRVERSNUM >= 10307
+ "",
+#endif
+#if VDRVERSNUM >= 10313
+ "",
+#endif
+#if VDRVERSNUM >= 10316
+ "",
+#endif
+#if VDRVERSNUM >= 10342
+ "",
+#endif
+#if VDRVERSNUM >= 10502
+ "",
+#endif
+ },
+ { "React",
+ "Reagieren",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+#if VDRVERSNUM >= 10302
+ "",
+#endif
+#if VDRVERSNUM >= 10307
+ "",
+#endif
+#if VDRVERSNUM >= 10313
+ "",
+#endif
+#if VDRVERSNUM >= 10316
+ "",
+#endif
+#if VDRVERSNUM >= 10342
+ "",
+#endif
+#if VDRVERSNUM >= 10502
+ "",
+#endif
+ },
+ { "Dismiss",
+ "Verwerfen",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+#if VDRVERSNUM >= 10302
+ "",
+#endif
+#if VDRVERSNUM >= 10307
+ "",
+#endif
+#if VDRVERSNUM >= 10313
+ "",
+#endif
+#if VDRVERSNUM >= 10316
+ "",
+#endif
+#if VDRVERSNUM >= 10342
+ "",
+#endif
+#if VDRVERSNUM >= 10502
+ "",
+#endif
+ },
{ "Find more at the Internet Movie Database.",
"Weitere Informationen in der Internet Movie Database.",
"",
diff --git a/live/img/timerconflict.gif b/live/img/timerconflict.gif
index 115520e..9533197 100644
--- a/live/img/timerconflict.gif
+++ b/live/img/timerconflict.gif
Binary files differ
diff --git a/pages/edit_timer.ecpp b/pages/edit_timer.ecpp
index c269055..7b92551 100644
--- a/pages/edit_timer.ecpp
+++ b/pages/edit_timer.ecpp
@@ -9,6 +9,7 @@
#include "timers.h"
#include "setup.h"
#include "epg_events.h"
+#include "timerconflict.h"
#include "i18n.h"
using namespace std;
@@ -43,6 +44,7 @@ using namespace vdrlive;
<%session scope="global">
bool logged_in(false);
string edit_timerreferer;
+TimerConflictNotifier timerNotifier;
</%session>
<%request scope="page">
cTimer* timer;
@@ -80,6 +82,7 @@ cTimer* timer;
time_t tdate = GetDateFromDatePicker(date, tr("mm/dd/yyyy"));
string sdate = DatePickerToC(tdate, "yyyy-mm-dd");
LiveTimerManager().UpdateTimer( timer, flags, channel, weekdays, sdate, start, stop, priority, lifetime, title, aux );
+ timerNotifier.SetTimerModification();
return reply.redirect(!edit_timerreferer.empty()?edit_timerreferer:"timers.html");
}
}
diff --git a/pages/timers.ecpp b/pages/timers.ecpp
index bc57b66..029d447 100644
--- a/pages/timers.ecpp
+++ b/pages/timers.ecpp
@@ -6,6 +6,7 @@
#include "setup.h"
#include "i18n.h"
#include "epg_events.h"
+#include "timerconflict.h"
#include "livefeatures.h"
using namespace std;
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 10ed873..c8f3022 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -116,10 +116,10 @@ msgstr ""
msgid "Timer conflict check detected "
msgstr ""
-msgid " conflict"
+msgid "conflict"
msgstr ""
-msgid " conflicts"
+msgid "conflicts"
msgstr ""
msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 4f09824..9a37b9c 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -114,10 +114,10 @@ msgstr ""
msgid "Timer conflict check detected "
msgstr ""
-msgid " conflict"
+msgid "conflict"
msgstr ""
-msgid " conflicts"
+msgid "conflicts"
msgstr ""
msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/da_DK.po b/po/da_DK.po
index 2bf5baa..70b043b 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -114,10 +114,10 @@ msgstr ""
msgid "Timer conflict check detected "
msgstr ""
-msgid " conflict"
+msgid "conflict"
msgstr ""
-msgid " conflicts"
+msgid "conflicts"
msgstr ""
msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/de_DE.po b/po/de_DE.po
index afdc27a..cd49492 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -116,10 +116,10 @@ msgstr ""
msgid "Timer conflict check detected "
msgstr "Die Timer Konflikt Überprüfung hat "
-msgid " conflict"
+msgid "conflict"
msgstr "Timerkonflikt entdeckt"
-msgid " conflicts"
+msgid "conflicts"
msgstr "Timerkonflikte entdeckt"
msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/el_GR.po b/po/el_GR.po
index 9f92782..b9ca111 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -114,10 +114,10 @@ msgstr ""
msgid "Timer conflict check detected "
msgstr ""
-msgid " conflict"
+msgid "conflict"
msgstr ""
-msgid " conflicts"
+msgid "conflicts"
msgstr ""
msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/es_ES.po b/po/es_ES.po
index 1f2f36f..2259819 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -114,10 +114,10 @@ msgstr ""
msgid "Timer conflict check detected "
msgstr ""
-msgid " conflict"
+msgid "conflict"
msgstr ""
-msgid " conflicts"
+msgid "conflicts"
msgstr ""
msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/et_EE.po b/po/et_EE.po
index 90b079b..2dde09c 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -114,10 +114,10 @@ msgstr ""
msgid "Timer conflict check detected "
msgstr ""
-msgid " conflict"
+msgid "conflict"
msgstr ""
-msgid " conflicts"
+msgid "conflicts"
msgstr ""
msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/fi_FI.po b/po/fi_FI.po
index fb8e166..de4d50c 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -116,11 +116,11 @@ msgid "Timer conflict check detected "
msgstr "Aktiivinen ajastin"
#, fuzzy
-msgid " conflict"
+msgid "conflict"
msgstr "Aktiivinen ajastin"
#, fuzzy
-msgid " conflicts"
+msgid "conflicts"
msgstr "Aktiivinen ajastin"
msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/fr_FR.po b/po/fr_FR.po
index fd8765c..56136b4 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -119,11 +119,11 @@ msgid "Timer conflict check detected "
msgstr "Programmation est active."
#, fuzzy
-msgid " conflict"
+msgid "conflict"
msgstr "Programmation est active."
#, fuzzy
-msgid " conflicts"
+msgid "conflicts"
msgstr "Programmation est active."
msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 09e9e73..3d0865f 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -115,10 +115,10 @@ msgstr ""
msgid "Timer conflict check detected "
msgstr ""
-msgid " conflict"
+msgid "conflict"
msgstr ""
-msgid " conflicts"
+msgid "conflicts"
msgstr ""
msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/hu_HU.po b/po/hu_HU.po
index a7ee422..e6aff87 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -115,10 +115,10 @@ msgstr ""
msgid "Timer conflict check detected "
msgstr ""
-msgid " conflict"
+msgid "conflict"
msgstr ""
-msgid " conflicts"
+msgid "conflicts"
msgstr ""
msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/it_IT.po b/po/it_IT.po
index 9e158b5..4c76060 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -118,11 +118,11 @@ msgid "Timer conflict check detected "
msgstr "Timer attivo."
#, fuzzy
-msgid " conflict"
+msgid "conflict"
msgstr "Timer attivo."
#, fuzzy
-msgid " conflicts"
+msgid "conflicts"
msgstr "Timer attivo."
msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 16e8f80..dfe4952 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -119,11 +119,11 @@ msgid "Timer conflict check detected "
msgstr "Serie's opnemen"
#, fuzzy
-msgid " conflict"
+msgid "conflict"
msgstr "Serie's opnemen"
#, fuzzy
-msgid " conflicts"
+msgid "conflicts"
msgstr "Serie's opnemen"
msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 239bbb4..c9f243b 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -115,10 +115,10 @@ msgstr ""
msgid "Timer conflict check detected "
msgstr ""
-msgid " conflict"
+msgid "conflict"
msgstr ""
-msgid " conflicts"
+msgid "conflicts"
msgstr ""
msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 0faf362..d3c7de5 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -114,10 +114,10 @@ msgstr ""
msgid "Timer conflict check detected "
msgstr ""
-msgid " conflict"
+msgid "conflict"
msgstr ""
-msgid " conflicts"
+msgid "conflicts"
msgstr ""
msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/pt_PT.po b/po/pt_PT.po
index ead6e89..f154aa4 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -114,10 +114,10 @@ msgstr ""
msgid "Timer conflict check detected "
msgstr ""
-msgid " conflict"
+msgid "conflict"
msgstr ""
-msgid " conflicts"
+msgid "conflicts"
msgstr ""
msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 9ab90d0..306fd54 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -115,10 +115,10 @@ msgstr ""
msgid "Timer conflict check detected "
msgstr ""
-msgid " conflict"
+msgid "conflict"
msgstr ""
-msgid " conflicts"
+msgid "conflicts"
msgstr ""
msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/ru_RU.po b/po/ru_RU.po
index c7dc079..b42403c 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -114,10 +114,10 @@ msgstr ""
msgid "Timer conflict check detected "
msgstr ""
-msgid " conflict"
+msgid "conflict"
msgstr ""
-msgid " conflicts"
+msgid "conflicts"
msgstr ""
msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 412537d..7d90de2 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -115,10 +115,10 @@ msgstr ""
msgid "Timer conflict check detected "
msgstr ""
-msgid " conflict"
+msgid "conflict"
msgstr ""
-msgid " conflicts"
+msgid "conflicts"
msgstr ""
msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/sv_SE.po b/po/sv_SE.po
index a9bd7c7..6728983 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -115,10 +115,10 @@ msgstr ""
msgid "Timer conflict check detected "
msgstr ""
-msgid " conflict"
+msgid "conflict"
msgstr ""
-msgid " conflicts"
+msgid "conflicts"
msgstr ""
msgid "Couldn't aquire access to channels, please try again later."
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 7211c2f..abf0049 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -115,10 +115,10 @@ msgstr ""
msgid "Timer conflict check detected "
msgstr ""
-msgid " conflict"
+msgid "conflict"
msgstr ""
-msgid " conflicts"
+msgid "conflicts"
msgstr ""
msgid "Couldn't aquire access to channels, please try again later."
diff --git a/timerconflict.cpp b/timerconflict.cpp
index 14f42f9..4943d54 100644
--- a/timerconflict.cpp
+++ b/timerconflict.cpp
@@ -87,6 +87,7 @@ namespace vdrlive {
TimerConflictNotifier::TimerConflictNotifier()
: lastCheck(0)
+ , lastTimerModification(0)
, conflicts()
{
}
@@ -99,8 +100,9 @@ namespace vdrlive {
{
time_t now = time(0);
bool reCheckAdvised((now - lastCheck) > CHECKINTERVAL);
+ bool recentTimerChange((now - lastTimerModification) <= CHECKINTERVAL);
- if (reCheckAdvised && TimerConflicts::CheckAdvised()) {
+ if (recentTimerChange || (reCheckAdvised && TimerConflicts::CheckAdvised())) {
lastCheck = now;
conflicts.reset(new TimerConflicts());
return conflicts->size() > 0;
@@ -108,15 +110,22 @@ namespace vdrlive {
return false;
}
+ void TimerConflictNotifier::SetTimerModification()
+ {
+ lastTimerModification = time(0);
+ }
+
std::string TimerConflictNotifier::Message() const
{
int count = conflicts ? conflicts->size() : 0;
std::string msg = tr("Timer conflict check detected ");
+ msg += ConvertToString(count) + " ";
if (count == 1)
- msg += ConvertToString(count) + tr(" conflict");
+ msg += tr("conflict");
else
- msg += ConvertToString(count) + tr(" conflicts");
- return count > 0 ? msg : "";
+ msg += tr("conflicts");
+
+ return count > 0 ? msg + "!" : "";
}
std::string TimerConflictNotifier::Url() const
diff --git a/timerconflict.h b/timerconflict.h
index c8bca2c..0e60420 100644
--- a/timerconflict.h
+++ b/timerconflict.h
@@ -72,6 +72,8 @@ namespace vdrlive {
bool ShouldNotify();
+ void SetTimerModification();
+
std::string Message() const;
std::string Url() const;
@@ -81,6 +83,7 @@ namespace vdrlive {
private:
time_t lastCheck;
+ time_t lastTimerModification;
TimerConflictsPtr conflicts;
}; // class TimerConflictNotifier