Dev Text changes for tokens

LimeSurvey · May 30, 2016 · a8e53f3 · a8e53f3
1 parent 467eb50
commit a8e53f3
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 37 deletions.
diff --git a/application/controllers/admin/dataentry.php b/application/controllers/admin/dataentry.php
@@ -1882,7 +1882,7 @@ public function insert()
                                 VALUES
                                 (".implode(',',$values).")";
                                 dbExecuteAssoc($SQL);
-                                $aDataentrymsgs[] = CHtml::tag('font', array('class'=>'successtitle'), gT("A token entry for the saved survey has been created too."));
+                                $aDataentrymsgs[] = CHtml::tag('font', array('class'=>'successtitle'), gT("A survey participant entry for the saved survey has been created too."));
                                 //$aDataentryoutput .= "<font class='successtitle'></font><br />\n";
                             }
                             if ($saver['email'])
@@ -2195,7 +2195,7 @@ public function view($surveyid, $lang=NULL)
                                     $answers[] = $ansrow;
                                 }
                             $cdata['answers']=$answers;
-                            App()->getClientScript()->registerPackage('jquery-actual');                            
+                            App()->getClientScript()->registerPackage('jquery-actual');
                             $this->registerScriptFile( 'SCRIPT_PATH', 'ranking.js');
                             $this->registerCssFile( 'PUBLIC', 'ranking.css' );
                             unset($answers);

diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -518,7 +518,7 @@ function getTokens_json($iSurveyId, $search = null)
             // Add delete icon
             if($bTokenDeletePermission){
                 $attribs = array('onclick' => 'if (confirm("' . gT("Are you sure you want to delete this entry?") . ' (' . $token['tid'] . ')")) {$("#displaytokens").delRowData(' . $token['tid'] . ');$.post(delUrl,{tid:' . $token['tid'] . '});}');
-                $action .= viewHelper::getIconLink('inputbuttons-square glyphicon glyphicon-trash text-warning', null, gT("Delete token entry"), null, 'imagelink btnDelete', $attribs);
+                $action .= viewHelper::getIconLink('inputbuttons-square glyphicon glyphicon-trash text-warning', null, gT("Delete survey participant"), null, 'imagelink btnDelete', $attribs);
             }
 
             // Add email button
@@ -538,7 +538,7 @@ function getTokens_json($iSurveyId, $search = null)
 
             // Add edit button
             if($bTokenUpdatePermission) {
-                $action .= viewHelper::getIconLink('inputbuttons-square glyphicon glyphicon-pencil text-success', null, gT("Edit token entry"), null, 'imagelink token_edit');
+                $action .= viewHelper::getIconLink('inputbuttons-square glyphicon glyphicon-pencil text-success', null, gT("Edit survey participant"), null, 'imagelink token_edit');
             }
 
             // Add view button?
@@ -910,7 +910,7 @@ function edit($iSurveyId, $iTokenId)
                 $aData['sidemenu']['state'] = false;
                 $this->_renderWrappedTemplate('token', array( 'message' => array(
                 'title' => gT("Success"),
-                'message' => gT("The token entry was successfully updated.") . "<br /><br />\n"
+                'message' => gT("The survey participant was successfully updated.") . "<br /><br />\n"
                 . "\t\t<input class='btn btn-default btn-lg' type='button' class='btn btn-large btn-default' value='" . gT("Browse participants") . "' onclick=\"window.open('" . $this->getController()->createUrl("admin/tokens/sa/browse/surveyid/$iSurveyId/") . "', '_top')\" />\n"
                 )), $aData);
             }
@@ -1091,7 +1091,7 @@ function addDummies($iSurveyId, $subaction = '')
             if(!$invalidtokencount)
             {
                 $aData['success'] = true;
-                Yii::app()->session['flashmessage'] = gT("New dummy tokens were added.");
+                Yii::app()->session['flashmessage'] = gT("New dummy participants were added.");
                 //admin/tokens/sa/browse/surveyid/652779//
                 $this->getController()->redirect(array("/admin/tokens/sa/browse/surveyid/{$iSurveyId}"));
             }
