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 16:00:46 -05:00
parent fae3f3a03f ed2e25fb29
commit 0dfd8acf7a
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

7
airtime_mvc/application/forms/AddShowStyle.php
View File

@ -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
));
}

2
airtime_mvc/application/views/scripts/preference/stream-setting.phtml
View File

@ -85,7 +85,7 @@
<span id="rg_modifier_value" style="border: 0; color: #f6931f; font-weight: bold;">
<?php echo $this->form->getElement('replayGainModifier')->getValue() ?>
</span>
dB
<?php echo _("dB")?>
</dt>
<dd id="replayGainModifier-element" class="block-display">
<?php echo $this->form->getElement('replayGainModifier') ?>

4
airtime_mvc/public/js/airtime/library/spl.js
View File

@ -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;
}