Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into cint
Browse files Browse the repository at this point in the history
  • Loading branch information
@olleharstedt
olleharstedt committed Aug 24, 2016
2 parents 939500d + d33659f commit aafa6d1
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 38 deletions.
16 changes: 8 additions & 8 deletions application/controllers/admin/printablesurvey.php
View file
Expand Up @@ -1495,12 +1495,12 @@ function index($surveyid, $lang = null)
}

$question['QUESTION_TYPE_HELP'] = self::_star_replace($question['QUESTION_TYPE_HELP']);
$group['QUESTIONS'] .= self::_populate_template( 'question' , $question);
$group['QUESTIONS'] .= self::_populate_template( $oTemplate, 'question' , $question);

}
if ($bGroupHasVisibleQuestions)
{
$survey_output['GROUPS'] .= self::_populate_template( 'group' , $group );
$survey_output['GROUPS'] .= self::_populate_template( $oTemplate, 'group' , $group );
}
}

Expand Down Expand Up @@ -1577,7 +1577,7 @@ function index($surveyid, $lang = null)

// END recursive empty tag stripping.

echo self::_populate_template( 'survey' , $survey_output );
echo self::_populate_template( $oTemplate, 'survey' , $survey_output );
}// End print
}

Expand All @@ -1594,9 +1594,9 @@ function index($surveyid, $lang = null)
* How:
* @param string $template
*/
private function _populate_template( $template , $input , $line = '')
private function _populate_template( $oTemplate, $template , $input , $line = '')
{
$full_path = PRINT_TEMPLATE_DIR.'views/print_'.$template.'.pstpl';
$full_path = $oTemplate->viewPath.DIRECTORY_SEPARATOR.'print_'.$template.'.pstpl';
$full_constant = 'TEMPLATE'.$template.'.pstpl';
if(!defined($full_constant))
{
Expand Down Expand Up @@ -1747,13 +1747,13 @@ private function _array_filter_help($qidattributes, $sLanguageCode, $surveyid)
$aFilter=explode(';',$qidattributes['array_filter']);
$output .= "\n<p class='extrahelp'>";
foreach ($aFilter as $sFilter)
{
{
$oQuestion=Question::model()->findByAttributes(array('title' => $sFilter, 'language' => $sLanguageCode, 'sid' => $surveyid));
if ($oQuestion)
{
$sNewQuestionText = flattenText(breakToNewline($oQuestion->getAttribute('question')));
$output .= sprintf(gT("Only answer this question for the items you selected in question %s ('%s')"),$qidattributes['array_filter'], $sNewQuestionText );

}
}
$output .= "</p>\n";
Expand All @@ -1772,7 +1772,7 @@ private function _array_filter_help($qidattributes, $sLanguageCode, $surveyid)
}
}
$output .= "</p>\n";
}
}
return $output;
}

