From d43534acfc3e0e094671485b9ddffec77d1ef6ec Mon Sep 17 00:00:00 2001 From: Christian Wieninger Date: Fri, 25 May 2007 13:51:30 +0000 Subject: - merged 'What's on now' and 'What's on next' --- i18n.cpp | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/menu.ecpp | 6 ++--- pages/whats_on.ecpp | 7 +++++- 3 files changed, 73 insertions(+), 5 deletions(-) diff --git a/i18n.cpp b/i18n.cpp index b36ad37..2ca0b68 100644 --- a/i18n.cpp +++ b/i18n.cpp @@ -3418,6 +3418,71 @@ const tI18nPhrase Phrases[] = { "", // Dansk "", // Czech }, + { "What's on?", + "Was läuft?", + "", // Slovenski + "", // Italiono + "", // Nederlands + "", // Português + "", // Français + "", // Norsk + "", // Finnish + "", // Polski + "", // Español + "", // Greek + "", // Svenska + "", // Românã + "", // Magyar + "", // Català + "", // Russian + "", // Hrvatski + "", // Eesti + "", // Dansk + "", // Czech + }, { "Now", + "Jetzt", + "", // Slovenski + "", // Italiono + "", // Nederlands + "", // Português + "", // Français + "", // Norsk + "", // Finnish + "", // Polski + "", // Español + "", // Greek + "", // Svenska + "", // Românã + "", // Magyar + "", // Català + "", // Russian + "", // Hrvatski + "", // Eesti + "", // Dansk + "", // Czech + }, + { "Next", + "Nächstes", + "", // Slovenski + "", // Italiono + "", // Nederlands + "", // Português + "", // Français + "", // Norsk + "", // Finnish + "", // Polski + "", // Español + "", // Greek + "", // Svenska + "", // Românã + "", // Magyar + "", // Català + "", // Russian + "", // Hrvatski + "", // Eesti + "", // Dansk + "", // Czech + }, /* { "", // English "", // Deutsch diff --git a/pages/menu.ecpp b/pages/menu.ecpp index acae70c..4a034a1 100644 --- a/pages/menu.ecpp +++ b/pages/menu.ecpp @@ -29,8 +29,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); set_component = component; }>

- ><$ tr("What's on now?") $> | - ><$ tr("What's on next?") $> | + ><$ tr("What's on?") $> | ><$ tr("Schedule") $> | ><$ tr("Timers") $> | % if (LiveSetup().HaveEPGSearch()) { @@ -51,8 +50,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");

- <& menu.component current=("now") &> - <& menu.component current=("next") &> + <& menu.component current=("whats_on") &> <& menu.component current=("schedule") &> <& menu.component current=("timers") &> % if (LiveSetup().HaveEPGSearch()) { diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp index 7c91393..bab6a57 100644 --- a/pages/whats_on.ecpp +++ b/pages/whats_on.ecpp @@ -45,7 +45,7 @@ if (type == "now") { <& pageelems.logo &> - <& menu active=(type) &> + <& menu active=("whats_on") component=("whats_on.whats_on_actions")>

<{ EpgEvents epgEvents; @@ -118,3 +118,8 @@ if (type == "now") { <%include>page_exit.eh + +<%def whats_on_actions> +<$ tr("Now") $> +<$ tr("Next") $> + -- cgit v1.2.3