From 9fae8940286ee6e4bbb807d1408dfcaf74d482a7 Mon Sep 17 00:00:00 2001
From: Olle Haerstedt <olle.haerstedt@limesurvey.org>
Date: Mon, 5 Feb 2018 15:37:30 +0100
Subject: [PATCH] Fixed issue #13295: Better captcha instructions

---
 application/views/survey/frontpage/captchaForm/form.php         | 2 +-
 application/views/survey/frontpage/registerForm/form.php        | 2 +-
 application/views/survey/frontpage/tokenForm/form.php           | 2 +-
 application/views/survey/system/formItem/captcha.php            | 2 +-
 .../survey/vanilla/views/subviews/logincomponents/captcha.twig  | 2 +-
 themes/survey/vanilla/views/subviews/logincomponents/token.twig | 2 +-
 .../vanilla/views/subviews/registration/register_form.twig      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/views/survey/frontpage/captchaForm/form.php b/application/views/survey/frontpage/captchaForm/form.php
index f4dc7ad93f6..8ea60664ee4 100644
--- a/application/views/survey/frontpage/captchaForm/form.php
+++ b/application/views/survey/frontpage/captchaForm/form.php
@@ -7,7 +7,7 @@
 <div class=''>
     <div class='form-group'>
         <div class='form-group captcha-item'>
-            <label class='control-label col-sm-3' for='loadsecurity'><?php echo gT("Please enter the letters you see:") ?></label>
+            <label class='control-label col-sm-3' for='loadsecurity'><?php echo gT("Please solve the following equation:") ?></label>
             <div class='col-sm-7'>
                 <div class='ls-input-group'>
                     <div class='ls-input-group-extra captcha-widget' >