Expand Down
32 changes: 16 additions & 16 deletions application/core/plugins/extendedStartPage/views/publicSurveyList_extended.php
View file
Expand Up @@ -8,7 +8,7 @@
{
$outputSurveys++;
//echo "IKI :";var_dump( $survey->localizedTitle);
$divider = ($divideToggle ? " vertical-divider right " : "");
$divider = ($divideToggle ? " vertical-divider right " : "");
if ($survey->publicstatistics == "Y")
{
$statistics = "<div class='col-md-1 col-sm-2 col-xs-2 no-divide ls-custom-padding five ".$divider."'>";
Expand All @@ -22,8 +22,8 @@
);
$statistics .= "</div>";
$list .= "<div class='col-md-5 col-sm-10 col-xs-10 ls-custom-padding five'>";
}
else
}
else
{
$statistics = "";
$list .= "<div class='col-md-6 col-xs-12 ls-custom-padding five ".$divider."'>";
Expand All @@ -33,8 +33,8 @@
if($survey->allowregister == "Y")
{
$tooltips .= "<i class=\"fa fa-sign-in\" aria-hidden=\"true\">&nbsp;</i>";
}
else
}
else
{
if($survey->hasTokens($survey->sid))
{
Expand All @@ -59,20 +59,20 @@
$tooltips .= "<i class=\"fa fa-undo\" aria-hidden=\"true\">&nbsp;</i>";
}
$tooltips .= "<i class=\"fa fa-clock-o\" aria-hidden=\"true\">&nbsp;</i>&nbsp;".$survey->calculateEstimatedTime()." ".gt("Minutes");

$content = $survey->localizedTitle;
$content .= "<span class='pull-right clearfix'>"
."<span href='#' class='fa fa-question-circle' onclick='return false;' data-html='true' data-toggle=\"popover\" title=\"".gT("Survey information")."\" data-content='".$tooltips."'>&nbsp;</span>"
."</span>";

$list .= CHtml::link(
$content,
$content,
array(
'survey/index',
'sid' => $survey->sid,
'survey/index',
'sid' => $survey->sid,
'lang' => App()->language,
'encode' => false
),
),
array(
'class' => 'surveytitle btn btn-primary btn-block',
'data-html' => true,
Expand Down Expand Up @@ -115,27 +115,27 @@
. "<div class='modal-body'>"
. "<div class='row'>"
. "<div class='col-xs-3 text-right'><i class='fa fa-sign-in'>&nbsp;</i></div>"
. "<div class='col-xs-9'>".gT('You have to register to tage this survey')."</div>"
. "<div class='col-xs-9'>".gT('You have to register to take this survey.')."</div>"
. "</div>"
. "<div class='row'>"
. "<div class='col-xs-3 text-right'><i class='fa fa-lock'>&nbsp;</i></div>"
. "<div class='col-xs-9'>".gT('You need a valid token to take this survey')."</div>"
. "<div class='col-xs-9'>".gT('You need a valid token to take this survey.')."</div>"
. "</div>"
. "<div class='row'>"
. "<div class='col-xs-3 text-right'><i class='fa fa-puzzle-piece'>&nbsp;</i></div>"
. "<div class='col-xs-9'>".gT('You need to enter a CAPTCHA to take this survey')."</div>"
. "<div class='col-xs-9'>".gT('You need to enter a CAPTCHA to take this survey.')."</div>"
. "</div>"
. "<div class='row'>"
. "<div class='col-xs-3 text-right'><i class='fa fa-shield'>&nbsp;</i></div>"
. "<div class='col-xs-9'>".gT('This survey is anonymized')."</div>"
. "<div class='col-xs-9'>".gT('This survey is anonymized.')."</div>"
. "</div>"
. "<div class='row'>"
. "<div class='col-xs-3 text-right'><i class='fa fa-undo'>&nbsp;</i></div>"
. "<div class='col-xs-9'>".gT('You may change the answers in this survey')."</div>"
. "<div class='col-xs-9'>".gT('You may change the answers in this survey.')."</div>"
. "</div>"
. "<div class='row'>"
. "<div class='col-xs-3 text-right'><i class='fa fa-clock-o'>&nbsp;</i></div>"
. "<div class='col-xs-9'>".gT('The estimated time for this survey')."</div>"
. "<div class='col-xs-9'>".gT('Estimated time for this survey')."</div>"
. "</div>"
. "</div>"
. "</div>"
Expand Down
14 changes: 7 additions & 7 deletions application/helpers/SurveyRuntimeHelper.php
View file
Expand Up @@ -460,11 +460,11 @@ function run($surveyid,$args)
$_SESSION[$LEMsessid]['maxstep'] = 0;
}

if (isset($_SESSION[$LEMsessid]['LEMpostKey']) && App()->request->getPost('LEMpostKey') != $_SESSION[$LEMsessid]['LEMpostKey'])
if (isset($_SESSION[$LEMsessid]['LEMpostKey']) && App()->request->getPost('LEMpostKey',$_SESSION[$LEMsessid]['LEMpostKey']) != $_SESSION[$LEMsessid]['LEMpostKey'])
{
// then trying to resubmit (e.g. Next, Previous, Submit) from a cached copy of the page
$moveResult = LimeExpressionManager::JumpTo($_SESSION[$LEMsessid]['step'], false, false, true);// We JumpTo current step without saving: see bug #11404
if (isset($moveResult['seq']) && App()->request->getPost('thisstep') == $moveResult['seq'])
if (isset($moveResult['seq']) && App()->request->getPost('thisstep',$moveResult['seq']) == $moveResult['seq'])
{

/* then pressing F5 or otherwise refreshing the current page, which is OK
Expand Down Expand Up @@ -1252,7 +1252,7 @@ function run($surveyid,$args)
$showgroupinfo_global_ = getGlobalSetting('showgroupinfo');
$aSurveyinfo = getSurveyInfo($surveyid);

// Look up if there is a global Setting to hide/show the Questiongroup => In that case Globals will override Local Settings
// Look up if there is a global Setting to hide/show the Questiongroup => In that case Globals will override Local Settings
if(($aSurveyinfo['showgroupinfo'] == $showgroupinfo_global_) || ($showgroupinfo_global_ == 'choose')){
$showgroupinfo_ = $aSurveyinfo['showgroupinfo'];
} else {
Expand Down Expand Up @@ -1473,12 +1473,12 @@ public static function getQuestionReplacement($aQuestionQanda)
$iNumber=$aQuestionQanda[0]['number'];

$showqnumcode_global_ = getGlobalSetting('showqnumcode');
$aSurveyinfo = getSurveyInfo($iSurveyId);
// Look up if there is a global Setting to hide/show the Questiongroup => In that case Globals will override Local Settings
$aSurveyinfo = getSurveyInfo($iSurveyId);
// Look up if there is a global Setting to hide/show the Questiongroup => In that case Globals will override Local Settings
if(($aSurveyinfo['showqnumcode'] == $showqnumcode_global_) || ($showqnumcode_global_ == 'choose')){
$showqnumcode_ = $aSurveyinfo['showqnumcode'];
$showqnumcode_ = $aSurveyinfo['showqnumcode'];
} else {
$showqnumcode_ = $showqnumcode_global_;
$showqnumcode_ = $showqnumcode_global_;
}

switch ($showqnumcode_)
Expand Down
14 changes: 7 additions & 7 deletions locale/_template/limesurvey.pot
View file
Expand Up @@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: LimeSurvey language file\n"
"Report-Msgid-Bugs-To: http://translate.limesurvey.org/\n"
"POT-Creation-Date: 2016-08-23 13:56:15+00:00\n"
"POT-Creation-Date: 2016-08-23 15:33:25+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down Expand Up @@ -5259,27 +5259,27 @@ msgid "Toggle Legend"
msgstr ""

#: application/core/plugins/extendedStartPage/views/publicSurveyList_extended.php:118
msgid "You have to register to tage this survey"
msgid "You have to register to take this survey."
msgstr ""

#: application/core/plugins/extendedStartPage/views/publicSurveyList_extended.php:122
msgid "You need a valid token to take this survey"
msgid "You need a valid token to take this survey."
msgstr ""

#: application/core/plugins/extendedStartPage/views/publicSurveyList_extended.php:126
msgid "You need to enter a CAPTCHA to take this survey"
msgid "You need to enter a CAPTCHA to take this survey."
msgstr ""

#: application/core/plugins/extendedStartPage/views/publicSurveyList_extended.php:130
msgid "This survey is anonymized"
msgid "This survey is anonymized."
msgstr ""

#: application/core/plugins/extendedStartPage/views/publicSurveyList_extended.php:134
msgid "You may change the answers in this survey"
msgid "You may change the answers in this survey."
msgstr ""

#: application/core/plugins/extendedStartPage/views/publicSurveyList_extended.php:138
msgid "The estimated time for this survey"
msgid "Estimated time for this survey"
msgstr ""

#: application/core/plugins/extendedStartPage/views/publicSurveyList_extended.php:159
Expand Down
Binary file modified locale/nb/nb.mo
View file
Binary file not shown.

0 comments on commit aafa6d1

Please sign in to comment.