From 98fe7df21e92942a8bcffcb6924a89cb971a040d Mon Sep 17 00:00:00 2001 From: yjogol Date: Sat, 27 Feb 2010 07:02:35 +0000 Subject: [PATCH] yweb: add multi-language to live tv/radio git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@430 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/ade1ffef6c04a7d2b042d9c1bf1012be4b2b1b0b Author: yjogol Date: 2010-02-27 (Sat, 27 Feb 2010) ------------------ This commit was generated by Migit --- src/nhttpd/web/Y_Live.js | 17 ++------- src/nhttpd/web/Y_Live.yhtm | 62 ++++++++++++++++++++------------ src/nhttpd/web/languages/Deutsch | 24 +++++++++++++ src/nhttpd/web/languages/English | 26 +++++++++++++- 4 files changed, 90 insertions(+), 39 deletions(-) diff --git a/src/nhttpd/web/Y_Live.js b/src/nhttpd/web/Y_Live.js index e1f3e3c97..eca27939f 100644 --- a/src/nhttpd/web/Y_Live.js +++ b/src/nhttpd/web/Y_Live.js @@ -72,7 +72,7 @@ function do_init(){ // g_intervall = window.setInterval('i_interval()', 20000); } function i_interval(){ - obj_update('bouquets_div', " getting bouquets ..."); + obj_update('bouquets_div', " "+Lgetting_bouquets); window.setTimeout("i_interval2()",300); } function i_interval2(){ @@ -215,19 +215,6 @@ function do_play_or_pause(){ } } /* bouquet & channel panel */ -function build_channel_list(bouquet, channel){ - set_controls("disable"); - var used_channel = channel; - if(used_channel == -1) - used_channel = loadSyncURL("/y/cgi?execute=func:get_actual_channel_id"); - var channel_dropdown_url = "/y/cgi?execute=func:get_channels_as_dropdown%20" + bouquet; - channel_dropdown_url += "%20" + used_channel; - var channel_dropdown = ""; - obj_update('channels_div', channel_dropdown); - set_controls("play"); -} function change_bouquet(){ var dd = id('bouquets'); var bouquet = -1; @@ -237,7 +224,7 @@ function change_bouquet(){ bouquet = dd[sel].value; channel = 0; } - obj_update('channels_div', " getting channels ..."); + obj_update('channels_div', " "+Lgetting_channels); window.setTimeout("build_channel_list("+bouquet+", "+channel+")",2000); } function change_channel(){ diff --git a/src/nhttpd/web/Y_Live.yhtm b/src/nhttpd/web/Y_Live.yhtm index 6dea88bac..05bfba851 100644 --- a/src/nhttpd/web/Y_Live.yhtm +++ b/src/nhttpd/web/Y_Live.yhtm @@ -11,12 +11,25 @@ function build_bouquet_list(bouquet){ if(used_bouquet == -1) used_bouquet = loadSyncURL("/y/cgi?execute=func:get_actual_bouquet_number"); var bouquet_dropdown_url = "/y/cgi?execute=func:get_bouquets_as_dropdown%20" + used_bouquet + "{=if-empty:{=var-get:must_management=}~~%20true=}"; - var bouquet_dropdown = ""; bouquet_dropdown += loadSyncURL(bouquet_dropdown_url); bouquet_dropdown += "<\/select>"; obj_update('bouquets_div', bouquet_dropdown); build_channel_list(used_bouquet, -1); } +function build_channel_list(bouquet, channel){ + set_controls("disable"); + var used_channel = channel; + if(used_channel == -1) + used_channel = loadSyncURL("/y/cgi?execute=func:get_actual_channel_id"); + var channel_dropdown_url = "/y/cgi?execute=func:get_channels_as_dropdown%20" + bouquet; + channel_dropdown_url += "%20" + used_channel; + var channel_dropdown = ""; + obj_update('channels_div', channel_dropdown); + set_controls("play"); +} function view_epg(){ var sel=document.x.channels.selectedIndex; if(sel != -1){ @@ -48,18 +61,18 @@ function view_transcode_mode(){ -{=var-set:wait_text=Streaming-Informationen
werden ermittelt.=}{=include-block:Y_Blocks.txt;snip_wait=} +{=var-set:wait_text={=L:live.get_stream_info=}=}{=include-block:Y_Blocks.txt;snip_wait=}
@@ -98,38 +111,38 @@ function view_transcode_mode(){
- - - - - {=if-equal:{=mode=}~tv~ =} - {=if-equal:{=mode=}~tv~ - - - =} {=if-equal:{=typ=}~popup~~ {=if-equal:{=typ=}~transcode~~ - =} - =} @@ -142,9 +155,12 @@ function view_transcode_mode(){ Mode = "{=mode=}"; LiveTyp = "{=typ=}"; ClientAddr = "{=func:get_request_data clientaddr=}"; - insert_message_control("... build vlc control ..."); + insert_message_control("{=L:live.build_vlc=}"); isDeinterlace = ("{=ini-get:/var/tuxbox/config/Y-Web.conf;deinterlace;true=}" == "true"); cachetime = {=ini-get:/var/tuxbox/config/Y-Web.conf;http_caching;0=}; + Lgetting_channels="{=L:live.getting_channels=}"; + Lgetting_bouquets="{=L:live.getting_bouquets=}"; + /* {=if-equal:{=typ=}~popup~ always_on_top(); =} diff --git a/src/nhttpd/web/languages/Deutsch b/src/nhttpd/web/languages/Deutsch index ff848306a..3331b2bb5 100644 --- a/src/nhttpd/web/languages/Deutsch +++ b/src/nhttpd/web/languages/Deutsch @@ -151,6 +151,30 @@ tools.path=Verzeichnis tools.command=Kommando tools.cmd.enter_command=Auszuführendes Kommando eingeben tools.cmd.execute_command=Kommando ausführen +=========== LIVE +live.get_stream_info=Streaming-Informationen
werden ermittelt. +live.getting_bouquets=Hole Bouquets ... +live.getting_channels=Hole Sender ... +live.select_resolution=Auflösung auswählen +live.change_channel=Sender wechseln +live.view_epg=EPG für aktuellen Sender anzeigen +live.reload=Bouquets und Sender neu laden +live.getting_subchannels=Hole Unterkanäle ... +live.play_or_pause=Abspielen oder Pause +live.stop=Stoppen +live.mute=Stummschaltung an / aus +live.lower_volume=leiser +live.higher_volume=lauter +live.fullscreen=Ganzer Bildschirm (auch mit Doppelklick) mit ESC zurück +live.lock_unlock=Box sperren / entsperren +live.toggle_udp=UDP Streaming an/aus +live.settings=LiveView Einstellungen +live.snapshot=Schnappschuss erstellen +live.record=Aufnahmemodus +live.transcode=Transkodiermodus +live.build_vlc=... erstelle Live ... +live.select_bouquet=Bouquet auswählen - Sender werden aktualisiert +live.select_channel=Sender wechseln - nutze zap =========== GENERAL clear=löschen diff --git a/src/nhttpd/web/languages/English b/src/nhttpd/web/languages/English index 7999c6cd9..299bc0671 100644 --- a/src/nhttpd/web/languages/English +++ b/src/nhttpd/web/languages/English @@ -152,7 +152,31 @@ tools.cmd_shell.output_desc=automatic output scrolling (only IE) tools.path=Path tools.command=Command tools.cmd.enter_command=enter command to execute -tools.cmd.execute_command=enter command to executeexecute shell command +tools.cmd.execute_command=execute shell command +=========== LIVE +live.get_stream_info=Getting
Streaming-Informationen. +live.getting_bouquets=getting bouquets ... +live.getting_channels=getting channels ... +live.select_resolution=select resolution +live.change_channel=change channel +live.view_epg=view epg for selected channel +live.reload=reload bouquets and channels +live.getting_subchannels=getting subchannels ... +live.mute=mute / unmute volume +live.stop=stop streaming +live.play_or_pause=play or pause streaming +live.lower_volume=lower volume +live.higher_volume=higher volume +live.fullscreen=switch to fullscreen-mode - or use double-click +live.lock_unlock=lock / unlock TV (record mode, rc, lcd) +live.toggle_udp=UDP Streaming on/off +live.settings=LiveView settings +live.snapshot=create snapshot picture +live.record=record mode +live.transcode=transcode mode +live.build_vlc=... build vlc control ... +live.select_bouquet=select bouquet - channels will be updated +live.select_channel=select channel - use go to zap =========== GENERAL clear=clear submit=Submit
- getting bouquets ...
+ {=L:live.getting_bouquets=}
 {=if-equal:{=typ=}~popup~ {=if-equal:{=mode=}~tv~ - @@ -69,23 +82,23 @@ function view_transcode_mode(){
- getting channels ...
+ {=L:live.getting_channels=}
 - - -