diff --git a/application/views/survey/frontpage/registerForm/form.php b/application/views/survey/frontpage/registerForm/form.php
index 3d5eebba6d1..fc359bd0ad5 100644
--- a/application/views/survey/frontpage/registerForm/form.php
+++ b/application/views/survey/frontpage/registerForm/form.php
@@ -29,7 +29,7 @@
     <?php } ?>
 <?php if($bCaptcha){ ?>
     <div class='form-group captcha-item'>
-        <label class='control-label col-sm-5' for='loadsecurity'><?php echo gT("Please enter the letters you see:") ?><?php $this->renderPartial('/survey/system/required',array());?></label>
+        <label class='control-label col-sm-5' for='loadsecurity'><?php echo gT("Please solve the following equation:") ?><?php $this->renderPartial('/survey/system/required',array());?></label>
         <div class='col-sm-7'>
             <div class='input-group'>
                 <div class='control-label captcha-widget' >
diff --git a/application/views/survey/frontpage/tokenForm/form.php b/application/views/survey/frontpage/tokenForm/form.php
index 1b2f0da13c3..a0f50fd5079 100644
--- a/application/views/survey/frontpage/tokenForm/form.php
+++ b/application/views/survey/frontpage/tokenForm/form.php
@@ -24,7 +24,7 @@
     <?php if (isset($bCaptchaEnabled)): ?>
         <div class='form-group captcha-item'>
             <!-- Don't seems aria capable -->
-            <label class='control-label col-sm-3' for='loadsecurity'><?php echo gT("Please enter the letters you see:") ?><?php $this->renderPartial('/survey/system/required',array());?></label>
+            <label class='control-label col-sm-3' for='loadsecurity'><?php echo gT("Please solve the following equation:") ?><?php $this->renderPartial('/survey/system/required',array());?></label>
             <div class='col-sm-7'>
                 <div class='ls-input-group'>
                     <div class='ls-input-group-extra captcha-widget' >
diff --git a/application/views/survey/system/formItem/captcha.php b/application/views/survey/system/formItem/captcha.php
index de387105b9e..74b493c9cb4 100644
--- a/application/views/survey/system/formItem/captcha.php
+++ b/application/views/survey/system/formItem/captcha.php
@@ -7,7 +7,7 @@
 
 ?>
 <div class='form-group captcha-item'>
-    <label class='control-label col-sm-5' for='loadsecurity'><?php echo gT("Please enter the letters you see:") ?></label>
+    <label class='control-label col-sm-5' for='loadsecurity'><?php echo gT("Please solve the following equation:") ?></label>
     <div class='col-sm-7 load-survey-input input-cell'>
         <div class='input-group'>
             <div class='input-group-addon captcha-widget' >
diff --git a/themes/survey/vanilla/views/subviews/logincomponents/captcha.twig b/themes/survey/vanilla/views/subviews/logincomponents/captcha.twig
index c3795dbcee9..6bf87f53fc0 100644
--- a/themes/survey/vanilla/views/subviews/logincomponents/captcha.twig
+++ b/themes/survey/vanilla/views/subviews/logincomponents/captcha.twig
@@ -47,7 +47,7 @@
 
                 <!-- Doesn't seems aria capable -->
                 <label class='{{ aSurveyInfo.class.maincolformdivblabel }} control-label col-sm-4' {{ aSurveyInfo.attr.maincolformdivblabel }} >
-                    {{ "Please enter the letters you see:" | t }}
+                    {{ "Please solve the following equation" | t }}
                     <small class="{{ aSurveyInfo.class.maincolformdivblabelsmall }} text-danger asterisk fa fa-asterisk pull-left small"  {{ aSurveyInfo.attr.maincolformdivblabelsmall }} ></small>
                     <span  class="{{ aSurveyInfo.class.maincolformdivblabelspan }} sr-only text-danger asterisk" {{ aSurveyInfo.attr.maincolformdivblabelspan }}>
                         ( {{ "Mandatory" | t }} )
diff --git a/themes/survey/vanilla/views/subviews/logincomponents/token.twig b/themes/survey/vanilla/views/subviews/logincomponents/token.twig
index edbc425074b..155d40b094e 100644
--- a/themes/survey/vanilla/views/subviews/logincomponents/token.twig
+++ b/themes/survey/vanilla/views/subviews/logincomponents/token.twig
@@ -57,7 +57,7 @@
 
                 <!-- Doesn't seems aria capable -->
                 <label class='{{ aSurveyInfo.class.maincolformdivblabel }} control-label col-sm-3' {{ aSurveyInfo.attr.maincolformdivblabel }} >
-                    {{ "Please enter the letters you see:" | t }}
+                    {{ "Please solve the following equation:" | t }}
                     <small class="{{ aSurveyInfo.class.maincolformdivblabelsmall }} text-danger asterisk fa fa-asterisk pull-left small"  {{ aSurveyInfo.attr.maincolformdivblabelsmall }} ></small>
                     <span  class="{{ aSurveyInfo.class.maincolformdivblabelspan }} sr-only text-danger asterisk" {{ aSurveyInfo.attr.maincolformdivblabelspan }}>
                         ( {{ "Mandatory" | t }} )
diff --git a/themes/survey/vanilla/views/subviews/registration/register_form.twig b/themes/survey/vanilla/views/subviews/registration/register_form.twig
index c8e38f167e7..3d3b1387c94 100644
--- a/themes/survey/vanilla/views/subviews/registration/register_form.twig
+++ b/themes/survey/vanilla/views/subviews/registration/register_form.twig
@@ -59,7 +59,7 @@
         {# Captcha box #}
         {% if aSurveyInfo.bCaptcha %}
             <div class='{{ aSurveyInfo.class.registerformcaptcha }} form-group row ' {{ aSurveyInfo.attr.registerformcaptcha }}>
-                <label class='{{ aSurveyInfo.class.registerformcaptchalabel }} control-label ' {{ aSurveyInfo.attr.registerformcaptchalabel }} >{{ "Please enter the letters you see:" | t }} {{ include('./subviews/registration/required.twig') }}</label>
+                <label class='{{ aSurveyInfo.class.registerformcaptchalabel }} control-label ' {{ aSurveyInfo.attr.registerformcaptchalabel }} >{{ "Please solve the following equation:" | t }} {{ include('./subviews/registration/required.twig') }}</label>
                 <div {{ aSurveyInfo.attr.registerformcaptchadiv }}>
                     <div class='{{ aSurveyInfo.class.registerformcaptchadivb }} input-group' {{ aSurveyInfo.attr.registerformcaptchadivb }}>
                         <div class='{{ aSurveyInfo.class.registerformcaptchadivc }} control-label' {{ aSurveyInfo.attr.registerformcaptchadivc }}>