Skip to content

Commit

Permalink
Fixed issue # 08756: missing translations on browse responses
Browse files Browse the repository at this point in the history
  • Loading branch information
Shnoulle committed Feb 24, 2014
1 parent f479a4c commit 5d6c80e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
18 changes: 9 additions & 9 deletions application/controllers/admin/responses.php
Expand Up @@ -107,12 +107,12 @@ public function view($iSurveyID, $iId, $sBrowseLang = '')
//add token to top of list if survey is not private
if ($aData['surveyinfo']['anonymized'] == "N" && tableExists('tokens_' . $iSurveyID) && Permission::model()->hasSurveyPermission($iSurveyID,'tokens','read'))
{
$fnames[] = array("token", "Token", $clang->gT("Token ID"), 0);
$fnames[] = array("firstname", "First name", $clang->gT("First name"), 0);
$fnames[] = array("lastname", "Last name", $clang->gT("Last name"), 0);
$fnames[] = array("email", "Email", $clang->gT("Email"), 0);
$fnames[] = array("token", $clang->gT("Token ID"), 'code'=>'token');
$fnames[] = array("firstname", $clang->gT("First name"), 'code'=>'firstname');// or token:firstname ?
$fnames[] = array("lastname", $clang->gT("Last name"), 'code'=>'lastname');
$fnames[] = array("email", $clang->gT("Email"), 'code'=>'email');
}
$fnames[] = array("submitdate", $clang->gT("Submission date"), $clang->gT("Completed"), "0", 'D');
$fnames[] = array("submitdate", $clang->gT("Submission date"), $clang->gT("Completed"), "0", 'D','code'=>'submitdate');
$fnames[] = array("completed", $clang->gT("Completed"), "0");

foreach ($fieldmap as $field)
Expand Down Expand Up @@ -440,10 +440,10 @@ function browse($iSurveyID)
{
if(Permission::model()->hasSurveyPermission($iSurveyID,'tokens','read'))
{
$fnames[] = array("token", "Token", $clang->gT("Token ID"), 0);
$fnames[] = array("firstname", "First name", $clang->gT("First name"), 0);
$fnames[] = array("lastname", "Last name", $clang->gT("Last name"), 0);
$fnames[] = array("email", "Email", $clang->gT("Email"), 0);
$fnames[] = array("token", $clang->gT("Token ID"), 'code'=>'token');
$fnames[] = array("firstname", $clang->gT("First name"), 'code'=>'firstname');// or token:firstname ?
$fnames[] = array("lastname", $clang->gT("Last name"), 'code'=>'lastname');
$fnames[] = array("email", $clang->gT("Email"), 'code'=>'email');
}
}

Expand Down
3 changes: 3 additions & 0 deletions styles/adminstyle.css
Expand Up @@ -171,6 +171,9 @@ div.ui-jqgrid-hbox input, div.ui-jqgrid-hbox input{
height: 3em;
overflow: hidden;
}
.browsetable td span {
min-width:10em;/* This is OK for date time */
}
.ui-tooltip.tooltip-text{min-width:15em}
.templateeditor {
float:left;
Expand Down

0 comments on commit 5d6c80e

Please sign in to comment.