From c6a5db4a78c616817d8949c1059f970ca0d3896d Mon Sep 17 00:00:00 2001 From: denise Date: Fri, 23 Nov 2012 10:48:44 -0500 Subject: [PATCH] CC-1960: Internationalize Airtime / Support translations -dashboard was missing a translation - fixed --- .../application/controllers/LocaleController.php | 1 + airtime_mvc/public/js/airtime/dashboard/dashboard.js | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/airtime_mvc/application/controllers/LocaleController.php b/airtime_mvc/application/controllers/LocaleController.php index 0e236bd6b..a397383a0 100644 --- a/airtime_mvc/application/controllers/LocaleController.php +++ b/airtime_mvc/application/controllers/LocaleController.php @@ -33,6 +33,7 @@ class LocaleController extends Zend_Controller_Action "Live Stream" => _("Live Stream"), "Nothing Scheduled" => _("Nothing Scheduled"), "Current Show:" => _("Current Show:"), + "Current" => _("Current"), //dashboard/versiontooltip.js "You are running the latest version" => _("You are running the latest version"), "New version available: " => _("New version available: "), diff --git a/airtime_mvc/public/js/airtime/dashboard/dashboard.js b/airtime_mvc/public/js/airtime/dashboard/dashboard.js index 1f72a76b2..b7d7054e6 100644 --- a/airtime_mvc/public/js/airtime/dashboard/dashboard.js +++ b/airtime_mvc/public/js/airtime/dashboard/dashboard.js @@ -149,18 +149,18 @@ function updatePlaybar(){ }else{ if (master_dj_on_air) { if (showName) { - $('#current').html("Current: "+showName+" - "+$.i18n._("Master Stream")+""); + $('#current').html($.i18n._("Current")+": "+showName+" - "+$.i18n._("Master Stream")+""); } else { - $('#current').html("Current: "+$.i18n._("Master Stream")+""); + $('#current').html($.i18n._("Current")+": "+$.i18n._("Master Stream")+""); } } else if (live_dj_on_air) { if (showName) { - $('#current').html("Current: "+showName+" - "+$.i18n._("Live Stream")+""); + $('#current').html($.i18n._("Current")+": "+showName+" - "+$.i18n._("Live Stream")+""); } else { - $('#current').html("Current: "+$.i18n._("Live Stream")+""); + $('#current').html($.i18n._("Current")+": "+$.i18n._("Live Stream")+""); } } else { - $('#current').html("Current: "+$.i18n._("Nothing Scheduled")+""); + $('#current').html($.i18n._("Current")+": "+$.i18n._("Nothing Scheduled")+""); } }