decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

pass default subtitle language to player and editor

Browse source
This commit is contained in:
rolux 2014-07-23 15:53:37 +02:00
parent 68ead8a2af
commit 18d5d15293
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
static/js/editor.js
View file

@ -60,6 +60,7 @@ pandora.ui.editor = function(data) {
showLayers: Ox.clone(ui.showLayers), showLayers: Ox.clone(ui.showLayers),
showUsers: pandora.site.annotations.showUsers, showUsers: pandora.site.annotations.showUsers,
subtitles: data.subtitles, subtitles: data.subtitles,
subtitlesDefaultTrack: pandora.site.language,
subtitlesLayer: data.subtitlesLayer, subtitlesLayer: data.subtitlesLayer,
timeline: ui.videoTimeline, timeline: ui.videoTimeline,
timelines: pandora.site.timelines, timelines: pandora.site.timelines,

1
static/js/player.js
View file

@ -49,6 +49,7 @@ pandora.ui.player = function(data) {
showTimeline: ui.showTimeline, showTimeline: ui.showTimeline,
smallTimelineURL: pandora.getMediaURL('/' + ui.item + '/timeline16p.jpg'), smallTimelineURL: pandora.getMediaURL('/' + ui.item + '/timeline16p.jpg'),
subtitles: data.subtitles, subtitles: data.subtitles,
subtitlesDefaultTrack: pandora.site.language,
timeline: ui.videoTimeline, timeline: ui.videoTimeline,
timelineTooltip: Ox._('timeline') + ' <span class="OxBright">' + Ox.SYMBOLS.SHIFT + 'T</span>', timelineTooltip: Ox._('timeline') + ' <span class="OxBright">' + Ox.SYMBOLS.SHIFT + 'T</span>',
video: data.video, video: data.video,