Skip to content

Commit

Permalink
Dev Some text fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@c-schmitz
c-schmitz committed Jun 7, 2018
1 parent f4ba148 commit 5642c67
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 23 deletions.
4 changes: 2 additions & 2 deletions application/helpers/SurveyRuntimeHelper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -936,11 +936,11 @@ private function displayFirstPageIfNeeded()
if ($this->sSurveyMode == 'survey' || $bDisplayFirstPage) {
//Failsave to have a general standard value
if (empty($this->aSurveyInfo['datasecurity_notice_label'])) {
$this->aSurveyInfo['datasecurity_notice_label'] = gT("To continue please first accept our survey policy.");
$this->aSurveyInfo['datasecurity_notice_label'] = gT("To continue please first accept our survey data policy.");
}

if (empty($this->aSurveyInfo['datasecurity_error'])) {
$this->aSurveyInfo['datasecurity_error'] = gT("You will have to accept our survey policy!");
$this->aSurveyInfo['datasecurity_error'] = gT("We are sorry but you can't proceed without first agreeing to our survey data policy.");
}
$this->aSurveyInfo['datasecurity_notice_label'] = Survey::replacePolicyLink($this->aSurveyInfo['datasecurity_notice_label'],$this->aSurveyInfo['sid']);
}
Expand Down
2 changes: 1 addition & 1 deletion application/helpers/admin/activate_helper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ function checkHasGroup($postsid)
$groupresult = Yii::app()->db->createCommand($groupquery)->query()->readAll();

if (count($groupresult) == 0) {
return gT("This survey does not contain any group(s).");
return gT("This survey does not contain any question groups.");
} else {
return false;
}
Expand Down
8 changes: 4 additions & 4 deletions application/helpers/expressions/em_manager_helper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8846,7 +8846,7 @@ public static function ProcessCurrentResponses()
if($value == $newDateTime->format($aDateFormatData['phpdate'])) { // control if inverse function original value
$value = $newValue;
} else {
$LEM->invalidAnswerString[$sq]=sprintf(gT("Date %s is invalid, review your answer"),htmlspecialchars($value));
$LEM->invalidAnswerString[$sq]=sprintf(gT("Date %s is invalid, please review your answer."),htmlspecialchars($value));
$value = null;
}
}
Expand Down Expand Up @@ -9438,21 +9438,21 @@ static public function ShowSurveyLogicFile($sid, $gid=NULL, $qid=NULL,$LEMdebugL
$LEM->ProcessString($aSurveyInfo['surveyls_policy_notice'],0);
$sPrint= viewHelper::purified(viewHelper::filterScript($LEM->GetLastPrettyPrintExpression()));
$errClass = ($LEM->em->HasErrors() ? 'danger' : '');
$out .= "<tr class='LEMgroup $errClass'><td >" . $LEM->gT("Survey policy notice:") . "</td><td colspan=\"3\">" . $sPrint . "</td></tr>";
$out .= "<tr class='LEMgroup $errClass'><td >" . $LEM->gT("Survey data policy notice:") . "</td><td colspan=\"3\">" . $sPrint . "</td></tr>";
}
if ($aSurveyInfo['surveyls_policy_error'] != '')
{
$LEM->ProcessString($aSurveyInfo['surveyls_policy_error'],0);
$sPrint= viewHelper::purified(viewHelper::filterScript($LEM->GetLastPrettyPrintExpression()));
$errClass = ($LEM->em->HasErrors() ? 'danger' : '');
$out .= "<tr class='LEMgroup $errClass'><td >" . $LEM->gT("Survey policy error:") . "</td><td colspan=\"3\">" . $sPrint . "</td></tr>";
$out .= "<tr class='LEMgroup $errClass'><td >" . $LEM->gT("Survey data policy error:") . "</td><td colspan=\"3\">" . $sPrint . "</td></tr>";
}
if ($aSurveyInfo['surveyls_policy_notice_label'] != '')
{
$LEM->ProcessString($aSurveyInfo['surveyls_policy_notice_label'],0);
$sPrint= viewHelper::purified(viewHelper::filterScript($LEM->GetLastPrettyPrintExpression()));
$errClass = ($LEM->em->HasErrors() ? 'danger' : '');
$out .= "<tr class='LEMgroup $errClass'><td >" . $LEM->gT("Survey policy label:") . "</td><td colspan=\"3\">" . $sPrint . "</td></tr>";
$out .= "<tr class='LEMgroup $errClass'><td >" . $LEM->gT("Survey data policy label:") . "</td><td colspan=\"3\">" . $sPrint . "</td></tr>";
}
}

