From da2443426085c59f3bfa3c32c1dd004c741e8e5f Mon Sep 17 00:00:00 2001 From: rolux Date: Sun, 19 Jan 2014 11:58:59 +0530 Subject: [PATCH] in video panels, use self.options.itemName --- source/Ox.UI/js/Video/AnnotationPanel.js | 7 ++++--- source/Ox.UI/js/Video/VideoAnnotationPanel.js | 2 ++ source/Ox.UI/js/Video/VideoPlayerPanel.js | 2 ++ source/Ox.UI/js/Video/VideoTimelinePanel.js | 3 +++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/source/Ox.UI/js/Video/AnnotationPanel.js b/source/Ox.UI/js/Video/AnnotationPanel.js index d6864905..b71a831a 100644 --- a/source/Ox.UI/js/Video/AnnotationPanel.js +++ b/source/Ox.UI/js/Video/AnnotationPanel.js @@ -51,6 +51,7 @@ Ox.AnnotationPanel = function(options, self) { editable: false, font: 'small', highlight: '', + itemName: {singular: 'video', plural: 'videos'}, layers: [], mapSize: 256, range: 'all', @@ -232,6 +233,7 @@ Ox.AnnotationPanel = function(options, self) { {id: 'undo', title: Ox._('Undo Changes'), disabled: !self.editing, keyboard: 'escape'}, {id: 'save', title: Ox._('Save Changes'), disabled: !self.editing, keyboard: isString ? 'return' : 'shift return'}, ], + //FIXME: pandora is not part of Ox.UI pandora.site.map == 'manual' ? [ {}, {id: 'manage', title: manageTitle, disabled: !self.options.selected || !isEventOrPlace}, @@ -239,9 +241,8 @@ Ox.AnnotationPanel = function(options, self) { isString ? [ {}, {id: 'annotation', title: annotationTitle, disabled: true}, - //FIXME: pandora is not part of Ox.UI - {id: 'find', title: Ox._('Find in This {0}', Ox._(pandora.site.itemName.singular))}, - {id: 'findannotations', title: Ox._('Find in All {0}', Ox._(pandora.site.itemName.plural))} + {id: 'find', title: Ox._('Find in This {0}', Ox.toTitleCase(self.options.itemName.singular))}, + {id: 'findannotations', title: Ox._('Find in All {0}', Ox.toTitleCase(self.options.itemName.plural))} ] : [] ), maxWidth: 256, diff --git a/source/Ox.UI/js/Video/VideoAnnotationPanel.js b/source/Ox.UI/js/Video/VideoAnnotationPanel.js index 7b473c9b..79d4443a 100644 --- a/source/Ox.UI/js/Video/VideoAnnotationPanel.js +++ b/source/Ox.UI/js/Video/VideoAnnotationPanel.js @@ -69,6 +69,7 @@ Ox.VideoAnnotationPanel = function(options, self) { getLargeTimelineURL: null, getSmallTimelineURL: null, 'in': 0, + itemName: {singular: 'video', plural: 'videos'}, height: 0, layers: [], loop: false, @@ -743,6 +744,7 @@ Ox.VideoAnnotationPanel = function(options, self) { font: self.options.annotationsFont, highlight: self.options.find, 'in': self.options['in'], + itemName: self.options.itemName, layers: self.options.layers, mapSize: self.options.annotationsMapSize, out: self.options.out, diff --git a/source/Ox.UI/js/Video/VideoPlayerPanel.js b/source/Ox.UI/js/Video/VideoPlayerPanel.js index f30838e9..c1bb144a 100644 --- a/source/Ox.UI/js/Video/VideoPlayerPanel.js +++ b/source/Ox.UI/js/Video/VideoPlayerPanel.js @@ -56,6 +56,7 @@ Ox.VideoPlayerPanel = function(options, self) { getLargeTimelineURL: null, height: 0, 'in': 0, + itemName: {singular: 'video', plural: 'videos'}, layers: [], loop: false, muted: false, @@ -336,6 +337,7 @@ Ox.VideoPlayerPanel = function(options, self) { font: self.options.annotationsFont, highlight: self.options.find, 'in': self.options['in'], + itemName: self.options.itemName, layers: self.options.layers, mapSize: self.options.annotationsMapSize, out: self.options.out, diff --git a/source/Ox.UI/js/Video/VideoTimelinePanel.js b/source/Ox.UI/js/Video/VideoTimelinePanel.js index b8bdfea5..09f28202 100644 --- a/source/Ox.UI/js/Video/VideoTimelinePanel.js +++ b/source/Ox.UI/js/Video/VideoTimelinePanel.js @@ -48,6 +48,8 @@ Ox.VideoTimelinePanel = function(options, self) { getFrameURL: null, getLargeTimelineURL: null, height: 0, + 'in': 0, + itemName: {singular: 'video', plural: 'videos'}, layers: [], loop: false, // fixme: used? muted: false, @@ -164,6 +166,7 @@ Ox.VideoTimelinePanel = function(options, self) { font: self.options.annotationsFont, highlight: self.options.find, 'in': self.options['in'], + itemName: self.options.itemName, layers: self.options.layers, mapSize: self.options.annotationsMapSize, out: self.options.out,