From 8d681a97bf025346add70fc851cd170ac8b2f621 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Tue, 9 Feb 2016 22:50:44 +0100 Subject: [PATCH] - yWeb: add day of week to EPG date --- src/nhttpd/web/Y_Live_EPG.yhtm | 14 ++++++++++++++ src/nhttpd/web/Y_Version.txt | 2 +- src/nhttpd/web/languages/Deutsch | 16 ++++++++++++++++ src/nhttpd/web/languages/English | 16 ++++++++++++++++ 4 files changed, 47 insertions(+), 1 deletion(-) diff --git a/src/nhttpd/web/Y_Live_EPG.yhtm b/src/nhttpd/web/Y_Live_EPG.yhtm index 975ea41e9..8d0dc53f0 100644 --- a/src/nhttpd/web/Y_Live_EPG.yhtm +++ b/src/nhttpd/web/Y_Live_EPG.yhtm @@ -67,7 +67,17 @@ function _show_epg() epg_data = new Array(); epg_data_index=0; + var weekday = new Array(7); + weekday[0]= "{=L:date.su=}"; + weekday[1] = "{=L:date.mo=}"; + weekday[2] = "{=L:date.tu=}"; + weekday[3] = "{=L:date.we=}"; + weekday[4] = "{=L:date.th=}"; + weekday[5] = "{=L:date.fr=}"; + weekday[6] = "{=L:date.sa=}"; + var now = new Date(); + var __d = new Date(); var _starttime = Math.round(now/1000); var epg_xml = loadSyncURLxml("/control/epg?xml=true&channelid={=channel=}&details=true"); if(epg_xml){ @@ -85,6 +95,10 @@ function _show_epg() var _info1 = epg_de_qout(getXMLNodeItemValue(prog, "info1")); var _info2 = epg_de_qout(getXMLNodeItemValue(prog, "info2")); + __d.setTime(_start*1000); + var _dow = weekday[__d.getDay()]; + _date = _dow + ", " + _date; + var epg_obj= new Array(_desc, _info1, _info2, _start, _start_t, _stop.toString(), "{=channel=}"); epg_data.push(epg_obj); diff --git a/src/nhttpd/web/Y_Version.txt b/src/nhttpd/web/Y_Version.txt index 5a00a03fb..60f5d20a6 100644 --- a/src/nhttpd/web/Y_Version.txt +++ b/src/nhttpd/web/Y_Version.txt @@ -1,4 +1,4 @@ -version=2.9.0.27 +version=2.9.0.28 date=10.02.2016 type=Release info=Port CST diff --git a/src/nhttpd/web/languages/Deutsch b/src/nhttpd/web/languages/Deutsch index 8cf9155f0..9bd7ae720 100644 --- a/src/nhttpd/web/languages/Deutsch +++ b/src/nhttpd/web/languages/Deutsch @@ -59,6 +59,22 @@ automatic=automatisch show=zeigen hide=verstecken +# ========== Dates +date.su=So +date.sunday=Sonntag +date.mo=Mo +date.monday=Montag +date.tu=Di +date.tuesday=Dienstag +date.we=Mi +date.wednesday=Mittwoch +date.th=Do +date.thursday=Donnerstag +date.fr=Fr +date.friday=Freitag +date.sa=Sa +date.saturday=Samstag + # ==========Main Menue main.boxcontrol=Boxsteuerung main.boxcontrol_desc=Boxcontrol & Bouquets diff --git a/src/nhttpd/web/languages/English b/src/nhttpd/web/languages/English index 695fe4788..4438a6068 100644 --- a/src/nhttpd/web/languages/English +++ b/src/nhttpd/web/languages/English @@ -59,6 +59,22 @@ automatic=automatically show=show hide=hide +# ========== Dates +date.su=Su +date.sunday=Sunday +date.mo=Mo +date.monday=Monday +date.tu=Tu +date.tuesday=Tuesday +date.we=We +date.wednesday=Wednesday +date.th=Th +date.thursday=Thursday +date.fr=Fr +date.friday=Friday +date.sa=Sa +date.saturday=Saturday + #========= MAIN Menue main.live_tv_desc=LiveTV main.live_tv_popup_desc=LiveTV popup