Expand Down
2 changes: 1 addition & 1 deletion application/helpers/replacements_helper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ function getStandardsReplacementFields($thissurvey)
$_assessment_current_total = '';
if (!empty($thissurvey['assessments']) && $thissurvey['assessments']=="Y") {
$assessmentdata = doAssessment($surveyid, true);
$_assessment_current_total = (!empty($assessmentdata['datas']['total_score']))?$assessmentdata['datas']['total_score']:gT("unkown");
$_assessment_current_total = (!empty($assessmentdata['datas']['total_score']))?$assessmentdata['datas']['total_score']:gT("Unkown");

This comment has been minimized.

Sign in to view

Copy link
@Shnoulle

Shnoulle Jun 7, 2018 •
edited

Collaborator

Unkown ?? ;)
}


Expand Down
20 changes: 10 additions & 10 deletions application/views/admin/survey/editLocalSettings_view.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,35 +137,35 @@
</div>
<div class="row">
<div class="col-sm-12 col-lg-6">
<!-- Survey policy checkbox label -->
<!-- Survey data policy checkbox label -->
<div class="form-group">
<label class="control-label"><?php eT("Survey policy checkbox label:"); ?>
<i class="fa fa-question-circle" id="dataseclabel_popover_<?=$aSurveyLanguageSettings['surveyls_language']?>" data-toggle="popover" title="<?=gT('How to link to the survey policy statement modal window')?>" data-content="<?php
eT("If you want to specify a link to the survey policy please use the placeholders {STARTPOLICYLINK} and {ENDPOLICYLINK} to define the link that opens the popup. If there is no placeholder given, there will be an appendix.")
<label class="control-label"><?php eT("Survey data policy checkbox label:"); ?>
<i class="fa fa-question-circle" id="dataseclabel_popover_<?=$aSurveyLanguageSettings['surveyls_language']?>" data-toggle="popover" title="<?=gT('How to link to the survey data policy statement modal window')?>" data-content="<?php
eT("If you want to specify a link to the survey data policy please use the placeholders {STARTPOLICYLINK} and {ENDPOLICYLINK} to define the link that opens the popup. If there is no placeholder given, there will be an appendix.")
?>"></i> </label>
<div class="">
<?php echo CHtml::textField("dataseclabel_{$aSurveyLanguageSettings['surveyls_language']}",$aSurveyLanguageSettings['surveyls_policy_notice_label'],array('class'=>'form-control','size'=>"80",'id'=>"dataseclabel_{$aSurveyLanguageSettings['surveyls_language']}")); ?>
</div>
</div>
<!-- Survey policy message -->
<!-- Survey data policy message -->
<div class="form-group">
<label class=" control-label" for='datasec_<?php echo $aSurveyLanguageSettings['surveyls_language']; ?>'><?php eT("Survey policy message:"); ?></label>
<label class=" control-label" for='datasec_<?php echo $aSurveyLanguageSettings['surveyls_language']; ?>'><?php eT("Survey data policy message:"); ?></label>
<div class="">
<div class="htmleditor input-group">
<?php echo CHtml::textArea("datasec_{$aSurveyLanguageSettings['surveyls_language']}",$aSurveyLanguageSettings['surveyls_policy_notice'],array('class'=>'form-control','cols'=>'80','rows'=>'20','id'=>"datasec_{$aSurveyLanguageSettings['surveyls_language']}")); ?>
<?php echo getEditor("survey-datasec","datasec_".$aSurveyLanguageSettings['surveyls_language'], "[".gT("Survey policy:", "js")."](".$aSurveyLanguageSettings['surveyls_language'].")",$surveyid,'','',$action); ?>
<?php echo getEditor("survey-datasec","datasec_".$aSurveyLanguageSettings['surveyls_language'], "[".gT("Survey data policy:", "js")."](".$aSurveyLanguageSettings['surveyls_language'].")",$surveyid,'','',$action); ?>
</div>
</div>
</div>
</div>
<div class="col-sm-12 col-lg-6">
<!-- Survey policy error message -->
<!-- Survey data policy error message -->
<div class="form-group">
<label class=" control-label" for='datasecerror_<?php echo $aSurveyLanguageSettings['surveyls_language']; ?>'><?php eT("Survey policy error message:"); ?></label>
<label class=" control-label" for='datasecerror_<?php echo $aSurveyLanguageSettings['surveyls_language']; ?>'><?php eT("Survey data policy error message:"); ?></label>
<div class="">
<div class="htmleditor input-group">
<?php echo CHtml::textArea("datasecerror_{$aSurveyLanguageSettings['surveyls_language']}",$aSurveyLanguageSettings['surveyls_policy_error'],array('class'=>'form-control','cols'=>'80','rows'=>'15','id'=>"datasecerror_{$aSurveyLanguageSettings['surveyls_language']}")); ?>
<?php echo getEditor("survey-datasec-error","datasecerror_".$aSurveyLanguageSettings['surveyls_language'], "[".gT("Survey policy error:", "js")."](".$aSurveyLanguageSettings['surveyls_language'].")",$surveyid,'','',$action); ?>
<?php echo getEditor("survey-datasec-error","datasecerror_".$aSurveyLanguageSettings['surveyls_language'], "[".gT("Survey data policy error:", "js")."](".$aSurveyLanguageSettings['surveyls_language'].")",$surveyid,'','',$action); ?>
</div>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions application/views/admin/survey/surveySummary_view.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
<li class="list-group-item">
<div class="ls-flex-row col-12">
<div class="col-4">
<?php eT("Survey policy notice error:");?>
<?php eT("Survey data policy notice error:");?>
</div>
<div class="col-8">
<?php
Expand All @@ -210,11 +210,11 @@
</div>
</div>
</li>
<!-- Survey policy notice label -->
<!-- Survey data policy notice label -->
<li class="list-group-item">
<div class="ls-flex-row col-12">
<div class="col-4">
<?php eT("Survey policy notice label:");?>
<?php eT("Survey data policy notice label:");?>
</div>
<div class="col-8">
<?php
Expand Down
2 changes: 1 addition & 1 deletion themes/survey/vanilla/views/subviews/messages/warnings.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</div>
{% endif %}

{# Survey policy not accepted warning #}
{# Survey data policy not accepted warning #}
{% if aSurveyInfo.datasecuritynotaccepted == true %}
<!-- Preview mode warning -->
<div class="{{ aSurveyInfo.class.activealert }} alert alert-danger alert-dismissible fade in alert-dismissible" {{ aSurveyInfo.attr.activealert }} >
Expand Down
2 changes: 1 addition & 1 deletion themes/survey/vanilla/views/subviews/privacy/privacy_modal.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fa fa-close"></i></button>
<h4 class="modal-title">{{gT('Survey policy')}}</h4>
<h4 class="modal-title">{{gT('Survey data policy')}}</h4>
</div>
<div class="modal-body {{ aSurveyInfo.class.privacydatasecmodalbody }}">
{{ aSurveyInfo.datasecurity_notice }}
Expand Down

0 comments on commit 5642c67

Please sign in to comment.