From b9b387fcd05374a7252284a7a6a23425522eda97 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Tue, 27 Nov 2012 11:59:55 -0500
Subject: [PATCH] CC-1960: Internationalize Airtime / Support translations

-fixed typos
---
 .../application/views/scripts/form/register-dialog.phtml | 2 +-
 .../application/views/scripts/user/add-user.phtml        | 8 ++++----
 airtime_mvc/public/js/airtime/library/spl.js             | 2 +-
 .../public/js/airtime/listenerstat/listenerstat.js       | 9 +--------
 airtime_mvc/public/js/plupload/i18n/en_CA.js             | 1 +
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/form/register-dialog.phtml b/airtime_mvc/application/views/scripts/form/register-dialog.phtml
index 1c51d010d..ce5099e31 100644
--- a/airtime_mvc/application/views/scripts/form/register-dialog.phtml
+++ b/airtime_mvc/application/views/scripts/form/register-dialog.phtml
@@ -5,7 +5,7 @@
                <dt class="block-display info-text">
                     <?php echo sprintf(_("Help Airtime improve by letting us know how you are using it. This info "
                     ."will be collected regularly in order to enhance your user experience.%s"
-                    ."Click 'Yes, help Airtime' and we'll make sure the features you use are"
+                    ."Click 'Yes, help Airtime' and we'll make sure the features you use are "
                     ."constantly improving."), "<br /><br />") ?>
                 </dt>
                 <dd id="SupportFeedback-element" class="block-display">
diff --git a/airtime_mvc/application/views/scripts/user/add-user.phtml b/airtime_mvc/application/views/scripts/user/add-user.phtml
index 2a6a2795d..5712cdf7b 100644
--- a/airtime_mvc/application/views/scripts/user/add-user.phtml
+++ b/airtime_mvc/application/views/scripts/user/add-user.phtml
@@ -7,7 +7,7 @@
             <div class="button-holder">
                 <button type="button" id="add_user_button" name="search_add_group" class="ui-button ui-widget ui-state-default ui-button-text-icon-primary">
                     <span class="ui-icon ui-icon-plusthick"></span>
-                    <span class="ui-button-text"><? echo _("New")?>&nbsp;<? echo _("User")?></span>
+                    <span class="ui-button-text"><? echo _("New User")?></span>
                 </button>
             </div>
 
@@ -16,9 +16,9 @@
                     <tr>
                         <th><? echo _("id") ?></th>
                         <th><? echo _("Username") ?></th>
-                        <th><? echo _("First")?>&nbsp;<? echo _("Name")?></th>
-                        <th><? echo _("Last")?>&nbsp;<? echo _("Name")?></th>
-                        <th><? echo _("User")?>&nbsp;<? echo _("Type")?></th>
+                        <th><? echo _("First Name")?></th>
+                        <th><? echo _("Last Name")?></th>
+                        <th><? echo _("User Type")?></th>
                         <th>&nbsp;</th>
                     </tr>
                 </thead>
diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js
index e58686c20..a5811ed5a 100644
--- a/airtime_mvc/public/js/airtime/library/spl.js
+++ b/airtime_mvc/public/js/airtime/library/spl.js
@@ -683,7 +683,7 @@ var AIRTIME = (function(AIRTIME){
                             var field = json.analysis[s];
                             
                             if (!field[0]) {
-                                var elemId = "#"+s+$.i18n._("-error");
+                                var elemId = "#"+s+"-error";
                                 var $div = $("#side_playlist " + elemId).text(field[1]).show();
                             }
                         }
diff --git a/airtime_mvc/public/js/airtime/listenerstat/listenerstat.js b/airtime_mvc/public/js/airtime/listenerstat/listenerstat.js
index 848017b42..194db78a4 100644
--- a/airtime_mvc/public/js/airtime/listenerstat/listenerstat.js
+++ b/airtime_mvc/public/js/airtime/listenerstat/listenerstat.js
@@ -134,7 +134,7 @@ function plot(datasets){
                     var y = item.datapoint[1].toFixed(2);
                     
                     showTooltip(item.pageX, item.pageY,
-                                $.i18n._("Listener Count on")+" '"+item.series.label + "': " + Math.floor(y));
+                                sprintf($.i18n._("Listener Count on %s: %s"), item.series.label, Math.floor(y)));
                 }
             }
             else {
@@ -143,13 +143,6 @@ function plot(datasets){
             }
         });
 
-        $("#placeholder").bind("plotclick", function (event, pos, item) {
-            if (item) {
-                $("#clickdata").text($.i18n._("You clicked point ") + item.dataIndex + " "+$.i18n._("in")+" " + item.series.label + ".");
-                plot.highlight(item.series, item.datapoint);
-            }
-        });
-        
         $('#legend').find("input").click(function(){setTimeout(plotByChoice,100);});
     }
     
diff --git a/airtime_mvc/public/js/plupload/i18n/en_CA.js b/airtime_mvc/public/js/plupload/i18n/en_CA.js
index b34927459..3cfe4c509 100644
--- a/airtime_mvc/public/js/plupload/i18n/en_CA.js
+++ b/airtime_mvc/public/js/plupload/i18n/en_CA.js
@@ -21,5 +21,6 @@ plupload.addI18n({
     'Stop Upload': 'Stop Upload',
     'Add Files': 'Add Files',
     'Start Upload': 'Start Upload',
+    'Start upload': 'Start upload',
     '%d files queued': '%d files queued'
 });
\ No newline at end of file