From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 28 Dec 2016 21:56:52 +0000 (-0500)
Subject: CRM-19802 - Fix more translated strings in tpls
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;ds=sidebyside;h=593379ad383b78f7bdd7bec4709448e647ef52bb;hp=408fbd486de160eb2a43632100dbb7714a9fc111;p=civicrm-core.git

CRM-19802 - Fix more translated strings in tpls
---

diff --git a/CRM/Event/Form/EventFees.php b/CRM/Event/Form/EventFees.php
index a607057c7b..1fec0fbdbf 100644
--- a/CRM/Event/Form/EventFees.php
+++ b/CRM/Event/Form/EventFees.php
@@ -407,7 +407,7 @@ SELECT  id, html_type
         && !CRM_Utils_Array::value('fee', $form->_values)
         && CRM_Utils_Array::value('snippet', $_REQUEST) == CRM_Core_Smarty::PRINT_NOFORM
       ) {
-        $form->assign('isFTPermissionDenied', TRUE);
+        CRM_Core_Session::setStatus(ts('You do not have all the permissions needed for this page.'), 'Permission Denied', 'error');
         return FALSE;
       }
       if ($form->_mode) {
diff --git a/templates/CRM/Campaign/Form/Task/Interview.tpl b/templates/CRM/Campaign/Form/Task/Interview.tpl
index 9e81ae5035..604ca70dbc 100644
--- a/templates/CRM/Campaign/Form/Task/Interview.tpl
+++ b/templates/CRM/Campaign/Form/Task/Interview.tpl
@@ -328,7 +328,7 @@ var surveyActivityIds = {/literal}{$surveyActivityIds}{literal};
         if (interview.errors[error]) errorList =  errorList + '<li>' + interview.errors[error] + '</li>';
       }
       if ( errorList ) {
-        var allErrors = '<i class="crm-i fa-exclamation-triangle crm-i-red"></i> ' + ts('Please correct the following errors in the survey fields below:') + '<ul>' + errorList + '</ul>';
+        var allErrors = '<i class="crm-i fa-exclamation-triangle crm-i-red"></i> {/literal}{ts}Please correct the following errors in the survey fields below:{/ts}{literal}<ul>' + errorList + '</ul>';
         CRM.$('#responseErrors').show( ).html(allErrors);
       }
     }
diff --git a/templates/CRM/Event/Form/EventFees.tpl b/templates/CRM/Event/Form/EventFees.tpl
index 2926ef215f..ac5ce59975 100644
--- a/templates/CRM/Event/Form/EventFees.tpl
+++ b/templates/CRM/Event/Form/EventFees.tpl
@@ -24,13 +24,6 @@
  +--------------------------------------------------------------------+
 *}
 {assign var=isRecordPayment value=1 }
-{if $isFTPermissionDenied}
-  <script>
-  {literal}
-    CRM.alert(ts('You do not have all the permissions needed for this page.'), 'Permission Denied', 'error');
-  {/literal}
-  </script>
-{/if}
 {if $paid} {* We retrieve this tpl when event is selected - keep it empty if event is not paid *}
     <table class="form-layout">
     {if $priceSet}
diff --git a/templates/CRM/Event/Form/SelfSvcUpdate.tpl b/templates/CRM/Event/Form/SelfSvcUpdate.tpl
index 0bb958bdf9..3ad6699f56 100644
--- a/templates/CRM/Event/Form/SelfSvcUpdate.tpl
+++ b/templates/CRM/Event/Form/SelfSvcUpdate.tpl
@@ -56,7 +56,7 @@
     $('#action').on('change', function() {
       selected = $(this).find("option:selected").text();
       if (selected == 'Cancel' && contributionID) {
-        CRM.alert(ts('Cancellations are not refundable.'), 'Warning', 'alert');
+        CRM.alert('{/literal}{ts}Cancellations are not refundable.{/ts}{literal}', 'Warning', 'alert');
       }
     });
   });