From 692c1a1c9ec9a25259803890205cf5602518f85f Mon Sep 17 00:00:00 2001 From: denise Date: Mon, 14 Jan 2013 17:01:50 -0500 Subject: [PATCH 1/2] CC-4838: I18N: HTML contents of Print preview for Playout History need to be translated -fixed --- airtime_mvc/application/controllers/LocaleController.php | 1 + airtime_mvc/public/js/airtime/playouthistory/historytable.js | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/controllers/LocaleController.php b/airtime_mvc/application/controllers/LocaleController.php index b8a32eedc..d689417be 100644 --- a/airtime_mvc/application/controllers/LocaleController.php +++ b/airtime_mvc/application/controllers/LocaleController.php @@ -158,6 +158,7 @@ class LocaleController extends Zend_Controller_Action "Copyright" => _("Copyright"), "All" => _("All"), "Copied %s row%s to the clipboard" => _("Copied %s row%s to the clipboard"), + "%sPrint view%sPlease use your browser's print function to print this table. Press escape when finished." => _("%sPrint view%sPlease use your browser's print function to print this table. Press escape when finished."), //preferences/musicdirs.js "Choose Storage Folder" => _("Choose Storage Folder"), "Choose Folder to Watch" => _("Choose Folder to Watch"), diff --git a/airtime_mvc/public/js/airtime/playouthistory/historytable.js b/airtime_mvc/public/js/airtime/playouthistory/historytable.js index 86a6d7915..0cbd672ff 100644 --- a/airtime_mvc/public/js/airtime/playouthistory/historytable.js +++ b/airtime_mvc/public/js/airtime/playouthistory/historytable.js @@ -111,7 +111,10 @@ var AIRTIME = (function(AIRTIME) { "sExtends": "pdf", "fnClick": setFlashFileName }, - "print" + { + "sExtends": "print", + "sInfo" : sprintf($.i18n._("%sPrint view%sPlease use your browser's print function to print this table. Press escape when finished."), "
", "

") + } ] } }); From ea703579202f81157e82de3a7da204345989183e Mon Sep 17 00:00:00 2001 From: James Date: Mon, 14 Jan 2013 17:08:47 -0500 Subject: [PATCH 2/2] - remove logging --- airtime_mvc/application/Bootstrap.php | 1 - 1 file changed, 1 deletion(-) diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php index 81564d135..dab304fd1 100644 --- a/airtime_mvc/application/Bootstrap.php +++ b/airtime_mvc/application/Bootstrap.php @@ -23,7 +23,6 @@ require_once __DIR__.'/controllers/plugins/RabbitMqPlugin.php'; date_default_timezone_set('UTC'); require_once (APPLICATION_PATH."/logging/Logging.php"); Logging::setLogPath('/var/log/airtime/zendphp.log'); -Logging::info($CC_CONFIG); date_default_timezone_set(Application_Model_Preference::GetTimezone()); Config::setAirtimeVersion();