Fixed issue: Unable to add answer options/subquestions or to edit quotas

LimeSurvey · Jun 12, 2015 · 7e9dafc · 7e9dafc
1 parent 79f6f4e
commit 7e9dafc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/application/views/admin/survey/Question/answerOptions_view.php b/application/views/admin/survey/Question/answerOptions_view.php
@@ -200,7 +200,7 @@
         </div>
 
         <div id="dialog-confirm-replace" title="<?php eT('Replace label set?'); ?>" style='display:none;'>
-        <p><span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 20px 0;"></span><?php eT('You are about to replace a given label set with the current answer options. Continue?'); ?></p>
+        <p><span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 20px 0;"></span><span id='strReplaceMessage'></span></p>
         </div>
 
         <div id="dialog-duplicate" title="<?php eT('Duplicate label set name'); ?>" style='display:none;'>

diff --git a/application/views/admin/survey/Question/subQuestion_view.php b/application/views/admin/survey/Question/subQuestion_view.php
@@ -10,7 +10,7 @@
     var duplicatesubquestioncode='<?php eT('Error: You are trying to use duplicate subquestion codes.','js'); ?>';
     var strNoLabelSet='<?php eT('There are no label sets which match the survey default language','js'); ?>';
     var langs='<?php echo implode(';',$anslangs); ?>';
-    var otherisreserved='<?php eT("Error: 'other' is a reserved keyword.",'js'); ?>';
+    var otherisreserved='<?php ($aParentQuestion['other']=="Y") ? printf(gT("'%s' can not be used if question allow other.",'js'),'other') : ""; ?>';
     var sImageURL ='<?php echo Yii::app()->getConfig('adminimageurl'); ?>';
     var saveaslabletitle  = '<?php eT('Save as label set','js'); ?>';
     var lanameurl = '<?php echo Yii::app()->createUrl('/admin/labels/sa/getAllSets'); ?>';
@@ -221,7 +221,7 @@ class="highlight"
             </p>
         </div>
         <div id="dialog-confirm-replace" title="<?php eT('Replace label set?'); ?>" style='display:none;'>
-            <p><span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 20px 0;"></span><?php eT('You are about to replace a given label set with the labels of this subquestions. Continue?'); ?></p>
+            <p><span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 20px 0;"></span><span id='strReplaceMessage'></span></p>
         </div>
 
         <div id="dialog-duplicate" title="<?php eT('Duplicate label set name'); ?>" style='display:none;'>