diff --git a/static/js/clipsView.js b/static/js/clipsView.js index 8cdf92f6..3d5b56f7 100644 --- a/static/js/clipsView.js +++ b/static/js/clipsView.js @@ -66,7 +66,7 @@ pandora.ui.clipsView = function(videoRatio) { init: function(data) { var items = data.items; $status.html( - Ox.toTitleCase(Ox.formatCount(items, 'Clip')) + Ox.toTitleCase(Ox.formatCount(items, 'clip')) ); } }); diff --git a/static/js/documentsDialog.js b/static/js/documentsDialog.js index 695944d8..241cca92 100644 --- a/static/js/documentsDialog.js +++ b/static/js/documentsDialog.js @@ -157,7 +157,7 @@ pandora.ui.documentsDialog = function(options) { .bindEvent({ init: function(data) { $status.html( - Ox.formatCount(data.items, 'file') + Ox.toTitleCase(Ox.formatCount(data.items, 'file')) ); }, load: function() { diff --git a/static/js/namesDialog.js b/static/js/namesDialog.js index 180685ab..81da56ee 100644 --- a/static/js/namesDialog.js +++ b/static/js/namesDialog.js @@ -6,7 +6,6 @@ pandora.ui.namesDialog = function() { var height = Math.round((window.innerHeight - 48) * 0.9), width = 576 + Ox.UI.SCROLLBAR_SIZE, - numberOfNames = 0, $findInput = Ox.Input({ changeOnKeypress: true, @@ -73,8 +72,9 @@ pandora.ui.namesDialog = function() { }) .bindEvent({ init: function(data) { - numberOfNames = data.items; - $status.html(Ox.formatCount(numberOfNames, 'name')); + $status.html( + Ox.toTitleCase(Ox.formatCount(data.items, 'name')) + ); }, open: function(data) { $list.find('.OxItem.OxSelected > .OxCell.OxColumnSortname') diff --git a/static/js/navigationView.js b/static/js/navigationView.js index 4ed47d53..6a610d69 100644 --- a/static/js/navigationView.js +++ b/static/js/navigationView.js @@ -246,7 +246,7 @@ pandora.ui.navigationView = function(type, videoRatio) { } function updateStatusbar(items) { - $status.html(Ox.toTitleCase(Ox.formatCount(items, 'Clip'))); + $status.html(Ox.toTitleCase(Ox.formatCount(items, 'clip'))); } if (type == 'map') { diff --git a/static/js/titlesDialog.js b/static/js/titlesDialog.js index 14fe38db..89e4acac 100644 --- a/static/js/titlesDialog.js +++ b/static/js/titlesDialog.js @@ -4,7 +4,6 @@ pandora.ui.titlesDialog = function() { var height = Math.round((window.innerHeight - 48) * 0.9), width = 512 + Ox.UI.SCROLLBAR_SIZE, - numberOfTitles = 0, $findInput = Ox.Input({ changeOnKeypress: true, @@ -62,8 +61,9 @@ pandora.ui.titlesDialog = function() { }) .bindEvent({ init: function(data) { - numberOfTitles = data.items; - $status.html(Ox.formatCount(numberOfTitles, 'title')); + $status.html( + Ox.toTitleCase(Ox.formatCount(data.items, 'title')) + ); }, open: function(data) { $list.find('.OxItem.OxSelected > .OxCell.OxColumnSorttitle') diff --git a/static/js/usersDialog.js b/static/js/usersDialog.js index ab812592..6673bb08 100644 --- a/static/js/usersDialog.js +++ b/static/js/usersDialog.js @@ -922,9 +922,8 @@ pandora.ui.usersDialog = function() { function setTo() { var recipients = getTo().length; - //fixme shoule be No not no from formatCount here $mailForm.values({ - to: Ox.formatCount(recipients, 'recipient') + to: Ox.formatCount(recipients, 'recipient').replace('no', 'No') }); }