diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php index 06226cb8f..c6bc3bd31 100644 --- a/airtime_mvc/application/Bootstrap.php +++ b/airtime_mvc/application/Bootstrap.php @@ -103,8 +103,9 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $view->headScript()->appendFile($baseUrl.'/js/sprintf/sprintf-0.7-beta1.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $view->headScript()->appendFile($baseUrl.'/js/bootstrap/bootstrap.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $view->headScript()->appendFile($baseUrl.'/js/i18n/jquery.i18n.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - $view->headScript()->appendFile($baseUrl.'/locale/translation-table?'.$CC_CONFIG['airtime_version'].rand(5, 10),'text/javascript'); - $view->headScript()->appendScript("$.i18n.setDictionary(lang_dict)"); + $view->headScript()->appendFile($baseUrl.'/locale/general-translation-table?'.$CC_CONFIG['airtime_version'],'text/javascript'); + $view->headScript()->appendFile($baseUrl.'/locale/datatables-translation-table?'.$CC_CONFIG['airtime_version'],'text/javascript'); + $view->headScript()->appendScript("$.i18n.setDictionary(general_dict)"); $view->headScript()->appendScript("var baseUrl='$baseUrl'"); //scripts for now playing bar diff --git a/airtime_mvc/application/controllers/LocaleController.php b/airtime_mvc/application/controllers/LocaleController.php index 7f5ecc805..4fa34b8d4 100644 --- a/airtime_mvc/application/controllers/LocaleController.php +++ b/airtime_mvc/application/controllers/LocaleController.php @@ -5,11 +5,23 @@ class LocaleController extends Zend_Controller_Action public function init() { $ajaxContext = $this->_helper->getHelper('AjaxContext'); - $ajaxContext->addActionContext('language-table', 'json') + $ajaxContext->addActionContext('general-translation-table', 'json') + ->addActionContext('datatables-translation-table', 'json') ->initContext(); } - public function translationTableAction() + public function datatablesTranslationTableAction() + { + $this->view->layout()->disableLayout(); + $this->_helper->viewRenderer->setNoRender(true); + header("Content-type: text/javascript"); + + $baseUrl = Application_Common_OsPath::getBaseDir(); + echo "var datatables_dict =" . + file_get_contents($_SERVER['DOCUMENT_ROOT'].$baseUrl.'/js/datatables/i18n/de_DE.txt'); + } + + public function generalTranslationTableAction() { $translations = array ( //common/common.js @@ -196,6 +208,48 @@ class LocaleController extends Zend_Controller_Action //already in schedule/add-show.js //"The show instance doesn't exist anymore!" => _("The show instance doesn't exist anymore!"), //schedule/schedule.js + "January" => _("January"), + "February" => _("February"), + "March" => _("March"), + "April" => _("April"), + "May" => _("May"), + "June" => _("June"), + "July" => _("July"), + "August" => _("August"), + "September" => _("September"), + "October" => _("October"), + "November" => _("November"), + "December" => _("December"), + "Jan" => _("Jan"), + "Feb" => _("Feb"), + "Mar" => _("Mar"), + "Apr" => _("Apr"), + "May" => _("May"), + "Jun" => _("Jun"), + "Jul" => _("Jul"), + "Aug" => _("Aug"), + "Sep" => _("Sep"), + "Oct" => _("Oct"), + "Nov" => _("Nov"), + "Dec" => _("Dec"), + "today" => _("today"), + "day" => _("day"), + "week" => _("week"), + "month" => _("month"), + "Sunday" => _("Sunday"), + "Monday" => _("Monday"), + "Tuesday" => _("Tuesday"), + "Wednesday" => _("Wednesday"), + "Thursday" => _("Thursday"), + "Friday" => _("Friday"), + "Saturday" => _("Saturday"), + "Sun" => _("Sun"), + "Mon" => _("Mon"), + "Tue" => _("Tue"), + "Wed" => _("Wed"), + "Thu" => _("Thu"), + "Fri" => _("Fri"), + "Sat" => _("Sat"), "Shows longer than their scheduled time will be cut off by a following show." => _("Shows longer than their scheduled time will be cut off by a following show."), "Cancel Current Show?" => _("Cancel Current Show?"), "Stop recording current show?" => _("Stop recording current show?"), @@ -221,7 +275,7 @@ class LocaleController extends Zend_Controller_Action "Show Empty" => _("Show Empty"), "Recording From Line In" => _("Recording From Line In"), "Track preview" => _("Track preview"), - //already in library/spl/js + //already in library/spl.js //"Airtime is unsure about the status of this file. This can happen when the file is on a remote drive that is unaccessible or the file is in a directory that isn't 'watched' anymore." //=> _("Airtime is unsure about the status of this file. This can happen when the file is on a remote drive that is unaccessible or the file is in a directory that isn't 'watched' anymore."), "Cannot schedule outside a show." => _("Cannot schedule outside a show."), @@ -230,7 +284,7 @@ class LocaleController extends Zend_Controller_Action " Item." => _(" Item."), " Items." => _(" Items."), //already in library/library.js - "Select" => _("Select"), + //"Select" => _("Select"), "Select all" => _("Select all"), "Select none" => _("Select none"), "Remove overbooked tracks" => _("Remove overbooked tracks"), @@ -251,12 +305,15 @@ class LocaleController extends Zend_Controller_Action "DJ" => _("DJ"), "Program Manager" => _("Program Manager"), "Guest" => _("Guest"), - + //dataTables/ColVis.js + "Show / hide columns" => _("Show / hide columns"), + //datatables.columnFilter.js + "From {from} to {to}" => _("From {from} to {to}") ); $this->view->layout()->disableLayout(); $this->_helper->viewRenderer->setNoRender(true); header("Content-type: text/javascript"); - echo "var lang_dict=".json_encode($translations); + echo "var general_dict=".json_encode($translations); } } \ No newline at end of file diff --git a/airtime_mvc/application/views/scripts/playlist/playlist.phtml b/airtime_mvc/application/views/scripts/playlist/playlist.phtml index 216cb5ac4..f8496d926 100644 --- a/airtime_mvc/application/views/scripts/playlist/playlist.phtml +++ b/airtime_mvc/application/views/scripts/playlist/playlist.phtml @@ -17,10 +17,10 @@ if (isset($this->obj)) { obj)) : ?>
- +
- +
diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 72980ab15..e9ece9a37 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -465,6 +465,7 @@ var AIRTIME = (function(AIRTIME) { /* Website */ { "sTitle" : $.i18n._("Website") , "mDataProp" : "info_url" , "bVisible" : false , "sClass" : "library_url" , "sWidth" : "150px" }, /* Year */ { "sTitle" : $.i18n._("Year") , "mDataProp" : "year" , "bVisible" : false , "sClass" : "library_year" , "sWidth" : "60px" } ], + "bProcessing": true, "bServerSide": true, @@ -664,10 +665,7 @@ var AIRTIME = (function(AIRTIME) { "sPaginationType": "full_numbers", "bJQueryUI": true, "bAutoWidth": false, - "oLanguage": { - "sSearch": "", - "sLengthMenu": "Show _MENU_" - }, + "oLanguage": datatables_dict, // R = ColReorder, C = ColVis "sDom": 'Rl<"#library_display_type">f<"dt-process-rel"r><"H"<"library_toolbar"C>><"dataTables_scrolling"t><"F"ip>', diff --git a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js index 4bfaabf56..e045248e9 100644 --- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js +++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js @@ -154,12 +154,12 @@ function viewDisplay( view ) { var calendarEl = this; var select = $('