@@ -1100,7 +1100,7 @@ function addDummies($iSurveyId, $subaction = '')
                 $aData['success'] = false;
                 $message= array(
                 'title' => gT("Failed"),
-                'message' => "<p>".sprintf(gT("Only %s new dummy tokens were added after %s trials."),$newDummyToken,$invalidtokencount)
+                'message' => "<p>".sprintf(gT("Only %s new dummy participants were added after %s trials."),$newDummyToken,$invalidtokencount)
                 .gT("Try with a bigger token length.")."</p>"
                 ."\n<input type='button' value='"
                 . gT("Browse participants") . "' onclick=\"window.open('" . $this->getController()->createUrl("admin/tokens/sa/browse/surveyid/$iSurveyId") . "', '_top')\" />\n"

diff --git a/application/views/admin/responses/browseindex_view.php b/application/views/admin/responses/browseindex_view.php
@@ -24,9 +24,9 @@
                     <tbody>
                         <tr><th><?php eT("Total invitations sent"); ?></th><td><?php echo $tokeninfo['sent']; ?></td></tr>
                         <tr><th><?php eT("Total surveys completed"); ?></th><td><?php echo $tokeninfo['completed']; ?></td></tr>
-                        <tr><th><?php eT("Total with no unique Token"); ?></th><td><?php echo $tokeninfo['invalid'] ?></td></tr>
+                        <tr><th><?php eT("Total with no unique token"); ?></th><td><?php echo $tokeninfo['invalid'] ?></td></tr>
                     </tbody>
-                    <tr><th><?php eT("Total records in this token table"); ?></th><td><?php echo $tokeninfo['count']; ?></td></tr>
+                    <tr><th><?php eT("Total records"); ?></th><td><?php echo $tokeninfo['count']; ?></td></tr>
                 </table>
             </div>
         </div>

diff --git a/application/views/admin/token/addtokenpost.php b/application/views/admin/token/addtokenpost.php
@@ -11,9 +11,9 @@
             <!-- Success -->
             <?php if ($success): ?>
                 <div class="jumbotron message-box">
-                    <h2>Add token entry</h2>
+                    <h2><?php eT("Adding survey participant entry..."); ?></h2>
                     <p class="lead text-success"><?php eT("Success"); ?></p>
-                    <p><?php eT("New token was added."); ?></p>
+                    <p><?php eT("New entry was added."); ?></p>
                     <p>
                         <input class="btn btn-large btn-default" type='button' value='<?php eT("Browse survey participants"); ?>' onclick="window.open('<?php echo $this->createUrl("admin/tokens/sa/browse/surveyid/$surveyid"); ?>', '_top')" /><br />
                         <input class="btn btn-large btn-default" type='button' value='<?php eT("Add another participant"); ?>' onclick="window.open('<?php echo $this->createUrl("admin/tokens/sa/addnew/surveyid/$surveyid"); ?>', '_top')" /><br />

diff --git a/application/views/admin/token/browse.php b/application/views/admin/token/browse.php
@@ -139,7 +139,7 @@ function checkMandatoryAttr(value, colname)  {
 </script>
 
 <div class='side-body <?php echo getSideBodyClass(false); ?>'>
-    <?php $this->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey, 'token'=>true, 'active'=>gT("Survey participants"))); ?>
+    <?php $this->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey, 'token'=>true, 'active'=>gT("Display"))); ?>
     <h3><?php eT("Survey participants",'js'); ?></h3>
 
     <!-- CGridView -->

diff --git a/application/views/admin/token/csvupload.php b/application/views/admin/token/csvupload.php
@@ -6,8 +6,8 @@
 ?>
 
 <div class='side-body <?php echo getSideBodyClass(false); ?>'>
-    <?php $this->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey, 'token'=>true, 'active'=>gT("Import tokens from CSV file"))); ?>
-    <h3><?php eT("Import tokens from CSV file"); ?></h3>
+    <?php $this->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey, 'token'=>true, 'active'=>gT("Import survey participants from CSV file"))); ?>
+    <h3><?php eT("Import survey participants from CSV file"); ?></h3>
 
     <div class="row">
         <div class="col-lg-12 content-right">

