From a1f72c47afb73982ebe315c410c7ebe4dd4d6d0e Mon Sep 17 00:00:00 2001
From: Denis Chenu <denis@sondages.pro>
Date: Wed, 15 Jul 2020 15:58:17 +0200
Subject: [PATCH] Fixed issue #16461: Twice contact sentence for some error
 page (#1469)

Dev: remove duplicates, leave contact for theme only.
---
 application/controllers/survey/index.php       | 4 ----
 themes/survey/vanilla/views/layout_errors.twig | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/application/controllers/survey/index.php b/application/controllers/survey/index.php
index 52849d86c00..9a0356e147e 100644
--- a/application/controllers/survey/index.php
+++ b/application/controllers/survey/index.php
@@ -308,7 +308,6 @@ public function action()
             $aErrors = array(gT('Error'));
             $aMessage = array(
                 gT("We are sorry but the survey is expired and no longer available."),
-                sprintf(gT("Please contact %s ( %s ) for further assistance."), $thissurvey['adminname'], $thissurvey['adminemail']) /* Maybe better to move this to a global replacement 'surveycontact' */
             );
 
             $event = new PluginEvent('onSurveyDenied');
@@ -330,7 +329,6 @@ public function action()
             $aErrors  = array(gT('Error'));
             $aMessage = array(
                 gT("This survey is not yet started."),
-                sprintf(gT("Please contact %s ( %s ) for further assistance."), $thissurvey['adminname'], $thissurvey['adminemail'])/* Maybe better to move this to a global replacement 'surveycontact' */
             );
 
             $event = new PluginEvent('onSurveyDenied');
@@ -354,7 +352,6 @@ public function action()
             $aErrors  = array(gT('Error'));
             $aMessage = array(
                 gT("You have already completed this survey."),
-                sprintf(gT("Please contact %s ( %s ) for further assistance."), $thissurvey['adminname'], $thissurvey['adminemail'])/* Maybe better to move this to a global replacement 'surveycontact' */
             );
 
             $event = new PluginEvent('onSurveyDenied');
@@ -473,7 +470,6 @@ public function action()
 
                     $aMessage = array(
                         gT("We are sorry but you are not allowed to enter this survey."),
-                        sprintf(gT("Please contact %s ( %s ) for further assistance."), $thissurvey['adminname'], $thissurvey['adminemail'])/* Maybe better to move this to a global replacement 'surveycontact' */
                     );
 
                     $event = new PluginEvent('onSurveyDenied');
diff --git a/themes/survey/vanilla/views/layout_errors.twig b/themes/survey/vanilla/views/layout_errors.twig
index 32b45554d79..9de85bbaeb5 100644
--- a/themes/survey/vanilla/views/layout_errors.twig
+++ b/themes/survey/vanilla/views/layout_errors.twig
@@ -65,7 +65,7 @@
                     {% if aError.contact %}
                         {{ aError.contact }}
                     {% else %}
-                        {{gT("For further information please contact %s:")|format (aSurveyInfo.adminname)}}
+                        {{gT("For further information please contact %s:")|format (aSurveyInfo.admin)}}
                         {% if aSurveyInfo.adminemail %}
                             <br>
                             <a href='mailto:{{ aSurveyInfo.adminemail }}'>{{ aSurveyInfo.adminemail }}</a>