Merged fixes up to rev 10159 from stable

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_ci@10789 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Aug 19, 2011 · cd8445f · cd8445f
1 parent d7f00d6
commit cd8445f
Show file tree

Hide file tree

Showing 157 changed files with 294 additions and 29,249 deletions.
diff --git a/application/controllers/admin/conditions.php b/application/controllers/admin/conditions.php
@@ -892,8 +892,8 @@ function action($subaction, $surveyid=null, $gid=null, $qid=null)
 		                $shortanswer .= "[".$clang->gT("Single checkbox")."]";
 		                $shortquestion=$rows['title'].":$shortanswer ".strip_tags($rows['question']);
 		                $cquestions[]=array($shortquestion, $rows['qid'], $rows['type'], "+".$rows['sid'].$X.$rows['gid'].$X.$rows['qid'].$arows['title']);
-		                $canswers[]=array("+".$rows['sid'].$X.$rows['gid'].$X.$rows['qid'].$arows['title'], 'Y', 'checked');
-		                $canswers[]=array("+".$rows['sid'].$X.$rows['gid'].$X.$rows['qid'].$arows['title'], '', 'not checked');
+                        $canswers[]=array("+".$rows['sid'].$X.$rows['gid'].$X.$rows['qid'].$arows['title'], 'Y', $clang->gT("checked"));
+                        $canswers[]=array("+".$rows['sid'].$X.$rows['gid'].$X.$rows['qid'].$arows['title'], '', $clang->gT("not checked"));
 		            }
 		        }
 		        elseif($rows['type'] == "X") //Boilerplate question

diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -289,11 +289,13 @@ function getqtypelist($SelectedCode = "T", $ReturnType = "selector")
         foreach($newqType as $group=>$members)
         {
             $qtypeselecter .= '<optgroup label="'.$group.'">';
-            foreach($members as $TypeCode=>$TypeProperties){
+            foreach($members as $TypeCode=>$TypeProperties)
+            {
                 $qtypeselecter .= "<option value='$TypeCode'";
                 if ($SelectedCode == $TypeCode) {$qtypeselecter .= " selected='selected'";}
                 $qtypeselecter .= ">{$TypeProperties['description']}</option>\n";
             }
+            $qtypeselecter .= '</optgroup>';
         }
 
         return $qtypeselecter;