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