diff --git a/application/views/admin/token/dummytokenform.php b/application/views/admin/token/dummytokenform.php
@@ -5,8 +5,8 @@
 ?>
 
 <div class='side-body <?php echo getSideBodyClass(false); ?>'>
-    <?php $this->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey, 'token'=>true, 'active'=>gT("Create dummy tokens"))); ?>
-    <h3><?php eT("Create dummy tokens"); ?></h3>
+    <?php $this->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey, 'token'=>true, 'active'=>gT("Create dummy participants"))); ?>
+    <h3><?php eT("Create dummy participants"); ?></h3>
 
     <div class="row">
         <div class="col-lg-12 content-right">
@@ -22,7 +22,7 @@
 
                 <!-- Number of tokens  -->
                 <div class="form-group">
-                    <label  class="col-sm-2 control-label" for='amount'><?php eT("Number of tokens"); ?>:</label>
+                    <label  class="col-sm-2 control-label" for='amount'><?php eT("Number of participants:"); ?></label>
                     <div class="col-sm-2">
                         <input class='form-control' type='text' size='20' id='amount' name='amount' value="100" />
                     </div>
@@ -54,7 +54,7 @@
 
                 <!-- Email  -->
                 <div class="form-group">
-                    <label  class="col-sm-2 control-label" for='email'><?php eT("Email"); ?>:</label>
+                    <label  class="col-sm-2 control-label" for='email'><?php eT("Email address:"); ?></label>
                     <div class="col-sm-2">
                         <input class='form-control' type='email' maxlength='320' size='50' id='email' name='email' value="" />
                     </div>
@@ -151,7 +151,7 @@
 
                 <!-- Buttons  -->
                 <p>
-                    <input type='submit' class="hidden" value='<?php eT("Add dummy tokens"); ?>' />
+                    <input type='submit' class="hidden" value='1' />
                     <input type='hidden' name='sid' value='$surveyid' />
                 </p>
             </form>

diff --git a/application/views/admin/token/exportdialog.php b/application/views/admin/token/exportdialog.php
@@ -1,7 +1,7 @@
 <!-- Token export options -->
 <div class='side-body <?php echo getSideBodyClass(false); ?>'>
-    <?php $this->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey, 'token'=>true, 'active'=>gT("Token export options"))); ?>
-    <h3><?php eT("Token export options"); ?></h3>
+    <?php $this->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey, 'token'=>true, 'active'=>gT("Survey participant export options"))); ?>
+    <h3><?php eT("Survey participant export options"); ?></h3>
     <div class="row">
         <div class="col-lg-12 content-right">
             <?php echo CHtml::form(array("admin/tokens/sa/exportdialog/surveyid/$surveyid"), 'post',array('class'=>'form-core settingswidget form-horizontal','id'=>'bouncesettings','name'=>'frmeditquestion')); ?>
@@ -90,7 +90,7 @@
                     <!--Delete exported tokens -->
                     <div class="form-group control-group " data-name="tokendeleteexported">
                         <label class="default control-label col-lg-2 col-sm-5 col-md-2" for="tokendeleteexported">
-                            <?php eT('Delete exported tokens:'); ?>
+                            <?php eT('Delete exported participants:'); ?>
                         </label>
                         <div class="default col-lg-3 col-sm-5 col-md-7 controls">
                             <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
@@ -102,7 +102,7 @@
                             ?>
                         </div>
                         <div class="alert alert-warning col-lg-4 col-sm-2 col-md-3 controls" role="alert">
-                            <?php eT('Warning: Deleted token entries cannot be recovered.'); ?>
+                            <?php eT('Warning: Deleted participants entries cannot be recovered.'); ?>
                         </div>
                     </div>
                 </div>
@@ -121,7 +121,7 @@
         'settings' => $aSettings,
         'action'=>$sAction,
         'form' => true,
-        'title' => gT("Token export options"),
+        'title' => gT("Survey participant options"),
         'buttons' => $aButtons,
     ));*/
     ?>
diff --git a/application/views/admin/token/import.php b/application/views/admin/token/import.php
@@ -1,7 +1,7 @@
 <!-- Import.php -->
 <div class='side-body <?php echo getSideBodyClass(false); ?>'>
