From be18b82b954d9da1f6fcc4bbd54282cab4b76857 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 9 Oct 2020 16:36:39 +1300
Subject: [PATCH] dev/core#2108 fix deprecation notice

This addresses the deprecation warning by moving the text to the tpl layer - we could ease up
on the deprecation for type = 'static' but the pattern didn't seem to make much sense or to be
consistent with how we normally do things
---
 CRM/Core/Form/Task/PDFLetterCommon.php              | 2 --
 templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CRM/Core/Form/Task/PDFLetterCommon.php b/CRM/Core/Form/Task/PDFLetterCommon.php
index 49776534e0..330e68c0c1 100644
--- a/CRM/Core/Form/Task/PDFLetterCommon.php
+++ b/CRM/Core/Form/Task/PDFLetterCommon.php
@@ -52,7 +52,6 @@ class CRM_Core_Form_Task_PDFLetterCommon {
       FALSE
     );
 
-    $form->add('static', 'pdf_format_header', NULL, ts('Page Format: %1', [1 => '<span class="pdf-format-header-label"></span>']));
     $form->addSelect('format_id', [
       'label' => ts('Select Format'),
       'placeholder' => ts('Default'),
@@ -68,7 +67,6 @@ class CRM_Core_Form_Task_PDFLetterCommon {
       FALSE,
       ['onChange' => "selectPaper( this.value ); showUpdateFormatChkBox();"]
     );
-    $form->add('static', 'paper_dimensions', NULL, ts('Width x Height'));
     $form->add(
       'select',
       'orientation',
diff --git a/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl b/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
index ec9c043705..864fedeb6d 100644
--- a/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
+++ b/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
@@ -34,7 +34,7 @@
 
 <div class="crm-accordion-wrapper collapsed crm-pdf-format-accordion">
     <div class="crm-accordion-header">
-        {$form.pdf_format_header.html}
+      {ts}Page Format:{/ts} <span class="pdf-format-header-label"></span>
     </div>
     <div class="crm-accordion-body">
       <div class="crm-block crm-form-block">
@@ -52,7 +52,7 @@
         <td colspan="2">&nbsp;</td>
       </tr>
       <tr>
-        <td>{$form.paper_dimensions.html}</td><td id="paper_dimensions">&nbsp;</td>
+        <td>{ts}Width x Height{/ts}</td><td id="paper_dimensions">&nbsp;</td>
         <td colspan="2">&nbsp;</td>
       </tr>
       <tr>
-- 
2.25.1