From cd0284a15c1b219a0a9f21fcb5a0647dbf05c765 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Thu, 13 Feb 2014 16:24:52 +0000 Subject: [PATCH] wrap more strings --- static/js/documentsPanel.js | 2 +- static/js/folderBrowserBar.js | 2 +- static/js/infoView.indiancinema.js | 18 +++++++++--------- static/js/mainMenu.js | 2 +- static/js/namesDialog.js | 2 +- static/js/titlesDialog.js | 2 +- static/js/toolbar.js | 2 +- static/js/utils.js | 2 +- static/json/locale.pandora.de.json | 2 +- static/json/locale.pandora.hi.json | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/static/js/documentsPanel.js b/static/js/documentsPanel.js index 190c22fee..be278e233 100644 --- a/static/js/documentsPanel.js +++ b/static/js/documentsPanel.js @@ -557,7 +557,7 @@ pandora.ui.documentsPanel = function(options) { + value + ''; }, height: width, - placeholder: 'No description', + placeholder: Ox._('No description'), tooltip: editable ? pandora.getEditTooltip('description') : '', type: 'textarea', value: item.description || '', diff --git a/static/js/folderBrowserBar.js b/static/js/folderBrowserBar.js index 5b9c6142d..bbf4409b6 100644 --- a/static/js/folderBrowserBar.js +++ b/static/js/folderBrowserBar.js @@ -13,7 +13,7 @@ pandora.ui.folderBrowserBar = function(id, section) { pandora.$ui.findListsSelect[id] = Ox.Select({ items: [ {id: 'user', title: Ox._('Find: User')}, - {id: 'name', title: Ox._('Find: {0}', [folderItem])} + {id: 'name', title: Ox._('Find: {0}', [Ox._(folderItem)])} ], overlap: 'right', type: 'image' diff --git a/static/js/infoView.indiancinema.js b/static/js/infoView.indiancinema.js index 89eabd154..4cbc9cdb0 100644 --- a/static/js/infoView.indiancinema.js +++ b/static/js/infoView.indiancinema.js @@ -393,7 +393,7 @@ pandora.ui.infoView = function(data) { $('
') .css({marginBottom: '4px'}) .append( - formatKey(key.slice(0, -9) + ' per minute', 'statistics') + formatKey(Ox.toTitleCase(key.slice(0, -9)) + ' per Minute', 'statistics') ) .append( Ox.Theme.formatColor(null, 'gradient') @@ -673,7 +673,7 @@ pandora.ui.infoView = function(data) { return Ox.Theme.formatColorLevel( rightsLevel, pandora.site.rightsLevels.map(function(rightsLevel) { - return rightsLevel.name; + return Ox._(rightsLevel.name); }) ); } @@ -726,11 +726,11 @@ pandora.ui.infoView = function(data) { .appendTo($capabilities); if (canEdit) { $element = Ox.Theme.formatColorLevel(i, userLevels.map(function(userLevel) { - return Ox.toTitleCase(userLevel); + return Ox._(Ox.toTitleCase(userLevel)); }), [0, 240]); Ox.Label({ textAlign: 'center', - title: Ox.toTitleCase(userLevel), + title: Ox._(Ox.toTitleCase(userLevel)), width: 60 }) .addClass('OxColor OxColorGradient') @@ -749,14 +749,14 @@ pandora.ui.infoView = function(data) { var hasCapability = pandora.site.capabilities[capability.name][userLevel] >= rightsLevel, $element = Ox.Theme.formatColorLevel(hasCapability, ['', '']); Ox.Button({ - tooltip: (canEdit ? Ox.toTitleCase(userLevel) : 'You') + ' ' + tooltip: Ox._((canEdit ? Ox.toTitleCase(userLevel) : 'You') + ' ' + (hasCapability ? 'can' : 'can\'t') + ' ' + Ox.toSlashes(capability.name) .split('/').slice(1).join(' ') .toLowerCase() .replace('see item', 'see the item') .replace('play video', 'play the full video') - .replace('download video', 'download the video'), + .replace('download video', 'download the video')), title: capability.symbol, type: 'image' }) @@ -946,9 +946,9 @@ pandora.ui.infoView = function(data) { items: pandora.site.rightsLevels.map(function(rightsLevel, i) { return { id: i, - title: rightsLevel.name, - disabled: !isCopyrighted && rightsLevel.name == Ox._('Under Copyright') - || isCopyrighted && rightsLevel.name == Ox._('Out of Copyright') + title: Ox._(rightsLevel.name), + disabled: !isCopyrighted && rightsLevel.name == 'Under Copyright' + || isCopyrighted && rightsLevel.name == 'Out of Copyright' }; }), width: 128, diff --git a/static/js/mainMenu.js b/static/js/mainMenu.js index 0dc8d5089..5458d9ee2 100644 --- a/static/js/mainMenu.js +++ b/static/js/mainMenu.js @@ -55,7 +55,7 @@ pandora.ui.mainMenu = function() { { group: 'viewsection', min: 1, max: 1, items: Object.keys(pandora.site.sectionFolders).map(function(section) { return { id: section, - title: section == 'items' ? Ox._(pandora.site.itemName.plural) : Ox.toTitleCase(section), + title: section == 'items' ? Ox._(pandora.site.itemName.plural) : Ox._(Ox.toTitleCase(section)), checked: ui.section == section, disabled: section != 'items' && pandora.user.level != 'admin' }; diff --git a/static/js/namesDialog.js b/static/js/namesDialog.js index 81da56eed..76bb58723 100644 --- a/static/js/namesDialog.js +++ b/static/js/namesDialog.js @@ -10,7 +10,7 @@ pandora.ui.namesDialog = function() { $findInput = Ox.Input({ changeOnKeypress: true, clear: true, - placeholder: 'Find', + placeholder: Ox._('Find'), width: 192 }) .css({float: 'right', margin: '4px'}) diff --git a/static/js/titlesDialog.js b/static/js/titlesDialog.js index 89e4acacd..372e9d5cd 100644 --- a/static/js/titlesDialog.js +++ b/static/js/titlesDialog.js @@ -8,7 +8,7 @@ pandora.ui.titlesDialog = function() { $findInput = Ox.Input({ changeOnKeypress: true, clear: true, - placeholder: 'Find', + placeholder: Ox._('Find'), width: 192 }) .css({float: 'right', margin: '4px'}) diff --git a/static/js/toolbar.js b/static/js/toolbar.js index 5e8f4132d..fc4138e52 100644 --- a/static/js/toolbar.js +++ b/static/js/toolbar.js @@ -83,7 +83,7 @@ pandora.ui.toolbar = function() { function getListName(listId) { return '' + ( listId == '' - ? Ox._('All {0}', [pandora.site.itemName.plural]) + ? Ox._('All {0}', [Ox._(pandora.site.itemName.plural)]) : Ox.encodeHTMLEntities(listId.slice(listId.indexOf(':') + 1)) ) + ''; } diff --git a/static/js/utils.js b/static/js/utils.js index 7e031de40..3def8b3b9 100644 --- a/static/js/utils.js +++ b/static/js/utils.js @@ -1710,7 +1710,7 @@ pandora.getStatusText = function(data) { canSeeSize = pandora.site.capabilities.canSeeSize[pandora.user.level], itemName = ['clip', 'video'].indexOf(ui.listView) > -1 ? (data.items == 1 ? Ox._('Clip') : Ox._('Clips')) - : (pandora.site.itemName[data.items == 1 ? 'singular' : 'plural']), + : Ox._(pandora.site.itemName[data.items == 1 ? 'singular' : 'plural']), parts = []; parts.push(Ox.formatNumber(data.items) + ' '+ itemName); if (data.runtime) { diff --git a/static/json/locale.pandora.de.json b/static/json/locale.pandora.de.json index 2085d575b..2bb0a069e 100644 --- a/static/json/locale.pandora.de.json +++ b/static/json/locale.pandora.de.json @@ -249,7 +249,7 @@ "Message Sent": "Nachricht gesendet", "Modified": "Geändert", "Mount Volume": "", - "Move files": "Dateien verschieben", + "Move Files": "Dateien verschieben", "Move selected files to another {0}": "Ausgewählte Datei in eine andere {0} verschieben", "Moving files...": "Dateien verschieben...", "Names": "Namen", diff --git a/static/json/locale.pandora.hi.json b/static/json/locale.pandora.hi.json index af6ed7b8b..cae790988 100644 --- a/static/json/locale.pandora.hi.json +++ b/static/json/locale.pandora.hi.json @@ -251,7 +251,7 @@ "Message Sent": "संदेश भेज दिया गया", "Modified": "संशोधित", "Mount Volume": "माउंट ड्राइव", - "Move files": "मूव फ़ाईल्स", + "Move Files": "मूव फ़ाईल्स", "Move selected files to another {0}": "चयनित फ़ाईल्स को दूसरे {0} में मूव करें", "Moving files...": "फ़ाईल्स मूविंग...", "Names": "नाम",