Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime

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;

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 "";