Fixed issue #10382: Some buttons in ComfortUpdate not properly labele…

…d when using French translation
LimeSurvey · Feb 12, 2016 · 88bbb36 · 88bbb36
1 parent 25dcd4c
commit 88bbb36
Show file tree

Hide file tree

Showing 20 changed files with 30 additions and 30 deletions.
diff --git a/application/controllers/InstallerController.php b/application/controllers/InstallerController.php
@@ -383,7 +383,7 @@ private function stepDatabaseConfiguration()
 
                         $aValues['next'] =  array(
                             'action' => 'installer/populatedb',
-                            'label' => gT("Populate database"),
+                            'label' => gT("Populate database",'unescaped'),
                             'name' => 'createdbstep2',
                         );
                     }

diff --git a/application/controllers/admin/conditionsaction.php b/application/controllers/admin/conditionsaction.php
@@ -147,7 +147,7 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
         if (!isset($iSurveyID) || !$iSurveyID)
         {
             $conditionsoutput = gT("You have not selected a survey").str_repeat($br, 2);
-            $conditionsoutput .= CHtml::submitButton(gT("Main admin screen"), array(
+            $conditionsoutput .= CHtml::submitButton(gT("Main admin screen",'unescaped'), array(
             'onclick' => "window.open('".$this->getController()->createUrl("admin/")."', '_top')"
             )).$br;
             safeDie($conditionsoutput);
@@ -167,10 +167,10 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
 
             if (!isset($_GET['ok']))
             {
-                $button_yes = CHtml::submitButton(gT("Yes"), array(
+                $button_yes = CHtml::submitButton(gT("Yes",'unescaped'), array(
                 'onclick' => "window.open('".$this->getController()->createUrl("admin/conditions/sa/index/subaction/resetsurveylogic/surveyid/$iSurveyID")."?ok=Y"."', '_top')"
                 ));
-                $button_cancel = CHtml::submitButton(gT("Cancel"), array(
+                $button_cancel = CHtml::submitButton(gT("Cancel",'unescaped'), array(
                 'onclick' => "window.open('".$this->getController()->createUrl("admin/survey/sa/view/surveyid/$iSurveyID")."', '_top')"
                 ));
 
@@ -201,7 +201,7 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
         if ( !isset($qid) || !$qid )
         {
             $conditionsoutput = gT("You have not selected a question").str_repeat($br, 2);
-            $conditionsoutput .= CHtml::submitButton(gT("Main admin screen"), array(
+            $conditionsoutput .= CHtml::submitButton(gT("Main admin screen",'unescaped'), array(
             'onclick' => "window.open('".$this->getController()->createUrl("admin/")."', '_top')"
             )).$br;
             safeDie($conditionsoutput);

diff --git a/application/views/admin/export/vv_view.php b/application/views/admin/export/vv_view.php
@@ -2,7 +2,7 @@
     <h3><?php eT("Export a VV survey file");?></h3>
         <div class="row">
             <div class="col-lg-12 content-right">
-                
+
 
 <?php echo CHtml::form(array("admin/export/sa/vvexport/surveyid/{$surveyid}"), 'post', array('id'=>'vvexport'));?>
 
@@ -14,7 +14,7 @@
         <li>
             <label for='completionstate'><?php eT("Export");?>:</label>
             <?php  echo CHtml::dropDownList('completionstate', $selectincansstate, array(
-                    'complete' => gT("Completed responses only"), 
+                    'complete' => gT("Completed responses only"),
                     'all' => gT("All responses"),
                     'incomplete' => gT("Incomplete responses only"),
                     ), array('class'=>'form-control')); ?>
@@ -26,13 +26,13 @@
         <li>
             <label for='vvversion' title='<?php eT("If you want to import survey on old installation or if your survey have problem: use old version (automatically selected if some code are duplicated).");?>'><?php eT("VV export version");?>: </label>
             <?php  echo CHtml::dropDownList('vvversion', $vvversionseleted, array(
-                '2' => gT("Last VV version"), 
+                '2' => gT("Last VV version"),
                 '1' => gT("Old VV version"),
                 ), array('class'=>'form-control'));; ?>
         <li>
     </ul>
     <p>
-        <?php echo CHtml::submitButton(gT('Export results'), array('class'=>'btn btn-default hidden')); ?>
+        <?php echo CHtml::submitButton(gT('Export results','unescaped'), array('class'=>'btn btn-default hidden')); ?>
         <?php echo CHtml::hiddenField('subaction','export'); ?>
     </p>
 <form>

diff --git a/application/views/admin/survey/Question/listquestions.php b/application/views/admin/survey/Question/listquestions.php
@@ -43,7 +43,7 @@
                                     </select>
                             </div>
 
-                            <?php echo CHtml::submitButton(gT('Search'), array('class'=>'btn btn-success')); ?>
+                            <?php echo CHtml::submitButton(gT('Search','unescaped'), array('class'=>'btn btn-success')); ?>
                             <a href="<?php echo Yii::app()->createUrl('admin/survey/sa/listquestions/surveyid/'.$surveyid);?>" class="btn btn-warning"><?php eT('Reset');?></a>
 
                         <?php $this->endWidget(); ?>
@@ -63,7 +63,7 @@
                         'id' => 'question-grid',
                         'type'=>'striped',
 
-                        
+
                         'summaryText'=>gT('Displaying {start}-{end} of {count} result(s).') .' '.sprintf(gT('%s rows per page'),
                             CHtml::dropDownList(
                                 'pageSize',

diff --git a/application/views/admin/survey/QuestionGroups/listquestiongroups.php b/application/views/admin/survey/QuestionGroups/listquestiongroups.php
@@ -30,7 +30,7 @@
                                 <?php echo $form->textField($model, 'group_name', array('class'=>'form-control')); ?>
                             </div>
                             <div class="col-sm-2">
-                                <?php echo CHtml::submitButton(gT('Search'), array('class'=>'btn btn-success')); ?>
+                                <?php echo CHtml::submitButton(gT('Search','unescaped'), array('class'=>'btn btn-success')); ?>
                                 <a href="<?php echo Yii::app()->createUrl('admin/survey/sa/listquestiongroups/surveyid/'.$surveyid);?>" class="btn btn-warning"><?php eT('Reset');?></a>
                             </div>
                         </div>

diff --git a/application/views/admin/survey/listSurveys_view.php b/application/views/admin/survey/listSurveys_view.php
@@ -38,7 +38,7 @@
                                 <option value="N" <?php if( $model->active=="N"){echo "selected";}?>><?php eT('No');?></option>
                             </select>
                     </div>
-                            <?php echo CHtml::submitButton(gT('Search'), array('class'=>'btn btn-success')); ?>
+                            <?php echo CHtml::submitButton(gT('Search','unescaped'), array('class'=>'btn btn-success')); ?>
                             <a href="<?php echo Yii::app()->createUrl('admin/survey/sa/listsurveys');?>" class="btn btn-warning"><?php eT('Reset');?></a>
 
                 <?php $this->endWidget(); ?>

diff --git a/application/views/admin/templates/templateeditor_register_view.php b/application/views/admin/templates/templateeditor_register_view.php
@@ -12,5 +12,5 @@
     <?php echo CHtml::textField('register_email', '', array('id'=>'register_email','class'=>'form-control')); ?>
 </div>
 <div class='form-group'>
-    <?php echo CHtml::submitButton(gT("Continue"),array('class'=>'btn-default btn','id'=>'register','name'=>'register')); ?>
+    <?php echo CHtml::submitButton(gT("Continue",'unescaped'),array('class'=>'btn-default btn','id'=>'register','name'=>'register')); ?>
 </div>
diff --git a/application/views/admin/token/invite.php b/application/views/admin/token/invite.php
@@ -102,7 +102,7 @@
                         </div>
 
                     <?php endif; ?>
-                    
+
                     <div class='form-group'>
 
                         <label class='control-label col-sm-2' for='bypassbademails'><?php eT("Bypass token with failing email addresses:"); ?></label>
@@ -121,7 +121,7 @@
                     <div class='form-group'>
                         <div class='col-sm-2'></div>
                         <div class='col-sm-1'>
-                            <?php echo CHtml::submitButton(gT("Send Invitations"), array('class'=>'btn btn-default')); ?>
+                            <?php echo CHtml::submitButton(gT("Send Invitations",'unescaped'), array('class'=>'btn btn-default')); ?>
                         </div>
 
                         <?php

diff --git a/application/views/admin/token/managetokenattributes.php b/application/views/admin/token/managetokenattributes.php
@@ -124,7 +124,7 @@
                 </div>
             </p>
             <p>
-                <?php echo CHtml::submitButton(gT('Add fields'), array('class'=>'btn btn-default')); ?>
+                <?php echo CHtml::submitButton(gT('Add fields','unescaped'), array('class'=>'btn btn-default')); ?>
                 <?php echo CHtml::hiddenField('action','tokens'); ?>
                 <?php echo CHtml::hiddenField('subaction','updatetokenattributes'); ?>
                 <?php echo CHtml::hiddenField('sid',$surveyid); ?>
@@ -139,7 +139,7 @@
                     </div>
                 </p>
                 <p>
-                    <?php echo CHtml::submitButton(gT('Delete attribute'), array('class'=>'btn btn-default')); ?>
+                    <?php echo CHtml::submitButton(gT('Delete attribute','unescaped'), array('class'=>'btn btn-default')); ?>
                     <?php echo CHtml::hiddenField('action','tokens'); ?>
                     <?php echo CHtml::hiddenField('subaction','deletetokenattributes'); ?>
                     <?php echo CHtml::hiddenField('sid',$surveyid); ?>

diff --git a/application/views/admin/token/remind.php b/application/views/admin/token/remind.php
@@ -136,7 +136,7 @@
                     <div class='form-group'>
                         <div class='col-sm-2'></div>
                         <div class='col-sm-1'>
-                            <?php echo CHtml::submitButton(gT("Send Reminders"), array('class'=>'btn btn-default')); ?>
+                            <?php echo CHtml::submitButton(gT("Send Reminders",'unescaped'), array('class'=>'btn btn-default')); ?>
                         </div>
 
                             <?php

diff --git a/application/views/admin/update/updater/steps/_backup.php b/application/views/admin/update/updater/steps/_backup.php
@@ -76,7 +76,7 @@
             <?php eT("Cancel"); ?>
         </a>
 
-        <?php echo CHtml::submitButton(sprintf(gT('Proceed to step %s'),'4'), array("class"=>"btn btn-default")); ?>
+        <?php echo CHtml::submitButton(gT('Continue','unescaped'), array("class"=>"btn btn-default")); ?>
     <?php echo CHtml::endForm(); ?>
 </div>
 

diff --git a/application/views/admin/update/updater/steps/_change_log.php b/application/views/admin/update/updater/steps/_change_log.php
@@ -68,7 +68,7 @@
 
 
     <?php
-        echo CHtml::submitButton(gT('Continue'), array('id'=>'step2launch', "class"=>"btn btn-default ajax_button launch_update"));
+        echo CHtml::submitButton(gT('Continue','unescaped'), array('id'=>'step2launch', "class"=>"btn btn-default ajax_button launch_update"));
         echo CHtml::endForm();
     ?>
 

diff --git a/application/views/admin/update/updater/steps/_check_local_errors.php b/application/views/admin/update/updater/steps/_check_local_errors.php
@@ -127,7 +127,7 @@
     <?php if($ignore  && ! $cant_ignore): ?>
 
         <?php
-            echo CHtml::submitButton(gT('Ignore'), array('id'=>'Ignorestep1launch', "class"=>"btn btn-default"));
+            echo CHtml::submitButton(gT('Ignore','unescaped'), array('id'=>'Ignorestep1launch', "class"=>"btn btn-default"));
         ?>
     <?php endif;?>
 </p>
@@ -150,7 +150,7 @@
         </a>
 
     <?php
-        echo CHtml::submitButton(gT('Continue'), array('id'=>'step1launch', "class"=>"btn btn-default"));
+        echo CHtml::submitButton(gT('Continue','unescaped'), array('id'=>'step1launch', "class"=>"btn btn-default"));
         echo CHtml::endForm();
     ?>
 </p>

diff --git a/application/views/admin/update/updater/steps/_fileSystem.php b/application/views/admin/update/updater/steps/_fileSystem.php
@@ -39,7 +39,7 @@
                     echo '<a class="btn btn-default" href="'.Yii::app()->createUrl("admin/update").'" role="button" aria-disabled="false">
                             '.gT("Cancel").'
                         </a>';
-                    echo CHtml::submitButton(gT('Check again'), array("class"=>"btn btn-default"));
+                    echo CHtml::submitButton(gT('Check again','unescaped'), array("class"=>"btn btn-default"));
                     echo CHtml::endForm();
                 ?>
             </p>

diff --git a/application/views/admin/update/updater/welcome/_updater_update.php b/application/views/admin/update/updater/welcome/_updater_update.php
@@ -25,7 +25,7 @@
     <a class="btn btn-default" href="<?php echo Yii::app()->createUrl("admin/update"); ?>" role="button" aria-disabled="false">
         <?php eT("Cancel"); ?>
     </a>
-    <?php echo CHtml::submitButton(gT("Continue"), array('class'=>"ajax_button btn btn-default",)); ?>
+    <?php echo CHtml::submitButton(gT("Continue",'unescaped'), array('class'=>"ajax_button btn btn-default",)); ?>
 <?php echo CHtml::endForm(); ?>
 
 <!-- this javascript code manage the step changing. It will catch the form submission, then load the ComfortUpdater for the required build -->

diff --git a/application/views/admin/user/personalsettings.php b/application/views/admin/user/personalsettings.php
@@ -97,7 +97,7 @@
         <!-- Buttons -->
         <p>
             <?php echo CHtml::hiddenField('action', 'savepersonalsettings'); ?>
-            <?php echo CHtml::submitButton(gT("Save settings"),array('class' => 'hidden')); ?>
+            <?php echo CHtml::submitButton(gT("Save settings",'unescaped'),array('class' => 'hidden')); ?>
         </p>
     <?php echo CHtml::endForm(); ?>
 </div>
diff --git a/application/views/installer/dbconfig_view.php b/application/views/installer/dbconfig_view.php
@@ -62,7 +62,7 @@
             <div class="col-md-4" style="text-align: center;">
             </div>
             <div class="col-md-4" style="text-align: right;">
-                <?php echo CHtml::submitButton(gT("Next"), array('class' => 'btn btn-default')); ?>
+                <?php echo CHtml::submitButton(gT("Next",'unescaped'), array('class' => 'btn btn-default')); ?>
             </div>
         </div>
         <?php echo CHtml::endForm(); ?>

diff --git a/application/views/installer/dbsettings_view.php b/application/views/installer/dbsettings_view.php
@@ -19,7 +19,7 @@
                         if (isset($next))
                         {
                             echo CHtml::form(array($next['action']), 'post');
-                            echo CHtml::submitButton(gT($next['label']), array(
+                            echo CHtml::submitButton($next['label'], array(
                                 'name' => $next['name'],
                                 'class' => 'btn btn-default'
                             ));

diff --git a/application/views/installer/optconfig_view.php b/application/views/installer/optconfig_view.php
@@ -79,7 +79,7 @@
             </div>
             <div class="col-md-4"></div>
             <div class="col-md-4">
-                <?php echo CHtml::submitButton(gT("Next"), array('class' => 'btn btn-default')); ?>
+                <?php echo CHtml::submitButton(gT("Next",'unescaped'), array('class' => 'btn btn-default')); ?>
             </div>
         </div>
 

diff --git a/application/views/register/registerForm.php b/application/views/register/registerForm.php
@@ -26,6 +26,6 @@
     </div>
     <?php } ?>
     <div class='form-group'>
-        <?php echo CHtml::submitButton(gT("Continue"),array('class'=>'btn-default btn','id'=>'register','name'=>'register')); ?>
+        <?php echo CHtml::submitButton(gT("Continue",'unescaped'),array('class'=>'btn-default btn','id'=>'register','name'=>'register')); ?>
     </div>
 <?php echo CHtml::endForm(); ?>