From 96ad166cb1575b2757fc9d6f34e08d0b03e6c9fb Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Fri, 10 May 2013 14:54:30 +0000
Subject: [PATCH] even more localization

---
 static/js/pandora/account.js         |  8 +++----
 static/js/pandora/editor.js          |  3 ++-
 static/js/pandora/folderList.js      |  2 +-
 static/js/pandora/folders.js         |  2 +-
 static/js/pandora/info.js            |  2 +-
 static/js/pandora/infoView.padma.js  |  2 +-
 static/js/pandora/leftPanel.js       |  2 +-
 static/js/pandora/listDialog.js      | 20 ++++++++--------
 static/js/pandora/logsDialog.js      |  2 +-
 static/js/pandora/metadataDialog.js  |  2 +-
 static/js/pandora/navigationView.js  |  6 ++---
 static/js/pandora/news.js            |  2 +-
 static/js/pandora/player.js          |  3 ++-
 static/js/pandora/sequencesDialog.js |  4 ++--
 static/js/pandora/textPanel.js       |  2 +-
 static/js/pandora/usersDialog.js     | 36 ++++++++++++++--------------
 static/js/pandora/utils.js           |  2 +-
 17 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/static/js/pandora/account.js b/static/js/pandora/account.js
index 6e5018079..3304eb697 100644
--- a/static/js/pandora/account.js
+++ b/static/js/pandora/account.js
@@ -383,10 +383,10 @@ pandora.ui.accountWelcomeDialog = function() {
                 .append(
                     Ox.Element()
                         .css({position: 'absolute', left: '96px', top: '16px', width: '192px'})
-                        .html(
-                            'Welcome, ' + Ox.encodeHTMLEntities(pandora.user.username)
-                            + '!<br/><br/>Your account has been created.'
-                        )
+                        .html(Ox._(
+                            'Welcome, {0}!<br/><br/>Your account has been created.',
+                            [Ox.encodeHTMLEntities(pandora.user.username)]
+                        ))
                 ),
             fixedSize: true,
             height: 128,
diff --git a/static/js/pandora/editor.js b/static/js/pandora/editor.js
index 6db9c8bc3..02378735b 100644
--- a/static/js/pandora/editor.js
+++ b/static/js/pandora/editor.js
@@ -13,7 +13,8 @@ pandora.ui.editor = function(data) {
             annotationsRange: ui.annotationsRange,
             annotationsSize: ui.annotationsSize,
             annotationsSort: ui.annotationsSort,
-            annotationsTooltip: 'annotations <span class="OxBright">' + Ox.SYMBOLS.SHIFT + 'A</span>',
+            annotationsTooltip: Ox._('annotations {}',
+                ['<span class="OxBright">' + Ox.SYMBOLS.SHIFT + 'A</span>']),
             censored: data.censored,
             censoredIcon: pandora.site.cantPlay.icon,
             censoredTooltip: pandora.site.cantPlay.text,
diff --git a/static/js/pandora/folderList.js b/static/js/pandora/folderList.js
index 559e2e969..55f92caf4 100644
--- a/static/js/pandora/folderList.js
+++ b/static/js/pandora/folderList.js
@@ -274,7 +274,7 @@ pandora.ui.folderList = function(id) {
             if (id == 'personal') {
                 if (event.keys == '' || event.keys == 'alt') {
                     pandora.api.addList({
-                        name: 'Untitled',
+                        name: Ox._('Untitled'),
                         status: 'private',
                         type: event.keys == '' ? 'static' : 'smart'
                     }, function(result) {
diff --git a/static/js/pandora/folders.js b/static/js/pandora/folders.js
index 651528351..b224f2b30 100644
--- a/static/js/pandora/folders.js
+++ b/static/js/pandora/folders.js
@@ -259,7 +259,7 @@ pandora.ui.folders = function() {
                         hasFocus, id;
                     if (data.id == 'new' || data.id == 'newsmart') {
                         pandora.api.addList({
-                            name: 'Untitled',
+                            name: Ox._('Untitled'),
                             status: 'private',
                             type: data.id == 'new' ? 'static' : 'smart'
                         }, function(result) {
diff --git a/static/js/pandora/info.js b/static/js/pandora/info.js
index e2633f477..8352398c2 100644
--- a/static/js/pandora/info.js
+++ b/static/js/pandora/info.js
@@ -140,7 +140,7 @@ pandora.ui.info = function() {
                                 marginTop: '2px',
                                 fontSize: '9px',
                                 textAlign: 'center'
-                            }).html('No Video')
+                            }).html(Ox._('No Video'))
                         )
                     );
                 }
diff --git a/static/js/pandora/infoView.padma.js b/static/js/pandora/infoView.padma.js
index 93b072360..44014c1bf 100644
--- a/static/js/pandora/infoView.padma.js
+++ b/static/js/pandora/infoView.padma.js
@@ -19,7 +19,7 @@ pandora.ui.infoView = function(data) {
         iconLeft = iconSize == 256 ? Math.floor((iconSize - iconWidth) / 2) : 0,
         borderRadius = ui.icons == 'posters' ? 0 : iconSize / 8,
         margin = 16,
-        nameKeys = ['director', 'cinematograper', 'featuring'],
+        nameKeys = ['director', 'cinematographer', 'featuring'],
         listKeys = nameKeys.concat(['language', 'topic', 'license', 'groups']),
         statisticsWidth = 128,
 
diff --git a/static/js/pandora/leftPanel.js b/static/js/pandora/leftPanel.js
index 8fec96a48..d431fd57a 100644
--- a/static/js/pandora/leftPanel.js
+++ b/static/js/pandora/leftPanel.js
@@ -15,7 +15,7 @@ pandora.ui.leftPanel = function() {
                     collapsible: true,
                     element: pandora.$ui.info = pandora.ui.info(),
                     size: pandora.getInfoHeight(true),
-                    tooltip: 'info <span class="OxBright">'
+                    tooltip: Ox('info') + ' <span class="OxBright">'
                         + Ox.SYMBOLS.SHIFT + 'I</span>'
                 }
             ],
diff --git a/static/js/pandora/listDialog.js b/static/js/pandora/listDialog.js
index d4df69c76..dfe259805 100644
--- a/static/js/pandora/listDialog.js
+++ b/static/js/pandora/listDialog.js
@@ -80,7 +80,7 @@ pandora.ui.listDialog = function(section) {
                 pandora.$ui.findIconItemInput = Ox.Input({
                     changeOnKeypress: true,
                     clear: true,
-                    placeholder: 'Find: All',
+                    placeholder: Ox._('Find: All'),
                     width: 128 + Ox.UI.SCROLLBAR_SIZE
                 })
                 .bindEvent({
@@ -165,7 +165,7 @@ pandora.ui.listGeneralPanel = function(listData) {
             subscribers = result.data.items[0].subscribers,
             $icon = Ox.Element({
                     element: '<img>',
-                    tooltip: 'Doubleclick to edit icon'
+                    tooltip: Ox._('Doubleclick to edit icon')
                 })
                 .attr({
                     src: '/' + folderItem.toLowerCase() + '/' + listData.id + '/icon256.jpg?' + Ox.uid()
@@ -185,7 +185,7 @@ pandora.ui.listGeneralPanel = function(listData) {
                 })
                 .appendTo(that),
             $nameInput = Ox.Input({
-                    label: 'Name',
+                    label: Ox._('Name'),
                     labelWidth: 80,
                     value: listData.name,
                     width: 320
@@ -199,7 +199,7 @@ pandora.ui.listGeneralPanel = function(listData) {
             $itemsInput = ui.section == 'items'
                 ? Ox.Input({
                     disabled: true,
-                    label: 'Items',
+                    label: Ox._('Items'),
                     labelWidth: 80,
                     value: listData.items,
                     width: 320
@@ -214,7 +214,7 @@ pandora.ui.listGeneralPanel = function(listData) {
                             title: rightsLevel.name,
                         };
                     }),
-                    label: 'Rights Level',
+                    label: Ox._('Rights Level'),
                     labelWidth: 90,
                     value: listData.rightslevel,
                     width: 320
@@ -227,7 +227,7 @@ pandora.ui.listGeneralPanel = function(listData) {
             $statusSelect = listData.status == 'featured'
                 ? Ox.Input({
                     disabled: true,
-                    label: 'Status',
+                    label: Ox._('Status'),
                     labelWidth: 80,
                     value: 'Featured',
                     width: 320
@@ -239,7 +239,7 @@ pandora.ui.listGeneralPanel = function(listData) {
                         {id: 'private', title: Ox._('Private')},
                         {id: 'public', title: Ox._('Public')}
                     ],
-                    label: 'Status',
+                    label: Ox._('Status'),
                     labelWidth: 80,
                     value: listData.status,
                     width: 320
@@ -251,7 +251,7 @@ pandora.ui.listGeneralPanel = function(listData) {
                 .appendTo(that),
             $subscribersInput = Ox.Input({
                     disabled: true,
-                    label: 'Subscribers',
+                    label: Ox._('Subscribers'),
                     labelWidth: 80,
                     value: subscribers,
                     width: 320
@@ -261,7 +261,7 @@ pandora.ui.listGeneralPanel = function(listData) {
                 .appendTo(that),
             $descriptionInput = Ox.Input({
                     height: getDescriptionHeight(),
-                    placeholder: 'Description',
+                    placeholder: Ox._('Description'),
                     type: 'textarea',
                     value: description,
                     width: 320
@@ -297,7 +297,7 @@ pandora.ui.listGeneralPanel = function(listData) {
                         Ox.Request.clearCache('find' + folderItems);
                         pandora.$ui.info.updateListInfo();
                         pandora.$ui.listDialog.options({
-                            title: folderItem + ' &mdash; ' + Ox.encodeHTMLEntities(listData.name)
+                            title: Ox._(folderItem) + ' &mdash; ' + Ox.encodeHTMLEntities(listData.name)
                         });
                     }
                 });
diff --git a/static/js/pandora/logsDialog.js b/static/js/pandora/logsDialog.js
index 10f6415b9..a4061b871 100644
--- a/static/js/pandora/logsDialog.js
+++ b/static/js/pandora/logsDialog.js
@@ -32,7 +32,7 @@ pandora.ui.logsDialog = function() {
         $findInput = Ox.Input({
                 changeOnKeypress: true,
                 clear: true,
-                placeholder: 'Find: All',
+                placeholder: Ox._('Find: All'),
                 width: 192
             })
             .bindEvent({
diff --git a/static/js/pandora/metadataDialog.js b/static/js/pandora/metadataDialog.js
index ea7cde947..3af27c1e2 100644
--- a/static/js/pandora/metadataDialog.js
+++ b/static/js/pandora/metadataDialog.js
@@ -248,7 +248,7 @@ pandora.ui.metadataDialog = function(data) {
                                         })
                                 ],
                                 separators: [
-                                    {title: ['Current', 'Update'][i], width: 64}
+                                    {title: [Ox._('Current'), Ox_('Update')][i], width: 64}
                                 ]
                             })
                             .css({display: 'inline-block', margin: '3px'})
diff --git a/static/js/pandora/navigationView.js b/static/js/pandora/navigationView.js
index ffcda74b2..49fee6604 100644
--- a/static/js/pandora/navigationView.js
+++ b/static/js/pandora/navigationView.js
@@ -239,10 +239,8 @@ pandora.ui.navigationView = function(type, videoRatio) {
     }
 
     function updateStatusbar(items) {
-        $status.html(
-            (items ? Ox.formatNumber(items) : 'No')
-            + ' Clip' + (items == 1 ? '' : 's')
-        );
+        //fixme how to capitalize Ox.formatCount?
+        $status.html(Ox.formatCount(items, 'Clip'));
     }
 
     if (type == 'map') {
diff --git a/static/js/pandora/news.js b/static/js/pandora/news.js
index a9c1ce141..dbd45d299 100644
--- a/static/js/pandora/news.js
+++ b/static/js/pandora/news.js
@@ -111,7 +111,7 @@ pandora.ui.news = function(width, height) {
                 clickLink: pandora.clickLink,
                 editable: isEditable,
                 maxHeight: height - 96,
-                placeholder: 'No text',
+                placeholder: Ox._('No text'),
                 tooltip: isEditable ? pandora.getEditTooltip() : '',
                 type: 'textarea',
                 value: items[index].text,
diff --git a/static/js/pandora/player.js b/static/js/pandora/player.js
index 122a7300f..2a49a937b 100644
--- a/static/js/pandora/player.js
+++ b/static/js/pandora/player.js
@@ -13,7 +13,8 @@ pandora.ui.player = function(data) {
             annotationsRange: ui.annotationsRange,
             annotationsSize: ui.annotationsSize,
             annotationsSort: ui.annotationsSort,
-            annotationsTooltip: 'annotations <span class="OxBright">' + Ox.SYMBOLS.SHIFT + 'A</span>',
+            annotationsTooltip: Ox._('annotations {}',
+                ['<span class="OxBright">' + Ox.SYMBOLS.SHIFT + 'A</span>']),
             censored: data.censored,
             censoredIcon: pandora.site.cantPlay.icon,
             censoredTooltip: pandora.site.cantPlay.text,
diff --git a/static/js/pandora/sequencesDialog.js b/static/js/pandora/sequencesDialog.js
index 4513dde1c..ce3e61550 100644
--- a/static/js/pandora/sequencesDialog.js
+++ b/static/js/pandora/sequencesDialog.js
@@ -356,11 +356,11 @@ pandora.ui.sequencesDialog = function() {
     }
 
     function getTitle() {
-        return pandora.user.ui.sequenceSort[0].operator == '+' ? 'up' : 'down';
+        return pandora.user.ui.sequenceSort[0].operator == '+' ? Ox._('up') : Ox._('down');
     }
 
     function getTooltip() {
-        return pandora.user.ui.sequenceSort[0].operator == '+' ? 'Ascending' : 'Descending';
+        return pandora.user.ui.sequenceSort[0].operator == '+' ? Ox._('Ascending') : Ox._('Descending');
     }
 
     function openClip() {
diff --git a/static/js/pandora/textPanel.js b/static/js/pandora/textPanel.js
index 07395019b..bff3bd125 100644
--- a/static/js/pandora/textPanel.js
+++ b/static/js/pandora/textPanel.js
@@ -394,7 +394,7 @@ pandora.ui.textEmbed = function() {
 
         $message = $('<div>')
             .css({marginTop: '16px', textAlign: 'center'})
-            .html('No Embeds')
+            .html(Ox._('No Embeds'))
             .hide()
             .appendTo(that),
 
diff --git a/static/js/pandora/usersDialog.js b/static/js/pandora/usersDialog.js
index a5501517a..3a64678ed 100644
--- a/static/js/pandora/usersDialog.js
+++ b/static/js/pandora/usersDialog.js
@@ -612,23 +612,23 @@ pandora.ui.usersDialog = function() {
             items: [
                 Ox.Checkbox({
                         id: 'status',
-                        label: 'Status',
+                        label: Ox._('Status'),
                         labelWidth: 80,
-                        title: !user.disabled ? 'Enabled' : 'Disabled',
+                        title: !user.disabled ? Ox._('Enabled') : Ox._('Disabled'),
                         value: !user.disabled,
                         width: formWidth - 16
                     })
                     .bindEvent({
                         change: function(data) {
                             this.options({
-                                title: this.options('title') == 'Enabled'
-                                    ? 'Disabled' : 'Enabled'
+                                title: this.options('title') == Ox._('Enabled')
+                                    ? Ox._('Disabled') : Ox._('Enabled')
                             });
                         }
                     }),
                 Ox.Input({
                         id: 'username',
-                        label: 'Username',
+                        label: Ox._('Username'),
                         labelWidth: 80,
                         value: user.username,
                         width: formWidth - 16
@@ -640,7 +640,7 @@ pandora.ui.usersDialog = function() {
                     }),
                 Ox.Input({
                         id: 'email',
-                        label: 'E-Mail',
+                        label: Ox._('E-Mail'),
                         labelWidth: 80,
                         value: user.email,
                         width: formWidth - 16
@@ -658,30 +658,30 @@ pandora.ui.usersDialog = function() {
                             title: Ox.toTitleCase(level)
                         };
                     }),
-                    label: 'Level',
+                    label: Ox._('Level'),
                     labelWidth: 80,
                     value: user.level,
                     width: formWidth - 16
                 }),
                 Ox.Checkbox({
                         id: 'newsletter',
-                        label: 'Newsletter',
+                        label: Ox._('Newsletter'),
                         labelWidth: 80,
-                        title: user.newsletter ? 'Subscribed' : 'Unsubscribed',
+                        title: user.newsletter ? Ox._('Subscribed') : Ox._('Unsubscribed'),
                         value: user.newsletter,
                         width: formWidth - 16
                     })
                     .bindEvent({
                         change: function(data) {
                             this.options({
-                                title: this.options('title') == 'Subscribed'
-                                    ? 'Unsubscribed' : 'Subscribed'
+                                title: this.options('title') == Ox._('Subscribed')
+                                    ? Ox._('Unsubscribed') : Ox._('Subscribed')
                             });
                         }
                     }),
                 Ox.Input({
                         id: 'groups',
-                        label: 'Groups',
+                        label: Ox._('Groups'),
                         labelWidth: 80,
                         value: user.groups ? user.groups.join(', ') : '',
                         width: formWidth - 16
@@ -694,7 +694,7 @@ pandora.ui.usersDialog = function() {
                 Ox.Input({
                     height: dialogHeight - 184,
                     id: 'notes',
-                    placeholder: 'Notes',
+                    placeholder: Ox._('Notes'),
                     type: 'textarea',
                     value: user.notes,
                     width: formWidth - 16
@@ -735,7 +735,7 @@ pandora.ui.usersDialog = function() {
                 Ox.Input({
                     disabled: true,
                     id: 'from',
-                    label: 'From',
+                    label: Ox_('From'),
                     labelWidth: 80,
                     value: pandora.site.site.name + ' <' + pandora.site.site.email.contact + '>',
                     width: formWidth - 16
@@ -743,7 +743,7 @@ pandora.ui.usersDialog = function() {
                 Ox.Input({
                     disabled: true,
                     id: 'to',
-                    label: 'To',
+                    label: Ox._('To'),
                     labelWidth: 80,
                     value: '',
                     width: formWidth - 16
@@ -754,7 +754,7 @@ pandora.ui.usersDialog = function() {
                             {id: 'users', title: Ox._('All users')},
                             {id: 'subscribers', title: Ox._('Subscribers only')},
                         ],
-                        label: 'Include',
+                        label: Ox._('Include'),
                         labelWidth: 80,
                         width: formWidth - 16
                     })
@@ -766,7 +766,7 @@ pandora.ui.usersDialog = function() {
                     }),
                 Ox.Input({
                         id: 'subject',
-                        label: 'Subject',
+                        label: Ox._('Subject'),
                         labelWidth: 80,
                         value: pandora.site.site.email.prefix + ' ',
                         width: formWidth - 16
@@ -777,7 +777,7 @@ pandora.ui.usersDialog = function() {
                 Ox.Input({
                         height: dialogHeight - 208,
                         id: 'message',
-                        placeholder: 'Message',
+                        placeholder: Ox._('Message'),
                         type: 'textarea',
                         value: '\n\n' + pandora.site.site.email.footer,
                         width: formWidth - 16
diff --git a/static/js/pandora/utils.js b/static/js/pandora/utils.js
index 8ba1e4804..c1a61bcbc 100644
--- a/static/js/pandora/utils.js
+++ b/static/js/pandora/utils.js
@@ -21,7 +21,7 @@ pandora.addList = function() {
         isSmart = arguments[0];
         isFrom = arguments[1];
         data = {
-            name: 'Untitled',
+            name: Ox._('Untitled'),
             status: 'private',
             type: !isSmart ? 'static' : 'smart'
         };