Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Martin Konecny 2013-01-14 17:16:01 -05:00
parent e22a573d8a 175dbcbabc
commit 4e0d644d8b
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
airtime_mvc/application/Bootstrap.php
View File

@ -23,7 +23,6 @@ require_once __DIR__.'/controllers/plugins/RabbitMqPlugin.php';
date_default_timezone_set('UTC'); date_default_timezone_set('UTC');
require_once (APPLICATION_PATH."/logging/Logging.php"); require_once (APPLICATION_PATH."/logging/Logging.php");
Logging::setLogPath('/var/log/airtime/zendphp.log'); Logging::setLogPath('/var/log/airtime/zendphp.log');
Logging::info($CC_CONFIG);
date_default_timezone_set(Application_Model_Preference::GetTimezone()); date_default_timezone_set(Application_Model_Preference::GetTimezone());
Config::setAirtimeVersion(); Config::setAirtimeVersion();

1
airtime_mvc/application/controllers/LocaleController.php
View File

@ -158,6 +158,7 @@ class LocaleController extends Zend_Controller_Action
"Copyright" => _("Copyright"), "Copyright" => _("Copyright"),
"All" => _("All"), "All" => _("All"),
"Copied %s row%s to the clipboard" => _("Copied %s row%s to the clipboard"), "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 //preferences/musicdirs.js
"Choose Storage Folder" => _("Choose Storage Folder"), "Choose Storage Folder" => _("Choose Storage Folder"),
"Choose Folder to Watch" => _("Choose Folder to Watch"), "Choose Folder to Watch" => _("Choose Folder to Watch"),

5
airtime_mvc/public/js/airtime/playouthistory/historytable.js
View File

@ -111,7 +111,10 @@ var AIRTIME = (function(AIRTIME) {
"sExtends": "pdf", "sExtends": "pdf",
"fnClick": setFlashFileName "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."), "<h6>", "</h6><p>")
}
] ]
} }
}); });