Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the unit tests and changed ops->zu

This commit is contained in:
Albert Santoni 2014-06-09 11:34:25 -04:00
parent a07121787f
commit 345c782eb9
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
airtime_mvc/application/models/Preference.php
View File

@ -545,7 +545,11 @@ class Application_Model_Preference
// Returns station default timezone (from preferences) // Returns station default timezone (from preferences)
public static function GetDefaultTimezone() public static function GetDefaultTimezone()
{ {
return self::getValue("timezone"); $stationTimezone = self::getValue("timezone");
if (is_null($stationTimezone) || $stationTimezone == "") {
$stationTimezone = "UTC";
}
return $stationTimezone;
} }
public static function SetUserTimezone($timezone = null) public static function SetUserTimezone($timezone = null)

2
airtime_mvc/application/views/scripts/dashboard/about.phtml
View File

@ -10,7 +10,7 @@ echo sprintf(_("%sAirtime%s %s, the open radio software for scheduling and remot
?> ?>
<br>© 2013 <br>© 2013
<?php <?php
echo sprintf(_("%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"), echo sprintf(_("%sSourcefabric%s z.ú Airtime is distributed under the %sGNU GPL v.3%s"),
"<a href='http://www.sourcefabric.org' target='_blank'>", "<a href='http://www.sourcefabric.org' target='_blank'>",
"</a>", "</a>",
"<a href='http://www.gnu.org/licenses/gpl-3.0-standalone.html' target='_blank'>", "<a href='http://www.gnu.org/licenses/gpl-3.0-standalone.html' target='_blank'>",

2
airtime_mvc/application/views/scripts/login/index.phtml
View File

@ -4,7 +4,7 @@
<div id="login" class="login-content clearfix"> <div id="login" class="login-content clearfix">
<?php if(isset($this->demo) && $this->demo == 1){?> <?php if(isset($this->demo) && $this->demo == 1){?>
<p style="font-weight:bold"> <p style="font-weight:bold">
<?php echo _("Welcome to the online Airtime demo! You can log in using the username 'admin' and the password 'admin'.")?> <?php echo _("Welcome to the Airtime demo! You can log in using the username 'admin' and the password 'admin'.")?>
</p> </p>
<?php }?> <?php }?>
<p class="light" style='<?php echo $this->error?"color:#902d2d;font-size:11px;padding:2px 4px;background:#c6b4b4;margin-bottom:2px;border:1px solid #c83f3f;":""?>'><?php echo $this->message; ?></p> <p class="light" style='<?php echo $this->error?"color:#902d2d;font-size:11px;padding:2px 4px;background:#c6b4b4;margin-bottom:2px;border:1px solid #c83f3f;":""?>'><?php echo $this->message; ?></p>

1
airtime_mvc/tests/application/helpers/TestHelper.php
View File

@ -109,7 +109,6 @@ class TestHelper
//Create all the database tables //Create all the database tables
AirtimeInstall::createDatabaseTables($dbuser, $dbpasswd, $dbname, $dbhost); AirtimeInstall::createDatabaseTables($dbuser, $dbpasswd, $dbname, $dbhost);
} }
AirtimeInstall::SetDefaultTimezone();
} }
public static function setupZendBootstrap() public static function setupZendBootstrap()