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

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

Browse source
This commit is contained in:
Martin Konecny 2013-01-14 14:07:55 -05:00
commit ba66746a00
19 changed files with 989 additions and 278 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/controllers/LibraryController.php
View file

@ -372,7 +372,7 @@ class LibraryController extends Zend_Controller_Action
list(, $plFadeOut) = $originalPl->getFadeInfo($originalPl->getSize()-1);
$newPl->setfades($plFadeIn, $plFadeOut);
$newPl->setName("Copy of ".$originalPl->getName());
$newPl->setName(sprintf(_("Copy of %s"), $originalPl->getName()));
}
public function contentsFeedAction()

3
airtime_mvc/application/controllers/ListenerstatController.php
View file

@ -52,6 +52,9 @@ class ListenerstatController extends Zend_Controller_Action
$out = array();
foreach ($errorStatus as $v) {
$key = explode('_listener_stat_error', $v['keyname']);
if ($v['value'] != 'OK') {
$v['value'] = _("Please make sure admin user/password is correct on System->Streams page.");
}
$out[$key[0]] = $v['value'];
}

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

@ -54,6 +54,7 @@ class LocaleController extends Zend_Controller_Action
"You can only add tracks, smart blocks, and webstreams to playlists." => _("You can only add tracks, smart blocks, and webstreams to playlists."),
//library/events/library_showbuilder.js
//already in library/events/library_playlistbuilder.js
"Please select a cursor position on timeline." => _("Please select a cursor position on timeline."),
//"Adding 1 Item" => _("Adding 1 Item"),
//"Adding %s Items" => _("Adding %s Items"),
//library/library.js

9
airtime_mvc/application/controllers/PreferenceController.php
View file

@ -255,6 +255,15 @@ class PreferenceController extends Zend_Controller_Action
Application_Model_Preference::SetDefaultTransitionFade($values["transition_fade"]);
Application_Model_Preference::SetAutoTransition($values["auto_transition"]);
Application_Model_Preference::SetAutoSwitch($values["auto_switch"]);
// compare new values with current value
$changeRGenabled = Application_Model_Preference::GetEnableReplayGain() != $values["enableReplayGain"];
$changeRGmodifier = Application_Model_Preference::getReplayGainModifier() != $values["replayGainModifier"];
if ($changeRGenabled || $changeRGmodifier) {
$md = array('schedule' => Application_Model_Schedule::getSchedule());
Application_Model_RabbitMq::SendMessageToPypo("update_schedule", $md);
}
Application_Model_Preference::SetEnableReplayGain($values["enableReplayGain"]);
Application_Model_Preference::setReplayGainModifier($values["replayGainModifier"]);

11
airtime_mvc/application/forms/AddUser.php
View file

@ -36,14 +36,12 @@ class Application_Form_AddUser extends Zend_Form
$password->addValidator($notEmptyValidator);
$this->addElement($password);
$passwordIdenticalValidator = Application_Form_Helper_ValidationTypes::overridePasswordIdenticalValidator('password');
$passwordVerify = new Zend_Form_Element_Password('passwordVerify');
$passwordVerify->setLabel(_('Verify Password:'));
$passwordVerify->setAttrib('class', 'input_text');
$passwordVerify->setRequired(true);
$passwordVerify->addFilter('StringTrim');
$passwordVerify->addValidator($notEmptyValidator);
$passwordVerify->addValidator($passwordIdenticalValidator);
$this->addElement($passwordVerify);
$firstName = new Zend_Form_Element_Text('first_name');
@ -120,4 +118,13 @@ class Application_Form_AddUser extends Zend_Form
return true;
}
// We need to add the password identical validator here in case
// Zend version is less than 1.10.5
public function isValid($data) {
$passwordIdenticalValidator = Application_Form_Helper_ValidationTypes::overridePasswordIdenticalValidator(
$data['password']);
$this->getElement('passwordVerify')->addValidator($passwordIdenticalValidator);
return parent::isValid($data);
}
}

11
airtime_mvc/application/forms/EditUser.php
View file

@ -46,14 +46,12 @@ class Application_Form_EditUser extends Zend_Form
$password->setDecorators(array('viewHelper'));
$this->addElement($password);
$passwordIdenticalValidator = Application_Form_Helper_ValidationTypes::overridePasswordIdenticalValidator('cu_password');
$passwordVerify = new Zend_Form_Element_Password('cu_passwordVerify');
$passwordVerify->setLabel(_('Verify Password:'));
$passwordVerify->setAttrib('class', 'input_text');
$passwordVerify->setRequired(true);
$passwordVerify->addFilter('StringTrim');
$passwordVerify->addValidator($notEmptyValidator);
$passwordVerify->addValidator($passwordIdenticalValidator);
$passwordVerify->setDecorators(array('viewHelper'));
$this->addElement($passwordVerify);
@ -137,4 +135,13 @@ class Application_Form_EditUser extends Zend_Form
return true;
}
}
// We need to add the password identical validator here in case
// Zend version is less than 1.10.5
public function isValid($data) {
$passwordIdenticalValidator = Application_Form_Helper_ValidationTypes::overridePasswordIdenticalValidator(
$data['cu_password']);
$this->getElement('cu_passwordVerify')->addValidator($passwordIdenticalValidator);
return parent::isValid($data);
}
}

BIN
airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.mo
View file

Binary file not shown.

574
airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
View file

File diff suppressed because it is too large Load diff

2
airtime_mvc/public/css/styles.css
View file

@ -2992,7 +2992,7 @@ dd .stream-status {
.edit-user-errors {
margin-left: 33% !important;
width: 208px;
}
.jp-container a#popup-link {
width: 104px;
border: 1px solid black;

2
airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
View file

@ -113,7 +113,7 @@ var AIRTIME = (function(AIRTIME) {
}
if (aSchedIds.length == 0) {
alert("Please select a cursor position on timeline.");
alert($.i18n._("Please select a cursor position on timeline."));
return false;
}
console.log(aMediaIds);