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

Merge branch '2.5.x' into cc-5709-airtime-analyzer

Browse source 
Conflicts:
	airtime_mvc/application/Bootstrap.php
This commit is contained in:
drigato 2014-11-26 10:35:48 -05:00
commit f08535cc10
99 changed files with 30547 additions and 20010 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/forms/AddShowLiveStream.php
View file

@ -7,7 +7,7 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm
public function init()
{
$cb_airtime_auth = new Zend_Form_Element_Checkbox("cb_airtime_auth");
$cb_airtime_auth->setLabel(_("Use Airtime Authentication:"))
$cb_airtime_auth->setLabel(sprintf(_("Use %s Authentication:"), PRODUCT_NAME))
->setRequired(false)
->setDecorators(array('ViewHelper'));
$this->addElement($cb_airtime_auth);

8
airtime_mvc/application/forms/Login.php
View file

@ -53,13 +53,11 @@ class Application_Form_Login extends Zend_Form
$locale->setMultiOptions(Application_Model_Locale::getLocales());
$locale->setDecorators(array('ViewHelper'));
$this->addElement($locale);
$this->setDefaults(array(
"locale" => Application_Model_Locale::getUserLocale()
));
$recaptchaNeeded = false;
if (Application_Model_LoginAttempts::getAttempts($_SERVER['REMOTE_ADDR']) >= 3) {
$recaptchaNeeded = true;
}
if ($recaptchaNeeded) {
// recaptcha
$this->addRecaptcha();
}

9
airtime_mvc/application/forms/RegisterAirtime.php
View file

@ -123,7 +123,7 @@ class Application_Form_RegisterAirtime extends Zend_Form
// checkbox for publicise
$checkboxPublicise = new Zend_Form_Element_Checkbox("Publicise");
$checkboxPublicise->setLabel(_('Promote my station on Sourcefabric.org'))
$checkboxPublicise->setLabel(sprintf(_('Promote my station on %s'), COMPANY_SITE))
->setRequired(false)
->setDecorators(array('ViewHelper'))
->setValue(Application_Model_Preference::GetPublicise());
@ -143,11 +143,14 @@ class Application_Form_RegisterAirtime extends Zend_Form
)
));
$privacyPolicyAnchorOpen = "<a id='link_to_privacy' href='" . PRIVACY_POLICY_URL
. "' onclick='window.open(this.href); return false;'>";
// checkbox for privacy policy
$checkboxPrivacy = new Zend_Form_Element_Checkbox("Privacy");
$checkboxPrivacy->setLabel(
sprintf(_("By checking this box, I agree to Sourcefabric's %sprivacy policy%s."),
"<a id='link_to_privacy' href='http://www.sourcefabric.org/en/about/policy/' onclick='window.open(this.href); return false;'>",
sprintf(_('By checking this box, I agree to %s\'s %sprivacy policy%s.'),
COMPANY_NAME,
$privacyPolicyAnchorOpen,
"</a>"))
->setDecorators(array('ViewHelper'));
$this->addElement($checkboxPrivacy);

9
airtime_mvc/application/forms/SupportSettings.php
View file

@ -119,7 +119,7 @@ class Application_Form_SupportSettings extends Zend_Form
// checkbox for publicise
$checkboxPublicise = new Zend_Form_Element_Checkbox("Publicise");
$checkboxPublicise->setLabel(_('Promote my station on Sourcefabric.org'))
$checkboxPublicise->setLabel(sprintf(_('Promote my station on %s'), COMPANY_SITE))
->setRequired(false)
->setDecorators(array('ViewHelper'))
->setValue(Application_Model_Preference::GetPublicise());
@ -142,11 +142,14 @@ class Application_Form_SupportSettings extends Zend_Form
)
));
$privacyPolicyAnchorOpen = "<a id='link_to_privacy' href='" . PRIVACY_POLICY_URL
. "' onclick='window.open(this.href); return false;'>";
// checkbox for privacy policy
$checkboxPrivacy = new Zend_Form_Element_Checkbox("Privacy");
$checkboxPrivacy->setLabel(
sprintf(_("By checking this box, I agree to Sourcefabric's %sprivacy policy%s."),
"<a id='link_to_privacy' href='http://www.sourcefabric.org/en/about/policy/' onclick='window.open(this.href); return false;'>",
sprintf(_('By checking this box, I agree to %s\'s %sprivacy policy%s.'),
COMPANY_NAME,
$privacyPolicyAnchorOpen,
"</a>"))
->setDecorators(array('ViewHelper'));
$this->addElement($checkboxPrivacy);