diff --git a/airtime_mvc/application/controllers/LocaleController.php b/airtime_mvc/application/controllers/LocaleController.php index ac2ded2fe..b8a32eedc 100644 --- a/airtime_mvc/application/controllers/LocaleController.php +++ b/airtime_mvc/application/controllers/LocaleController.php @@ -210,6 +210,7 @@ class LocaleController extends Zend_Controller_Action //"Error code: " => _("Error code: "), //"Error msg: " => _("Error msg: "), "This show has no scheduled content." => _("This show has no scheduled content."), + "This show is not completely filled with content." => _("This show is not completely filled with content."), //already in schedule/add-show.js //"The show instance doesn"t exist anymore!" => _("The show instance doesn"t exist anymore!"), //schedule/schedule.js diff --git a/airtime_mvc/application/forms/AddShowStyle.php b/airtime_mvc/application/forms/AddShowStyle.php index 5f897f6ea..e8feeae89 100644 --- a/airtime_mvc/application/forms/AddShowStyle.php +++ b/airtime_mvc/application/forms/AddShowStyle.php @@ -19,9 +19,9 @@ class Application_Form_AddShowStyle extends Zend_Form_SubForm 'class' => 'big' )))); + $stringLengthValidator = Application_Form_Helper_ValidationTypes::overrideStringLengthValidator(6, 6); $bg->setValidators(array( - 'Hex', - array('stringLength', false, array(6, 6)) + 'Hex', $stringLengthValidator )); // Add show color input @@ -39,8 +39,7 @@ class Application_Form_AddShowStyle extends Zend_Form_SubForm )))); $c->setValidators(array( - 'Hex', - array('stringLength', false, array(6, 6)) + 'Hex', $stringLengthValidator )); } diff --git a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml index 07665c6ec..5cb89d8a8 100644 --- a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml +++ b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml @@ -85,7 +85,7 @@ form->getElement('replayGainModifier')->getValue() ?> - dB +
form->getElement('replayGainModifier') ?> diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index 15fa67f72..2839ab45d 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -74,7 +74,7 @@ var AIRTIME = (function(AIRTIME){ type = $('#obj_type').val(); if (!isTimeValid(cueIn)){ - showError(span, $.i18n("please put in a time '00:00:00 (.0)'")); + showError(span, $.i18n._("please put in a time '00:00:00 (.0)'")); return; } $.post(url, @@ -111,7 +111,7 @@ var AIRTIME = (function(AIRTIME){ type = $('#obj_type').val(); if (!isTimeValid(cueOut)){ - showError(span, $.i18n("please put in a time '00:00:00 (.0)'")); + showError(span, $.i18n._("please put in a time '00:00:00 (.0)'")); return; }