From 527b1eaf1dd70742f554aedc6da481043ea0b2f7 Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 30 May 2013 15:05:57 -0400 Subject: [PATCH 1/4] CC-5191: I18N: "items" is not translated when expanding dynamic Smartblock in playlist --- airtime_mvc/application/models/Block.php | 22 +++++++++++++++++--- airtime_mvc/public/js/airtime/library/spl.js | 2 +- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php index 97968efe1..51dc3514d 100644 --- a/airtime_mvc/application/models/Block.php +++ b/airtime_mvc/application/models/Block.php @@ -330,7 +330,7 @@ SQL; { list($value, $modifier) = $this->getLimitValueAndModifier(); if ($modifier == "items") { - $length = $value." ".$modifier; + $length = $value." "._("items"); } else { $hour = "00"; $mins = "00"; @@ -1354,6 +1354,16 @@ SQL; "year" => _("Year") ); + $modifierOptions = array( + "0" => _("Select modifier"), + "contains" => _("contains"), + "does not contain" => _("does not contain"), + "is" => _("is"), + "is not" => _("is not"), + "starts with" => _("starts with"), + "ends with" => _("ends with") + ); + // Load criteria from db $out = CcBlockcriteriaQuery::create()->orderByDbCriteria()->findByDbBlockId($this->id); $storedCrit = array(); @@ -1365,11 +1375,17 @@ SQL; $extra = $crit->getDbExtra(); if ($criteria == "limit") { - $storedCrit["limit"] = array("value"=>$value, "modifier"=>$modifier); + $storedCrit["limit"] = array("value"=>$value, "modifier"=>_($modifier)); } else if($criteria == "repeat_tracks") { $storedCrit["repeat_tracks"] = array("value"=>$value); } else { - $storedCrit["crit"][$criteria][] = array("criteria"=>$criteria, "value"=>$value, "modifier"=>$modifier, "extra"=>$extra, "display_name"=>$criteriaOptions[$criteria]); + $storedCrit["crit"][$criteria][] = array( + "criteria"=>$criteria, + "value"=>$value, + "modifier"=>$modifier, + "extra"=>$extra, + "display_name"=>$criteriaOptions[$criteria], + "display_modifier"=>$modifierOptions[$modifier]); } } diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index c10ea4c9a..52534c209 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -587,7 +587,7 @@ var AIRTIME = (function(AIRTIME){ var extra = (ele['extra']==null)?"":"- "+ele['extra']; $html += "
  • " + ""+ele['display_name']+"" + - ""+ele['modifier']+"" + + ""+ele['display_modifier']+"" + ""+ele['value']+"" + ""+extra+"" + "
    • "; From 1fa0ee49d6584f32ec03f86a007b464c2c226217 Mon Sep 17 00:00:00 2001 From: Naomi Date: Thu, 30 May 2013 15:36:55 -0400 Subject: [PATCH 2/4] CC-5190 : Playlist: Copy playlist will lost cue in/out setting --- .../controllers/LibraryController.php | 3 +- airtime_mvc/application/models/Playlist.php | 34 +++++++++++++------ 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index afa4baa7a..52660ec21 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -393,7 +393,8 @@ class LibraryController extends Zend_Controller_Action } $c[0] = $c['item_id']; } - $newPl->addAudioClips($contents, null, 'begining'); + + $newPl->addAudioClips($contents, null, 'before'); $newPl->setCreator(Application_Model_User::getCurrentUser()->getId()); $newPl->setDescription($originalPl->getDescription()); diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php index 660864af5..e01484d2f 100644 --- a/airtime_mvc/application/models/Playlist.php +++ b/airtime_mvc/application/models/Playlist.php @@ -411,26 +411,38 @@ SQL; || $obj instanceof CcWebstream || $obj instanceof CcBlock) { - $entry = $this->plItem; - $entry["id"] = $obj->getDbId(); - $entry["pos"] = $pos; + $entry = $this->plItem; + $entry["id"] = $obj->getDbId(); + $entry["pos"] = $pos; $entry["cliplength"] = $obj->getDbLength(); + if ($obj instanceof CcFiles && $obj) { - $entry["cuein"] = $obj->getDbCuein(); - $entry["cueout"] = $obj->getDbCueout(); + + $entry["cuein"] = isset($p_item['cuein']) ? + $p_item['cuein'] : $obj->getDbCuein(); + + $entry["cueout"] = isset($p_item['cueout']) ? + $p_item['cueout'] : $obj->getDbCueout(); - $cue_out = Application_Common_DateHelper::calculateLengthInSeconds($entry['cueout']); - $cue_in = Application_Common_DateHelper::calculateLengthInSeconds($entry['cuein']); - $entry["cliplength"] = Application_Common_DateHelper::secondsToPlaylistTime($cue_out-$cue_in); - } elseif ($obj instanceof CcWebstream && $obj) { + $cue_in = isset($p_item['cueInSec']) ? + $p_item['cueInSec'] : Application_Common_DateHelper::calculateLengthInSeconds($entry['cuein']); + + $cue_out = isset($p_item['cueOutSec']) ? + $p_item['cueOutSec'] : Application_Common_DateHelper::calculateLengthInSeconds($entry['cueout']); + + $entry["cliplength"] = isset($p_item['length']) ? + $p_item['length'] : Application_Common_DateHelper::secondsToPlaylistTime($cue_out-$cue_in); + } + elseif ($obj instanceof CcWebstream && $obj) { $entry["cuein"] = "00:00:00"; $entry["cueout"] = $entry["cliplength"]; } - $entry["ftype"] = $objType; + $entry["ftype"] = $objType; } return $entry; - } else { + } + else { throw new Exception("trying to add a object that does not exist."); } } From c1c90a4b9a56aaf8b7d084684af03067e8906217 Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 30 May 2013 15:43:31 -0400 Subject: [PATCH 3/4] Smart block fix --- airtime_mvc/application/models/Block.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php index 51dc3514d..29151b2e5 100644 --- a/airtime_mvc/application/models/Block.php +++ b/airtime_mvc/application/models/Block.php @@ -1361,7 +1361,12 @@ SQL; "is" => _("is"), "is not" => _("is not"), "starts with" => _("starts with"), - "ends with" => _("ends with") + "ends with" => _("ends with"), + "is" => _("is"), + "is not" => _("is not"), + "is greater than" => _("is greater than"), + "is less than" => _("is less than"), + "is in the range" => _("is in the range") ); // Load criteria from db From afda0c140bfc27475c1fffd154c1fef9e31a2a92 Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 30 May 2013 15:50:35 -0400 Subject: [PATCH 4/4] CC-5196: L10N: Smartblock only generate 1 file even multiple files are qualified, no matter which limitation is set. --- airtime_mvc/application/models/Block.php | 5 ++++- airtime_mvc/public/js/airtime/library/spl.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php index 29151b2e5..f63d1d861 100644 --- a/airtime_mvc/application/models/Block.php +++ b/airtime_mvc/application/models/Block.php @@ -1380,7 +1380,10 @@ SQL; $extra = $crit->getDbExtra(); if ($criteria == "limit") { - $storedCrit["limit"] = array("value"=>$value, "modifier"=>_($modifier)); + $storedCrit["limit"] = array( + "value"=>$value, + "modifier"=>$modifier, + "display_modifier"=>_($modifier)); } else if($criteria == "repeat_tracks") { $storedCrit["repeat_tracks"] = array("value"=>$value); } else { diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index 52534c209..afe05bd9c 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -593,7 +593,7 @@ var AIRTIME = (function(AIRTIME){ ""; }); } - $html += "

  • "+$.i18n._("Limit to: ")+data.limit.value+" "+data.limit.modifier+"
    • "; + $html += "

  • "+$.i18n._("Limit to: ")+data.limit.value+" "+data.limit.display_modifier+"
    • "; } $pl.find("#block_"+id+"_info").html($html).show(); mod.enableUI();