From bcf2ce757c5c432fa8d4349951ccabc79eb6d94b Mon Sep 17 00:00:00 2001 From: kamel5 Date: Sat, 9 Nov 2019 10:48:42 +0100 Subject: [PATCH] Fixed a timer changed message --- po/ca_ES.po | 5 ++++- po/de_DE.po | 5 ++++- po/it_IT.po | 5 ++++- po/ru_RU.po | 5 ++++- po/sk_SK.po | 5 ++++- recmenus.c | 11 ++++------- recmenus.h | 2 +- recmenuview.c | 2 +- 8 files changed, 26 insertions(+), 14 deletions(-) diff --git a/po/ca_ES.po b/po/ca_ES.po index 3a2c5a7..3c45475 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-tvguide 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-03 12:37+0100\n" +"POT-Creation-Date: 2020-01-06 14:31+0100\n" "PO-Revision-Date: 2013-09-21 17:49+0200\n" "Last-Translator: My friend Thanks David \n" "Language-Team: \n" @@ -138,6 +138,9 @@ msgstr "Cerca a les gravacions" msgid "Set Folder for" msgstr "Programa carpeta per" +msgid "Timer changed" +msgstr "" + msgid "Timer created" msgstr "Temporitzador creat" diff --git a/po/de_DE.po b/po/de_DE.po index b0f1af0..0758f91 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-tvguide 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-03 12:37+0100\n" +"POT-Creation-Date: 2020-01-06 14:31+0100\n" "PO-Revision-Date: 2012-08-25 17:49+0200\n" "Last-Translator: Horst\n" "Language-Team: \n" @@ -135,6 +135,9 @@ msgstr "In Aufnahmen suchen" msgid "Set Folder for" msgstr "Verzeichnis festlegen für" +msgid "Timer changed" +msgstr "Timer geändert" + msgid "Timer created" msgstr "Timer angelegt" diff --git a/po/it_IT.po b/po/it_IT.po index b24c735..266e7b6 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-tvguide 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-03 12:37+0100\n" +"POT-Creation-Date: 2020-01-06 14:31+0100\n" "PO-Revision-Date: 2012-08-25 17:49+0200\n" "Last-Translator: fiveten_59\n" "Language-Team: \n" @@ -135,6 +135,9 @@ msgstr "Cerca nelle registrazioni" msgid "Set Folder for" msgstr "Crea cartella per" +msgid "Timer changed" +msgstr "" + msgid "Timer created" msgstr "Timer creato" diff --git a/po/ru_RU.po b/po/ru_RU.po index 9bcb94c..dcc3d12 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-tvguide 1.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-03 12:37+0100\n" +"POT-Creation-Date: 2020-01-06 14:31+0100\n" "PO-Revision-Date: 2013-09-25 17:49+0400\n" "Last-Translator: AmiD, ilya\n" "Language-Team: Russia-Cherepovets(wm.amid@gmail.com)\n" @@ -135,6 +135,9 @@ msgstr "Искать в записях" msgid "Set Folder for" msgstr "Укажите каталог для" +msgid "Timer changed" +msgstr "" + msgid "Timer created" msgstr "Таймер создан" diff --git a/po/sk_SK.po b/po/sk_SK.po index c962053..deb93d3 100644 --- a/po/sk_SK.po +++ b/po/sk_SK.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: vdr-tvguide 1.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-03 12:37+0100\n" +"POT-Creation-Date: 2020-01-06 14:31+0100\n" "PO-Revision-Date: 2013-09-15 00:12+0100\n" "Last-Translator: Milan Hrala \n" "Language-Team: \n" @@ -135,6 +135,9 @@ msgstr "Vyh msgid "Set Folder for" msgstr "Nastavi adresr pre" +msgid "Timer changed" +msgstr "" + msgid "Timer created" msgstr "Pln vytvoren" diff --git a/recmenus.c b/recmenus.c index 171e133..21c8778 100644 --- a/recmenus.c +++ b/recmenus.c @@ -103,7 +103,7 @@ std::string cRecMenuAskFolder::GetFolder(void) { } // --- cRecMenuConfirmTimer --------------------------------------------------------- -cRecMenuConfirmTimer::cRecMenuConfirmTimer(const cEvent *event) { +cRecMenuConfirmTimer::cRecMenuConfirmTimer(const cEvent *event, bool timerChanged) { SetWidthPercent(50); #if VDRVERSNUM >= 20301 LOCK_CHANNELS_READ; @@ -111,7 +111,6 @@ cRecMenuConfirmTimer::cRecMenuConfirmTimer(const cEvent *event) { #else const cString channelName = Channels.GetByChannelID(event->ChannelID())->Name(); #endif - cString message; bool eventHasTimer = false; if (config.useRemoteTimers && pRemoteTimers) { RemoteTimers_GetMatch_v1_0 rtMatch; @@ -123,11 +122,9 @@ cRecMenuConfirmTimer::cRecMenuConfirmTimer(const cEvent *event) { } else { eventHasTimer = event->HasTimer(); } - if (eventHasTimer) { - message = tr("Timer created"); - } else { - message = tr("Timer NOT created"); - } + const cString message = (eventHasTimer) ? (timerChanged) ? tr("Timer changed") + : tr("Timer created") + : tr("Timer NOT created"); cString text = cString::sprintf("%s\n%s\n%s %s - %s\n%s", *message, *channelName, diff --git a/recmenus.h b/recmenus.h index a42ac87..93a480e 100644 --- a/recmenus.h +++ b/recmenus.h @@ -47,7 +47,7 @@ public: // --- cRecMenuConfirmTimer --------------------------------------------------------- class cRecMenuConfirmTimer: public cRecMenu { public: - cRecMenuConfirmTimer(const cEvent *event); + cRecMenuConfirmTimer(const cEvent *event, bool timerChanged = false); virtual ~cRecMenuConfirmTimer(void) {}; }; diff --git a/recmenuview.c b/recmenuview.c index 9778052..a7b1d62 100644 --- a/recmenuview.c +++ b/recmenuview.c @@ -290,7 +290,7 @@ eOSState cRecMenuView::StateMachine(eRecMenuState nextState) { recManager->SaveTimer(originalTimer, timerModified); delete activeMenu; if (!DisplayTimerConflict(originalTimer)) { - activeMenu = new cRecMenuConfirmTimer(event); + activeMenu = new cRecMenuConfirmTimer(originalTimer->Event(), true); activeMenu->Display(); } break; }