Fixed the unit tests and changed ops->zu
This commit is contained in:
parent
a07121787f
commit
345c782eb9
|
@ -545,7 +545,11 @@ class Application_Model_Preference
|
|||
// Returns station default timezone (from preferences)
|
||||
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)
|
||||
|
|
|
@ -10,7 +10,7 @@ echo sprintf(_("%sAirtime%s %s, the open radio software for scheduling and remot
|
|||
?>
|
||||
<br>© 2013
|
||||
<?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>",
|
||||
"<a href='http://www.gnu.org/licenses/gpl-3.0-standalone.html' target='_blank'>",
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
<div id="login" class="login-content clearfix">
|
||||
<?php if(isset($this->demo) && $this->demo == 1){?>
|
||||
<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>
|
||||
<?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>
|
||||
|
|
|
@ -109,7 +109,6 @@ class TestHelper
|
|||
//Create all the database tables
|
||||
AirtimeInstall::createDatabaseTables($dbuser, $dbpasswd, $dbname, $dbhost);
|
||||
}
|
||||
AirtimeInstall::SetDefaultTimezone();
|
||||
}
|
||||
|
||||
public static function setupZendBootstrap()
|
||||
|
|
Loading…
Reference in New Issue