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 @@
") ?>
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 @@
@@ -16,9 +16,9 @@
echo _("id") ?> |
echo _("Username") ?> |
- echo _("First")?> echo _("Name")?> |
- echo _("Last")?> echo _("Name")?> |
- echo _("User")?> echo _("Type")?> |
+ echo _("First Name")?> |
+ echo _("Last Name")?> |
+ echo _("User Type")?> |
|
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