Dev Updated texts

LimeSurvey · Sep 25, 2017 · b1864a3 · b1864a3
1 parent 012c942
commit b1864a3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/application/controllers/admin/responses.php b/application/controllers/admin/responses.php
@@ -691,7 +691,7 @@ function ($id) {
                         $allErrors = array_merge($allErrors, $errors);
                     }
                 } else {
-                    $allErrors[] = sprintf(gT('Found no response with id %d'), $responseId);
+                    $allErrors[] = sprintf(gT('Found no response with ID %d'), $responseId);
                 }
             }
 
@@ -701,7 +701,7 @@ function ($id) {
                 );
             } else {
                 // All is OK.
-                ls\ajax\AjaxHelper::outputSuccess(sprintf(gT('%d file(s) deleted.'), $allSuccess));
+                ls\ajax\AjaxHelper::outputSuccess(sprintf(ngT('%d file deleted.|%d files deleted.',$allSuccess), $allSuccess));
             }
         } else {
             // No permission.

diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -489,7 +489,7 @@ public function editMultiple()
 
             }else{
                 $aResults['global']['result']  = false;
-                $aResults['global']['message'] = gT('No token table found for that survey!');
+                $aResults['global']['message'] = gT('No participant table found for this survey!');
             }
         }else{
             $aResults['global']['result'] = false;

diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php
@@ -2574,7 +2574,7 @@ protected function displayResults($outputs, $results, $rt, $outputType, $surveyi
                 $row=Yii::app()->db->createCommand($query)->queryScalar();
             } catch (Exception $ex) {
                 $row = 0;
-                Yii::app()->setFlashMessage(gT('Faulty query: ') . $query, 'error');
+                Yii::app()->setFlashMessage('Faulty query: ' . htmlspecialchars($query), 'error');
             }
 
             //store temporarily value of answer count of question type '5' and 'A'.

diff --git a/application/views/admin/global_settings/_storage_ajax.php b/application/views/admin/global_settings/_storage_ajax.php
@@ -11,21 +11,21 @@
 <table class='table table-striped table-bordered'>
     <tfoot>
         <tr>
-            <td style='width: 70%;'><?php eT('Total storage:'); ?></td>
+            <td style='width: 70%;'><?php eT('Total storage'); ?></td>
             <td><?php echo $totalStorage; ?></td>
         </tr>
     </tfoot>
     <tbody>
         <tr>
-            <td><?php eT('Survey storage:'); ?></td>
+            <td><?php eT('Survey storage'); ?></td>
             <td><?php echo $surveySize; ?></td>
         </tr>
         <tr>
-            <td><?php eT('Template storage:'); ?></td>
+            <td><?php eT('Template storage'); ?></td>
             <td><?php echo $templateSize; ?></td>
         </tr>
         <tr>
-            <td><?php eT('Label set storage:'); ?></td>
+            <td><?php eT('Label set storage'); ?></td>
             <td><?php echo $labelSize; ?></td>
         </tr>
     </tbody>

diff --git a/application/views/admin/token/massive_actions/_selector.php b/application/views/admin/token/massive_actions/_selector.php
@@ -23,7 +23,7 @@
                     'action'      => 'edit',
                     'url'         => App()->createUrl('/admin/tokens/sa/editMultiple/'),
                     'iconClasses' => 'fa fa-pencil text-success',
-                    'text'        => gT('Batch edit tokens'),
+                    'text'        => gT('Batch-edit participants'),
                     'grid-reload' => 'yes',
 
                     // modal
@@ -32,7 +32,7 @@
                     'yes'           => gT('Apply'),
                     'no'            => gT('Cancel'),
                     'keepopen'      => 'yes',
-                    'sModalTitle'   => gT('Batch edit tokens'),
+                    'sModalTitle'   => gT('Batch-edit participants'),
                     'htmlModalBody' => $this->renderPartial('./token/massive_actions/_update', array('dateformatdetails' => getDateFormatData(Yii::app()->session['dateformat'])), true),
                 ),