Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
James 2012-11-27 13:35:09 -05:00
parent 7cc4c88f2f 42d535a922
commit 1ce448b50b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/forms/GeneralPreferences.php
View File

@ -120,7 +120,7 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
private function getLocales() private function getLocales()
{ {
$locales = array( $locales = array(
'en_CA' => _('English') 'en_CA' => 'English'
); );
return $locales; return $locales;

2
airtime_mvc/application/models/Webstream.php
View File

@ -50,7 +50,7 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
list($hours, $min, $sec) = $arr; list($hours, $min, $sec) = $arr;
$di = new DateInterval("PT{$hours}H{$min}M{$sec}S"); $di = new DateInterval("PT{$hours}H{$min}M{$sec}S");
return $di->format("%H"._("h")." %I"._("m")); return $di->format("%Hh %Im");
} }
return ""; return "";