From 42d535a922654a9509f975b4f2678400e62a98f0 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Tue, 27 Nov 2012 12:33:43 -0500
Subject: [PATCH] CC-1960: Internationalize Airtime / Support translations

-unlocalized some strings
---
 airtime_mvc/application/forms/GeneralPreferences.php | 2 +-
 airtime_mvc/application/models/Webstream.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/forms/GeneralPreferences.php b/airtime_mvc/application/forms/GeneralPreferences.php
index 390b9fa43..746be3696 100644
--- a/airtime_mvc/application/forms/GeneralPreferences.php
+++ b/airtime_mvc/application/forms/GeneralPreferences.php
@@ -120,7 +120,7 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
     private function getLocales()
     {
         $locales = array(
-            'en_CA' => _('English')
+            'en_CA' => 'English'
         );
         
         return $locales;
diff --git a/airtime_mvc/application/models/Webstream.php b/airtime_mvc/application/models/Webstream.php
index 700ecdf64..9297cb1d9 100644
--- a/airtime_mvc/application/models/Webstream.php
+++ b/airtime_mvc/application/models/Webstream.php
@@ -50,7 +50,7 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
             list($hours, $min, $sec) = $arr;
             $di = new DateInterval("PT{$hours}H{$min}M{$sec}S");
 
-            return $di->format("%H"._("h")."  %I"._("m"));
+            return $di->format("%Hh %Im");
         } 
 
         return "";