From 345c782eb917cc276194625b5d6b1fa7a3d62cf4 Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Mon, 9 Jun 2014 11:34:25 -0400
Subject: [PATCH] Fixed the unit tests and changed ops->zu

---
 airtime_mvc/application/models/Preference.php               | 6 +++++-
 airtime_mvc/application/views/scripts/dashboard/about.phtml | 2 +-
 airtime_mvc/application/views/scripts/login/index.phtml     | 2 +-
 airtime_mvc/tests/application/helpers/TestHelper.php        | 1 -
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index c873ea88f..e73069f43 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -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)
diff --git a/airtime_mvc/application/views/scripts/dashboard/about.phtml b/airtime_mvc/application/views/scripts/dashboard/about.phtml
index 05f65cd80..f2ccfa02d 100644
--- a/airtime_mvc/application/views/scripts/dashboard/about.phtml
+++ b/airtime_mvc/application/views/scripts/dashboard/about.phtml
@@ -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'>",
diff --git a/airtime_mvc/application/views/scripts/login/index.phtml b/airtime_mvc/application/views/scripts/login/index.phtml
index 3012ae985..178aca493 100644
--- a/airtime_mvc/application/views/scripts/login/index.phtml
+++ b/airtime_mvc/application/views/scripts/login/index.phtml
@@ -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>
diff --git a/airtime_mvc/tests/application/helpers/TestHelper.php b/airtime_mvc/tests/application/helpers/TestHelper.php
index c339b2329..c33103f8e 100644
--- a/airtime_mvc/tests/application/helpers/TestHelper.php
+++ b/airtime_mvc/tests/application/helpers/TestHelper.php
@@ -109,7 +109,6 @@ class TestHelper
             //Create all the database tables
             AirtimeInstall::createDatabaseTables($dbuser, $dbpasswd, $dbname, $dbhost);
         }
-        AirtimeInstall::SetDefaultTimezone();
     }
 
     public static function setupZendBootstrap()