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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source 
Conflicts:
	airtime_mvc/application/common/DateHelper.php
	airtime_mvc/public/js/airtime/library/library.js
This commit is contained in:
Martin Konecny 2012-11-30 18:01:02 -05:00
commit b474035d76
184 changed files with 14239 additions and 1155 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/models/ShowBuilder.php
View file

@ -195,7 +195,7 @@ class Application_Model_ShowBuilder
$dt->setTimezone(new DateTimeZone($this->timezone));
$time = $dt->format("Y-m-d H:i");
$row["rebroadcast_title"] = "Rebroadcast of {$name} from {$time}";
$row["rebroadcast_title"] = sprintf(_("Rebroadcast of %s from %s"), $name, $time);
} elseif (intval($p_item["si_record"]) === 1) {
$row["record"] = true;