Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x

airtime_mvc/application/models/Playlist.php

@@ -154,8 +154,6 @@ class Application_Model_Playlist implements Application_Model_LibraryEditable
      */
     public function getContents($filterFiles=false)
     {
-        Logging::info("Getting contents for playlist {$this->id}");
-
         $sql = <<<SQL
   SELECT *
    FROM (
@@ -438,6 +436,12 @@ SQL;
                     $entry["cueout"] = $entry["cliplength"];
                 }
                 $entry["ftype"] = $objType;
+                
+                $entry["fadein"] = isset($p_item['fadein']) ?
+                	$p_item['fadein'] : $entry["fadein"];
+                
+                $entry["fadeout"] = isset($p_item['fadeout']) ?
+                	$p_item['fadeout'] : $entry["fadeout"];
             }
 
             return $entry;
@@ -463,11 +467,10 @@ SQL;
         try {
 
             if (is_numeric($p_afterItem)) {
-                Logging::info("Finding playlist content item {$p_afterItem}");
                
                 $afterItem = CcPlaylistcontentsQuery::create()->findPK($p_afterItem);
                 $index = $afterItem->getDbPosition();
-                Logging::info("index is {$index}");
+
                 $pos = ($addType == 'after') ? $index + 1 : $index;
 
                 $contentsToUpdate = CcPlaylistcontentsQuery::create()
@@ -500,9 +503,6 @@ SQL;
 
             }
 
-            Logging::info("Adding to playlist");
-            Logging::info("at position {$pos}");
-
             foreach ($p_items as $ac) {
                 $res = $this->insertPlaylistElement($this->buildEntry($ac, $pos));
 
@@ -512,8 +512,6 @@ SQL;
                 $db_file->setDbIsPlaylist(true)->save($this->con);
                 
                 $pos = $pos + 1;
-                Logging::info("Adding $ac[1] $ac[0]");
-
             }
 
             //reset the positions of the remaining items.
@@ -745,7 +743,6 @@ SQL;
                 
                 if (!is_null($offset)) {
                 	$row->setDbTrackOffset($offset);
-                	Logging::info("Setting offset {$offset} on item {$id}");
                 	$row->save($this->con);
                 }
             }

airtime_mvc/application/services/CalendarService.php

@@ -75,11 +75,11 @@ class Application_Service_CalendarService
             }
         } else {
             //Show content can be modified from the calendar if:
-            // the show has not started,
+            // the show has not ended,
             // the user is admin or hosting the show,
-            // the show is not recorded or rebroadcasted
+            // the show is not recorded
-            if ($now < $start && ($isAdminOrPM || $isHostOfShow) &&
+            if ($now < $end && ($isAdminOrPM || $isHostOfShow) &&
-            !$this->ccShowInstance->isRecorded() && !$this->ccShowInstance->isRebroadcast()) {
+            !$this->ccShowInstance->isRecorded() ) {
 
                 $menu["schedule"] = array(
                         "name"=> _("Add / Remove Content"),

airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po

@@ -8,10 +8,9 @@ msgstr ""
 "Project-Id-Version: Airtime 2.4\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-05-30 11:13-0400\n"
-"PO-Revision-Date: 2013-05-30 13:22-0500\n"
+"PO-Revision-Date: 2013-05-31 09:27-0500\n"
 "Last-Translator: Denise Rigato <denise.rigato@sourcefabric.org>\n"
 "Language-Team: German Localization <contact@sourcefabric.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1547,7 +1546,7 @@ msgstr "'Länge' sollte im 00:00:00-Format sein"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:513
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:526
 msgid "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)"
-msgstr ""
+msgstr "Der Wert muß im Timestamp-Format eingegeben werden (zB. 0000-00-00 oder 0000-00-00 00:00:00)"
 
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:540
 msgid "The value has to be numeric"
@@ -2200,7 +2199,7 @@ msgstr "Zu diesem Pfad besteht momentan kein Zugang."
 #: airtime_mvc/application/controllers/LocaleController.php:170
 #, php-format
 msgid "Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided."
-msgstr ""
+msgstr "Manche Stream-Typen erfordern zusätzliche Konfiguration.Details zum Aktivieren von %sAAC+ Support%s oder %sOpus Support%s sind bereitgestellt."
 
 #: airtime_mvc/application/controllers/LocaleController.php:171
 msgid "Connected to the streaming server"
@@ -2274,7 +2273,7 @@ msgstr "Warnung: Sendungen können nicht neu verknüpft werden"
 
 #: airtime_mvc/application/controllers/LocaleController.php:196
 msgid "By linking your repeating shows any media items scheduled in any repeat show will also get scheduled in the other repeat shows"
-msgstr ""
+msgstr "Beim Verknüpfen von Sendungswiederholungen werden jegliche Medien, die in einer wiederholten Sendung geplant sind, auch in den anderen Sendungen geplant."
 
 #: airtime_mvc/application/controllers/LocaleController.php:200
 msgid "Show"
@@ -3646,8 +3645,12 @@ msgstr "Wählen Sie eine Option aus."
 msgid "No Records"
 msgstr "Keine Datensätze"
 
-#~ msgid "The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)"
+#~ msgid ""
-#~ msgstr "Der Wert sollte in Zeitstempel-Format vorliegen (z.B. 0000-00-00 oder 00-00-00 00:00:00)"
+#~ "The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 "
+#~ "00:00:00)"
+#~ msgstr ""
+#~ "Der Wert sollte in Zeitstempel-Format vorliegen (z.B. 0000-00-00 oder "
+#~ "00-00-00 00:00:00)"
 
 #, fuzzy
 #~ msgid "Playlist"