From 6a9b60ddcaf323c2d82ebf351a5ce77620422cb9 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Sat, 13 Sep 2014 15:59:44 +0100 Subject: [PATCH] fix find --- source/Ox.UI/js/Video/AnnotationPanel.js | 4 ++-- source/Ox/js/Date.js | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source/Ox.UI/js/Video/AnnotationPanel.js b/source/Ox.UI/js/Video/AnnotationPanel.js index f27b2c42..d4b2e178 100644 --- a/source/Ox.UI/js/Video/AnnotationPanel.js +++ b/source/Ox.UI/js/Video/AnnotationPanel.js @@ -261,8 +261,8 @@ Ox.AnnotationPanel = function(options, self) { isString ? [ {}, {id: 'annotation', title: annotationTitle, disabled: true}, - {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))} + {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/js/Date.js b/source/Ox/js/Date.js index 09778b37..0eff3148 100644 --- a/source/Ox/js/Date.js +++ b/source/Ox/js/Date.js @@ -252,6 +252,8 @@ Ox.makeDate Takes a date, number or string, returns a date '1970' > Ox.formatDate(Ox.makeDate('1970-05'), '%Y-%m') '1970-05' + > Ox.formatDate(Ox.makeDate(Ox.parseDate('-50')), '%Y') + '-50' @*/ Ox.makeDate = function(date) { // Safari 4/5 (<= 534.59.10) doesn't parse YYYY, YYYY-MM or YYYY-MM-DD