From 280c4a81ad19b3be9774758e791a4bfd4909fbef Mon Sep 17 00:00:00 2001 From: denise Date: Fri, 18 Jan 2013 17:04:39 -0500 Subject: [PATCH] CC-4859: I18N: "AND" and "OR" for Smartblock's criteria need to be translated. -fixed --- .../application/views/scripts/form/smart-block-criteria.phtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml index 92bb40fe1..8c2aa2b8d 100644 --- a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml +++ b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml @@ -36,8 +36,8 @@ ?> modRowMap[$i]; $j++) { // determine if logic label should be 'and' or 'or' - if ($this->modRowMap[$i] > 1 && $j != $this->modRowMap[$i]-1) $logicLabel = 'or'; - else $logicLabel = 'and'; + if ($this->modRowMap[$i] > 1 && $j != $this->modRowMap[$i]-1) $logicLabel = _('or'); + else $logicLabel = _('and'); $disabled = $this->element->getElement("sp_criteria_field_".$i."_".$j)->getAttrib('disabled') == 'disabled'?true:false; // determine if the next row is disabled and only display the logic label if it isn't