-    <?php $this->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey, 'token'=>true, 'active'=>gT("Import tokens from CSV file"))); ?>
-    <h3><?php eT("Import tokens from CSV file"); ?></h3>
+    <?php $this->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey, 'token'=>true, 'active'=>gT("Import survey participants from CSV file"))); ?>
+    <h3><?php eT("Import survey participants from CSV file"); ?></h3>
 
     <div class="row">
         <div class="col-lg-12 content-right">

diff --git a/application/views/admin/token/ldapform.php b/application/views/admin/token/ldapform.php
@@ -5,8 +5,8 @@
 ?>
 
 <div class='side-body <?php echo getSideBodyClass(false); ?>'>
-    <?php $this->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey, 'token'=>true, 'active'=>gT("Import tokens from LDAP"))); ?>
-    <h3><?php eT("Import tokens from LDAP"); ?></h3>
+    <?php $this->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey, 'token'=>true, 'active'=>gT("Import survey participants from LDAP"))); ?>
+    <h3><?php eT("Import survey participants from LDAP"); ?></h3>
 
     <div class="row">
         <div class="col-lg-12 content-right">

diff --git a/application/views/admin/token/managetokenattributes.php b/application/views/admin/token/managetokenattributes.php
@@ -6,8 +6,8 @@
 
 <div class='side-body <?php echo getSideBodyClass(false); ?>'>
     <?php if( count($tokenfieldlist)) : ?>
-        <?php $this->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey, 'token'=>true, 'active'=>gT("Manage token attribute fields"))); ?>
-        <h3><?php eT("Manage token attribute fields"); ?></h3>
+        <?php $this->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey, 'token'=>true, 'active'=>gT("Manage attribute fields"))); ?>
+        <h3><?php eT("Manage attribute fields"); ?></h3>
 
         <div class="row">
             <div class="col-lg-12 content-right">
@@ -125,11 +125,11 @@
         </div>
 
         <?php endif; ?>
-    <h3><?php eT("Add or delete token attributes"); ?></h3>
+    <h3><?php eT("Add/delete survey participant attributes"); ?></h3>
 
     <div class="row">
         <div class="col-lg-12 content-right">
-            <p><?php neT('There is {n} user attribute field in this token table.|There are {n} user attribute fields in this token table.', $nrofattributes); ?></p>
+            <p><?php neT('There is {n} user attribute field in this survey participant table.|There are {n} user attribute fields in this survey participant table.', $nrofattributes); ?></p>
             <?php echo CHtml::form(array("admin/tokens/sa/updatetokenattributes/surveyid/{$surveyid}"), 'post',array('id'=>'addattribute')); ?>
             <p>
                 <label for="addnumber"><?php eT('Number of attribute fields to add:'); ?></label>

diff --git a/application/views/admin/token/tokenform.php b/application/views/admin/token/tokenform.php
@@ -5,20 +5,20 @@
 ?>
 
 <div class='side-body <?php echo getSideBodyClass(false); ?>'>
-    <?php $this->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey, 'token'=>true, 'active'=>gT("Token entry"))); ?>
+    <?php $this->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey, 'token'=>true, 'active'=>gT("Survey participant entry"))); ?>
     <h3>
         <?php
         if ($subaction == "edit")
         {
-            eT("Edit token entry");
+            eT("Edit survey participant");
             foreach ($tokendata as $Key => $Value)
             {
                 $$Key = $Value;
             }
         }
         else
         {
-            eT("Add token entry");
+            eT("Add survey participant");
             $tokenid = "";
         }
         ?>

diff --git a/application/views/admin/token/tokensummary.php b/application/views/admin/token/tokensummary.php
@@ -7,15 +7,15 @@
             <table class="items table table-striped"  >
                 <tr>
                     <th>
-                        <?php eT("Total records in this token table"); ?>
+                        <?php eT("Total records"); ?>
                     </th>
                     <td>
                         <?php echo $queries['count']; ?>
                     </td>
                 </tr>
                 <tr>
                     <th>
-                        <?php eT("Total with no unique Token"); ?>
+                        <?php eT("Total with no unique token"); ?>
                     </th>
                     <td>
                         <?php echo $queries['invalid']; ?>