From d8a6364b282550206396bb99fd42031c1c574f46 Mon Sep 17 00:00:00 2001
From: Mathieu Lu <mathieu@symbiotic.coop>
Date: Wed, 16 Oct 2024 13:59:51 -0400
Subject: [PATCH 1/4] dev/translation#90 Fix recurring unit translation on
 ContributionPage Confirm

---
 .../Contribute/Form/Contribution/Confirm.tpl  | 100 ++++++++++--------
 1 file changed, 58 insertions(+), 42 deletions(-)

diff --git a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
index 68f4cf4c23ea..86e887eca8ab 100644
--- a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
@@ -77,56 +77,72 @@
         {if $is_recur}
           {if !empty($auto_renew)} {* Auto-renew membership confirmation *}
             {crmRegion name="contribution-confirm-recur-membership"}
-              <br/>
-              <p>
-                <strong>
-                  {if $autoRenewOption == 1}
-                    {ts 1=$frequency_interval 2=$frequency_unit}I want this membership to be renewed automatically every %1 %2(s).{/ts}
-                  {elseif $autoRenewOption == 2}
-                    {ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 %2(s).{/ts}
+              <br />
+                {if $frequency_interval > 1}
+                  {* dev/translation#80 All 'every %1' strings are incorrectly using ts, but focusing on the most important one until we find a better fix. *}
+                  {if $frequency_unit eq 'day'}
+                    <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 days.{/ts}</strong>
+                  {elseif $frequency_unit eq 'week'}
+                    <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 weeks.{/ts}</strong>
+                  {elseif $frequency_unit eq 'month'}
+                    <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 months.{/ts}</strong>
+                  {elseif $frequency_unit eq 'year'}
+                    <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 years.{/ts}</strong>
                   {/if}
-                </strong>
-              </p>
-              <div class="description crm-auto-renew-cancel-info">
-                ({ts}Your initial membership fee will be processed once you complete the confirmation step. You will be able to cancel the auto-renewal option by visiting the web page link that will be included in your receipt.{/ts}
-                )
-              </div>
+                {else}
+                  {* dev/translation#80 All 'every %1' strings are incorrectly using ts, but focusing on the most important one until we find a better fix. *}
+                  {if $frequency_unit eq 'day'}
+                    <strong>{ts}This membership will be renewed automatically every day.{/ts}</strong>
+                  {elseif $frequency_unit eq 'week'}
+                    <strong>{ts}This membership will be renewed automatically every week.{/ts}</strong>
+                  {elseif $frequency_unit eq 'month'}
+                    <strong>{ts}This membership will be renewed automatically every month.{/ts}</strong>
+                  {elseif $frequency_unit eq 'year'}
+                    <strong>{ts}This membership will be renewed automatically every year.{/ts}</strong>
+                  {/if}
+                {/if}
+              <div class="description crm-auto-renew-cancel-info">{ts}Your initial membership fee will be processed once you complete the confirmation step. You will be able to cancel the auto-renewal option by visiting the web page link that will be included in your receipt.{/ts}</div>
             {/crmRegion}
           {else}
             {crmRegion name="contribution-confirm-recur"}
-            {if $installments}
-              {if $frequency_interval > 1}
-                <p>
-                  <strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}I want to contribute this amount every %1 %2s for %3 installments.{/ts}</strong>
-                </p>
-              {else}
-                <p>
-                  <strong>{ts 1=$frequency_unit 2=$installments}I want to contribute this amount every %1 for %2 installments.{/ts}</strong>
-                </p>
-              {/if}
-            {else}
-              {if $frequency_interval > 1}
-                {if $frequency_unit eq 'day'}
-                  <p><strong>{ts 1=$frequency_interval}I want to contribute this amount every %1 days.{/ts}</strong></p>
-                {elseif $frequency_unit eq 'week'}
-                  <p><strong>{ts 1=$frequency_interval}I want to contribute this amount every %1 weeks.{/ts}</strong></p>
-                {elseif $frequency_unit eq 'month'}
-                  <p><strong>{ts 1=$frequency_interval}I want to contribute this amount every %1 months.{/ts}</strong></p>
-                {elseif $frequency_unit eq 'year'}
-                  <p><strong>{ts 1=$frequency_interval}I want to contribute this amount every %1 years.{/ts}</strong></p>
+              {if $installments > 1}
+                {if $frequency_interval > 1}
+                  {if $frequency_unit eq 'day'}
+                    <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 days for a total %3 installments (including this initial contribution).{/ts}</strong></p>
+                  {elseif $frequency_unit eq 'week'}
+                    <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 weeks for a total %3 installments (including this initial contribution).{/ts}</strong></p>
+                  {elseif $frequency_unit eq 'month'}
+                    <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 months for a total %3 installments (including this initial contribution).{/ts}</strong></p>
+                  {elseif $frequency_unit eq 'year'}
+                    <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 years for a total %3 installments (including this initial contribution).{/ts}</strong></p>
+                  {/if}
+                {else}
+                  <p><strong>{ts 1=$frequency_unit 2=$installments}This recurring contribution will be automatically processed every %1 for a total %2 installments (including this initial contribution).{/ts}</strong></p>
                 {/if}
               {else}
-                {if $frequency_unit eq 'day'}
-                  <p><strong>{ts}I want to contribute this amount every day.{/ts}</strong></p>
-                {elseif $frequency_unit eq 'week'}
-                  <p><strong>{ts}I want to contribute this amount every week.{/ts}</strong></p>
-                {elseif $frequency_unit eq 'month'}
-                  <p><strong>{ts}I want to contribute this amount every month.{/ts}</strong></p>
-                {elseif $frequency_unit eq 'year'}
-                  <p><strong>{ts}I want to contribute this amount every year.{/ts}</strong></p>
+                {if $frequency_interval > 1}
+                  {if $frequency_unit eq 'day'}
+                    <p><strong>{ts 1=$frequency_interval}This recurring contribution will be automatically processed every %1 days.{/ts}</strong></p>
+                  {elseif $frequency_unit eq 'week'}
+                    <p><strong>{ts 1=$frequency_interval}This recurring contribution will be automatically processed every %1 weeks.{/ts}</strong></p>
+                  {elseif $frequency_unit eq 'month'}
+                    <p><strong>{ts 1=$frequency_interval}This recurring contribution will be automatically processed every %1 months.{/ts}</strong></p>
+                  {elseif $frequency_unit eq 'year'}
+                    <p><strong>{ts 1=$frequency_interval}This recurring contribution will be automatically processed every %1 years.{/ts}</strong></p>
+                  {/if}
+                {else}
+                  {* dev/translation#32 All 'every %1' strings are incorrectly using ts, but focusing on the most important one until we find a better fix. *}
+                  {if $frequency_unit eq 'day'}
+                    <p><strong>{ts}This contribution will be automatically processed every day.{/ts}</strong></p>
+                  {elseif $frequency_unit eq 'week'}
+                    <p><strong>{ts}This contribution will be automatically processed every week.{/ts}</strong></p>
+                  {elseif $frequency_unit eq 'month'}
+                    <p><strong>{ts}This contribution will be automatically processed every month.{/ts}</strong></p>
+                  {elseif $frequency_unit eq 'year'}
+                    <p><strong>{ts}This contribution will be automatically processed every year.{/ts}</strong></p>
+                  {/if}
                 {/if}
               {/if}
-            {/if}
             <p>{ts}Your initial contribution will be processed once you complete the confirmation step. You will be able to cancel the recurring contribution by visiting the web page link that will be included in your receipt.{/ts}</p>
             {/crmRegion}
           {/if}

From df1fea4be664401e6f07dc8a2c17053ca2d33398 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 16 Oct 2024 09:00:09 +1300
Subject: [PATCH 2/4] Translability improvement - get rid of %unit(s)

The (s) pattern doesn't work for translation
---
 .../Contribute/Form/Contribution/ThankYou.tpl | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
index 74854f2d1696..3ddf0e9a0c04 100644
--- a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
@@ -118,7 +118,16 @@
               <br />
               {if !$installments || $installments > 1}
                 {if $frequency_interval > 1}
-                  <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 %2(s).{/ts}</strong>
+                  {* dev/translation#80 All 'every %1' strings are incorrectly using ts, but focusing on the most important one until we find a better fix. *}
+                  {if $frequency_unit eq 'day'}
+                    <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 days.{/ts}</strong>
+                  {elseif $frequency_unit eq 'week'}
+                    <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 weeks.{/ts}</strong>
+                  {elseif $frequency_unit eq 'month'}
+                    <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 months.{/ts}</strong>
+                  {elseif $frequency_unit eq 'year'}
+                    <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 years.{/ts}</strong>
+                  {/if}
                 {else}
                   <strong>{ts 1=$frequency_unit}This membership will be renewed automatically every %1.{/ts}</strong>
                 {/if}
@@ -140,7 +149,15 @@
             {crmRegion name="contribution-thankyou-recur"}
               {if $installments > 1}
                 {if $frequency_interval > 1}
-                  <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 %2s for a total %3 installments (including this initial contribution).{/ts}</strong></p>
+                  {if $frequency_unit eq 'day'}
+                    <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 days for a total %3 installments (including this initial contribution).{/ts}</strong></p>
+                  {elseif $frequency_unit eq 'week'}
+                    <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 weeks for a total %3 installments (including this initial contribution).{/ts}</strong></p>
+                  {elseif $frequency_unit eq 'month'}
+                    <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 months for a total %3 installments (including this initial contribution).{/ts}</strong></p>
+                  {elseif $frequency_unit eq 'year'}
+                    <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 years for a total %3 installments (including this initial contribution).{/ts}</strong></p>
+                  {/if}
                 {else}
                   <p><strong>{ts 1=$frequency_unit 2=$installments}This recurring contribution will be automatically processed every %1 for a total %2 installments (including this initial contribution).{/ts}</strong></p>
                 {/if}

From f4d5f3ab30ba21c537f20a1aaf9a2f37f5e206d5 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 15 Oct 2024 13:27:28 +1300
Subject: [PATCH 3/4] dev/translation#90 address translation issue on
 membership

---
 templates/CRM/Contribute/Form/Contribution/ThankYou.tpl | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
index 3ddf0e9a0c04..5dcd0f0f48dd 100644
--- a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
@@ -116,7 +116,6 @@
           {if !empty($auto_renew)} {* Auto-renew membership confirmation *}
             {crmRegion name="contribution-thankyou-recur-membership"}
               <br />
-              {if !$installments || $installments > 1}
                 {if $frequency_interval > 1}
                   {* dev/translation#80 All 'every %1' strings are incorrectly using ts, but focusing on the most important one until we find a better fix. *}
                   {if $frequency_unit eq 'day'}
@@ -129,9 +128,6 @@
                     <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 years.{/ts}</strong>
                   {/if}
                 {else}
-                  <strong>{ts 1=$frequency_unit}This membership will be renewed automatically every %1.{/ts}</strong>
-                {/if}
-              {else}
                   {* dev/translation#80 All 'every %1' strings are incorrectly using ts, but focusing on the most important one until we find a better fix. *}
                   {if $frequency_unit eq 'day'}
                     <strong>{ts}This membership will be renewed automatically every day.{/ts}</strong>
@@ -142,7 +138,7 @@
                   {elseif $frequency_unit eq 'year'}
                     <strong>{ts}This membership will be renewed automatically every year.{/ts}</strong>
                   {/if}
-              {/if}
+                {/if}
               <div class="description crm-auto-renew-cancel-info">({ts}You will receive an email receipt which includes information about how to cancel the auto-renewal option.{/ts})</div>
             {/crmRegion}
           {else}

From ae08eda6eeecbfe9b2f2f3c199b5caf91de75aa9 Mon Sep 17 00:00:00 2001
From: Mathieu Lu <mathieu@symbiotic.coop>
Date: Wed, 16 Oct 2024 14:45:36 -0400
Subject: [PATCH 4/4] Contribution Confirm/ThankYou.tpl cleanup

---
 .../Contribute/Form/Contribution/Confirm.tpl  | 303 +++++++++---------
 .../Form/Contribution/MembershipBlock.tpl     |  28 +-
 .../Contribute/Form/Contribution/ThankYou.tpl | 247 +++++++-------
 3 files changed, 280 insertions(+), 298 deletions(-)

diff --git a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
index 86e887eca8ab..dda637730193 100644
--- a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
@@ -10,7 +10,7 @@
 {if $action & 1024}
   {include file="CRM/Contribute/Form/Contribution/PreviewHeader.tpl"}
 {/if}
-
+{* Please keep Confirm.tpl and ThankYou.tpl somewhat in sync *}
 <div class="crm-contribution-page-id-{$contributionPageID} crm-block crm-contribution-confirm-form-block" data-page-id="{$contributionPageID}" data-page-template="confirm">
   <div class="help">
     <p>{ts}Please verify the information below carefully. Click <strong>Go Back</strong> if you need to make changes.{/ts}
@@ -32,138 +32,136 @@
         {if !$membershipBlock AND $amount OR ($isDisplayLineItems and $lineItem)}{ts}Contribution Amount{/ts}{else}{ts}Membership Fee{/ts} {/if}
       </div>
 
-      <div class="display-block">
-        {if $isDisplayLineItems && $lineItem}
-          {if !$amount}{assign var="amount" value=0}{/if}
-          {assign var="totalAmount" value=$amount}
-          {include file="CRM/Price/Page/LineItem.tpl" context="Contribution" getTaxDetails=$totalTaxAmount displayLineItemFinancialType=false pricesetFieldsCount=false currencySymbol='' hookDiscount=''}
-        {elseif $is_separate_payment}
-          {if $amount AND $minimum_fee}
-            {$membership_name} {ts}Membership{/ts}:
-            <strong>{$membershipTotalAmount|crmMoney}</strong>
-            <br/>
-            {ts}Additional Contribution{/ts}:
-            <strong>{$nonMembershipTotalAmount|crmMoney}</strong>
-            <br/>
-            <strong> -------------------------------------------</strong>
-            <br/>
-            {ts}Total{/ts}:
-            <strong>{$orderTotal|crmMoney}</strong>
-            <br/>
-          {elseif $amount}
-            {ts}Amount{/ts}:
-            <strong>{$amount|crmMoney} {if $amount_level}<span class='crm-price-amount-label'>
-                &ndash; {$amount_level}</span>{/if}</strong>
-          {else}
-            {$membership_name} {ts}Membership{/ts}:
-            <strong>{$minimum_fee|crmMoney}</strong>
-          {/if}
-        {else}
-          {if $totalTaxAmount}
-            {ts 1=$taxTerm}Total %1 Amount{/ts}:
-            <strong>{$totalTaxAmount|crmMoney} </strong>
-            <br/>
-          {/if}
-          {if $amount}
-            {if $installments}{ts}Installment Amount{/ts}{else}{ts}Total Amount{/ts}{/if}:
-            <strong>{$amount|crmMoney:$currency}{if $amount_level}<span class='crm-price-amount-label'>
-                &ndash; {$amount_level}</span>{/if}</strong>
+      <div class="crm-section no-label amount_display-section">
+        <div class="content">
+          {if $isDisplayLineItems && $lineItem}
+            {if !$amount}{assign var="amount" value=0}{/if}
+            {assign var="totalAmount" value=$amount}
+            {include file="CRM/Price/Page/LineItem.tpl" context="Contribution" getTaxDetails=$totalTaxAmount displayLineItemFinancialType=false pricesetFieldsCount=false currencySymbol='' hookDiscount=''}
+          {elseif $is_separate_payment}
+            {if $amount AND $minimum_fee}
+              {$membership_name} {ts}Membership{/ts}:
+              <strong>{$membershipTotalAmount|crmMoney}</strong>
+              <br/>
+              {ts}Additional Contribution{/ts}:
+              <strong>{$nonMembershipTotalAmount|crmMoney}</strong>
+              <br/>
+              <strong> -------------------------------------------</strong>
+              <br/>
+              {ts}Total{/ts}:
+              <strong>{$orderTotal|crmMoney}</strong>
+              <br/>
+            {elseif $amount}
+              {ts}Amount{/ts}:
+              <strong>{$amount|crmMoney} {if $amount_level}<span class='crm-price-amount-label'>
+                  &ndash; {$amount_level}</span>{/if}</strong>
+            {else}
+              {$membership_name} {ts}Membership{/ts}:
+              <strong>{$minimum_fee|crmMoney}</strong>
+            {/if}
           {else}
-            {$membership_name} {ts}Membership{/ts}:
-            <strong>{$minimum_fee|crmMoney}</strong>
+            {if $totalTaxAmount}
+              {ts}Tax Amount{/ts}: <strong>{$totalTaxAmount|crmMoney}</strong><br />
+            {/if}
+            {if $amount}
+              {if $installments}{ts}Installment Amount{/ts}{else}{ts}Total Amount{/ts}{/if}:
+              <strong>{$amount|crmMoney:$currency}{if $amount_level}<span class='crm-price-amount-label'>
+                  &ndash; {$amount_level}</span>{/if}</strong>
+            {else}
+              {$membership_name} {ts}Membership{/ts}:
+              <strong>{$minimum_fee|crmMoney}</strong>
+            {/if}
           {/if}
-        {/if}
 
-        {if $is_recur}
-          {if !empty($auto_renew)} {* Auto-renew membership confirmation *}
-            {crmRegion name="contribution-confirm-recur-membership"}
-              <br />
-                {if $frequency_interval > 1}
-                  {* dev/translation#80 All 'every %1' strings are incorrectly using ts, but focusing on the most important one until we find a better fix. *}
-                  {if $frequency_unit eq 'day'}
-                    <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 days.{/ts}</strong>
-                  {elseif $frequency_unit eq 'week'}
-                    <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 weeks.{/ts}</strong>
-                  {elseif $frequency_unit eq 'month'}
-                    <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 months.{/ts}</strong>
-                  {elseif $frequency_unit eq 'year'}
-                    <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 years.{/ts}</strong>
+          {* Recurring contribution / pledge information *}
+          {if $is_recur}
+            {if !empty($auto_renew)} {* Auto-renew membership confirmation *}
+              {crmRegion name="contribution-confirm-recur-membership"}
+                <p>
+                  {if $frequency_interval > 1}
+                    {* dev/translation#80 All 'every %1' strings are incorrectly using ts, but focusing on the most important one until we find a better fix. *}
+                    {if $frequency_unit eq 'day'}
+                      <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 days.{/ts}</strong>
+                    {elseif $frequency_unit eq 'week'}
+                      <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 weeks.{/ts}</strong>
+                    {elseif $frequency_unit eq 'month'}
+                      <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 months.{/ts}</strong>
+                    {elseif $frequency_unit eq 'year'}
+                      <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 years.{/ts}</strong>
+                    {/if}
+                  {else}
+                    {* dev/translation#80 All 'every %1' strings are incorrectly using ts, but focusing on the most important one until we find a better fix. *}
+                    {if $frequency_unit eq 'day'}
+                      <strong>{ts}This membership will be renewed automatically every day.{/ts}</strong>
+                    {elseif $frequency_unit eq 'week'}
+                      <strong>{ts}This membership will be renewed automatically every week.{/ts}</strong>
+                    {elseif $frequency_unit eq 'month'}
+                      <strong>{ts}This membership will be renewed automatically every month.{/ts}</strong>
+                    {elseif $frequency_unit eq 'year'}
+                      <strong>{ts}This membership will be renewed automatically every year.{/ts}</strong>
+                    {/if}
                   {/if}
-                {else}
-                  {* dev/translation#80 All 'every %1' strings are incorrectly using ts, but focusing on the most important one until we find a better fix. *}
-                  {if $frequency_unit eq 'day'}
-                    <strong>{ts}This membership will be renewed automatically every day.{/ts}</strong>
-                  {elseif $frequency_unit eq 'week'}
-                    <strong>{ts}This membership will be renewed automatically every week.{/ts}</strong>
-                  {elseif $frequency_unit eq 'month'}
-                    <strong>{ts}This membership will be renewed automatically every month.{/ts}</strong>
-                  {elseif $frequency_unit eq 'year'}
-                    <strong>{ts}This membership will be renewed automatically every year.{/ts}</strong>
-                  {/if}
-                {/if}
-              <div class="description crm-auto-renew-cancel-info">{ts}Your initial membership fee will be processed once you complete the confirmation step. You will be able to cancel the auto-renewal option by visiting the web page link that will be included in your receipt.{/ts}</div>
-            {/crmRegion}
-          {else}
-            {crmRegion name="contribution-confirm-recur"}
-              {if $installments > 1}
-                {if $frequency_interval > 1}
-                  {if $frequency_unit eq 'day'}
-                    <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 days for a total %3 installments (including this initial contribution).{/ts}</strong></p>
-                  {elseif $frequency_unit eq 'week'}
-                    <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 weeks for a total %3 installments (including this initial contribution).{/ts}</strong></p>
-                  {elseif $frequency_unit eq 'month'}
-                    <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 months for a total %3 installments (including this initial contribution).{/ts}</strong></p>
-                  {elseif $frequency_unit eq 'year'}
-                    <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 years for a total %3 installments (including this initial contribution).{/ts}</strong></p>
+                </p>
+                <div class="description crm-auto-renew-cancel-info">{ts}Your initial membership fee will be processed once you complete the confirmation step. You will be able to cancel the auto-renewal option by visiting the web page link that will be included in your receipt.{/ts}</div>
+              {/crmRegion}
+            {else}
+              {crmRegion name="contribution-confirm-recur"}
+                {if $installments > 1}
+                  {if $frequency_interval > 1}
+                    {if $frequency_unit eq 'day'}
+                      <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 days for a total %3 installments (including this initial contribution).{/ts}</strong></p>
+                    {elseif $frequency_unit eq 'week'}
+                      <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 weeks for a total %3 installments (including this initial contribution).{/ts}</strong></p>
+                    {elseif $frequency_unit eq 'month'}
+                      <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 months for a total %3 installments (including this initial contribution).{/ts}</strong></p>
+                    {elseif $frequency_unit eq 'year'}
+                      <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 years for a total %3 installments (including this initial contribution).{/ts}</strong></p>
+                    {/if}
+                  {else}
+                    <p><strong>{ts 1=$frequency_unit 2=$installments}This recurring contribution will be automatically processed every %1 for a total %2 installments (including this initial contribution).{/ts}</strong></p>
                   {/if}
                 {else}
-                  <p><strong>{ts 1=$frequency_unit 2=$installments}This recurring contribution will be automatically processed every %1 for a total %2 installments (including this initial contribution).{/ts}</strong></p>
-                {/if}
-              {else}
-                {if $frequency_interval > 1}
-                  {if $frequency_unit eq 'day'}
-                    <p><strong>{ts 1=$frequency_interval}This recurring contribution will be automatically processed every %1 days.{/ts}</strong></p>
-                  {elseif $frequency_unit eq 'week'}
-                    <p><strong>{ts 1=$frequency_interval}This recurring contribution will be automatically processed every %1 weeks.{/ts}</strong></p>
-                  {elseif $frequency_unit eq 'month'}
-                    <p><strong>{ts 1=$frequency_interval}This recurring contribution will be automatically processed every %1 months.{/ts}</strong></p>
-                  {elseif $frequency_unit eq 'year'}
-                    <p><strong>{ts 1=$frequency_interval}This recurring contribution will be automatically processed every %1 years.{/ts}</strong></p>
-                  {/if}
-                {else}
-                  {* dev/translation#32 All 'every %1' strings are incorrectly using ts, but focusing on the most important one until we find a better fix. *}
-                  {if $frequency_unit eq 'day'}
-                    <p><strong>{ts}This contribution will be automatically processed every day.{/ts}</strong></p>
-                  {elseif $frequency_unit eq 'week'}
-                    <p><strong>{ts}This contribution will be automatically processed every week.{/ts}</strong></p>
-                  {elseif $frequency_unit eq 'month'}
-                    <p><strong>{ts}This contribution will be automatically processed every month.{/ts}</strong></p>
-                  {elseif $frequency_unit eq 'year'}
-                    <p><strong>{ts}This contribution will be automatically processed every year.{/ts}</strong></p>
+                  {if $frequency_interval > 1}
+                    {if $frequency_unit eq 'day'}
+                      <p><strong>{ts 1=$frequency_interval}This recurring contribution will be automatically processed every %1 days.{/ts}</strong></p>
+                    {elseif $frequency_unit eq 'week'}
+                      <p><strong>{ts 1=$frequency_interval}This recurring contribution will be automatically processed every %1 weeks.{/ts}</strong></p>
+                    {elseif $frequency_unit eq 'month'}
+                      <p><strong>{ts 1=$frequency_interval}This recurring contribution will be automatically processed every %1 months.{/ts}</strong></p>
+                    {elseif $frequency_unit eq 'year'}
+                      <p><strong>{ts 1=$frequency_interval}This recurring contribution will be automatically processed every %1 years.{/ts}</strong></p>
+                    {/if}
+                  {else}
+                    {* dev/translation#32 All 'every %1' strings are incorrectly using ts, but focusing on the most important one until we find a better fix. *}
+                    {if $frequency_unit eq 'day'}
+                      <p><strong>{ts}This contribution will be automatically processed every day.{/ts}</strong></p>
+                    {elseif $frequency_unit eq 'week'}
+                      <p><strong>{ts}This contribution will be automatically processed every week.{/ts}</strong></p>
+                    {elseif $frequency_unit eq 'month'}
+                      <p><strong>{ts}This contribution will be automatically processed every month.{/ts}</strong></p>
+                    {elseif $frequency_unit eq 'year'}
+                      <p><strong>{ts}This contribution will be automatically processed every year.{/ts}</strong></p>
+                    {/if}
                   {/if}
                 {/if}
-              {/if}
-            <p>{ts}Your initial contribution will be processed once you complete the confirmation step. You will be able to cancel the recurring contribution by visiting the web page link that will be included in your receipt.{/ts}</p>
-            {/crmRegion}
+                <p>{ts}Your initial contribution will be processed once you complete the confirmation step. You will be able to cancel the recurring contribution by visiting the web page link that will be included in your receipt.{/ts}</p>
+              {/crmRegion}
+            {/if}
           {/if}
-        {/if}
-
-        {if $is_pledge}
-          {if $pledge_frequency_interval GT 1}
-            <p>
-              <strong>{ts 1=$pledge_frequency_interval 2=$pledge_frequency_unit 3=$pledge_installments}I pledge to contribute this amount every %1 %2s for %3 installments.{/ts}</strong>
-            </p>
-          {else}
-            <p>
-              <strong>{ts 1=$pledge_frequency_interval 2=$pledge_frequency_unit 3=$pledge_installments}I pledge to contribute this amount every %2 for %3 installments.{/ts}</strong>
-            </p>
-          {/if}
-          {if $is_pay_later}
-            <p>{ts 1=$receiptFromEmail 2=$button}Click &quot;%2&quot; below to register your pledge. You will be able to modify or cancel future pledge payments at any time by logging in to your account or contacting us at %1.{/ts}</p>
-          {else}
-            <p>{ts 1=$receiptFromEmail 2=$button}Your initial pledge payment will be processed when you click &quot;%2&quot; below. You will be able to modify or cancel future pledge payments at any time by logging in to your account or contacting us at %1.{/ts}</p>
+          {if $is_pledge}
+            {if $pledge_frequency_interval GT 1}
+              <p><strong>{ts 1=$pledge_frequency_interval 2=$pledge_frequency_unit 3=$pledge_installments}I pledge to contribute this amount every %1 %2s for %3 installments.{/ts}</strong></p>
+            {else}
+              <p><strong>{ts 1=$pledge_frequency_interval 2=$pledge_frequency_unit 3=$pledge_installments}I pledge to contribute this amount every %2 for %3 installments.{/ts}</strong></p>
+            {/if}
+            {if $is_pay_later}
+              <p>{ts 1=$receiptFromEmail 2=$button}Click &quot;%2&quot; below to register your pledge. You will be able to modify or cancel future pledge payments at any time by logging in to your account or contacting us at %1.{/ts}</p>
+            {else}
+              <p>{ts 1=$receiptFromEmail 2=$button}Your initial pledge payment will be processed when you click &quot;%2&quot; below. You will be able to modify or cancel future pledge payments at any time by logging in to your account or contacting us at %1.{/ts}</p>
+            {/if}
           {/if}
-        {/if}
+        </div>
+        <div class="clear"></div>
       </div>
     </div>
   {/if}
@@ -204,51 +202,48 @@
         {if $pcp_is_anonymous}
           <strong>{ts}anonymously{/ts}.</strong>
         {else}
-          {ts}under the name{/ts}:
-          <strong>{$pcp_roll_nickname}</strong>
-          <br/>
+          {ts}under the name{/ts}: <strong>{$pcp_roll_nickname}</strong><br/>
           {if $pcp_personal_note}
-            {ts}With the personal note{/ts}:
-            <strong>{$pcp_personal_note}</strong>
+            {ts}With the personal note{/ts}: <strong>{$pcp_personal_note}</strong>
           {else}
             <strong>{ts}With no personal note{/ts}</strong>
           {/if}
         {/if}
-        <br/>
+        <br />
       </div>
     </div>
   {/if}
 
-    {if $billingName or $address}
-        <div class="crm-group billing_name_address-group">
-          <div class="header-dark">
+  {if $billingName or $address}
+      <div class="crm-group billing_name_address-group">
+        <div class="header-dark">
             {ts}Billing Name and Address{/ts}
-          </div>
-          <div class="crm-section no-label billing_name-section">
-            <div class="content">{$billingName}</div>
-            <div class="clear"></div>
-          </div>
-          <div class="crm-section no-label billing_address-section">
-            <div class="content">{$address|nl2br}</div>
-            <div class="clear"></div>
-          </div>
         </div>
-      {/if}
-    {if $email && !$emailExists}
-      <div class="crm-group contributor_email-group">
-        <div class="header-dark">
-          {ts}Your Email{/ts}
+        <div class="crm-section no-label billing_name-section">
+          <div class="content">{$billingName}</div>
+          <div class="clear"></div>
         </div>
-        <div class="crm-section no-label contributor_email-section">
-          <div class="content">{$email}</div>
+        <div class="crm-section no-label billing_address-section">
+          <div class="content">{$address|nl2br}</div>
           <div class="clear"></div>
         </div>
       </div>
     {/if}
+  {if !$emailExists && $email}
+    <div class="crm-group contributor_email-group">
+      <div class="header-dark">
+        {ts}Your Email{/ts}
+      </div>
+      <div class="crm-section no-label contributor_email-section">
+        <div class="content">{$email}</div>
+        <div class="clear"></div>
+      </div>
+    </div>
+  {/if}
 
   {* Show credit or debit card section for 'direct' mode, except for PayPal Express (detected because credit card number is empty) *}
+  {if in_array('credit_card_number', $paymentFields) || in_array('bank_account_number', $paymentFields) && ($amount GT 0 OR $minimum_fee GT 0)}
     {crmRegion name="contribution-confirm-billing-block"}
-    {if in_array('credit_card_number', $paymentFields) || in_array('bank_account_number', $paymentFields)}
       <div class="crm-group credit_card-group">
         {if $paymentFieldsetLabel}
           <div class="header-dark">
@@ -257,10 +252,10 @@
         {/if}
         {if in_array('bank_account_number', $paymentFields) && $bank_account_number}
           <div class="display-block">
-            {ts}Account Holder{/ts}: {$account_holder}<br/>
-            {ts}Bank Account Number{/ts}: {$bank_account_number}<br/>
-            {ts}Bank Identification Number{/ts}: {$bank_identification_number}<br/>
-            {ts}Bank Name{/ts}: {$bank_name}<br/>
+            {ts}Account Holder{/ts}: {$account_holder}<br />
+            {ts}Bank Identification Number{/ts}: {$bank_identification_number}<br />
+            {ts}Bank Name{/ts}: {$bank_name}<br />
+            {ts}Bank Account Number{/ts}: {$bank_account_number}<br />
           </div>
           {if $paymentAgreementText}
             <div class="crm-group debit_agreement-group">
@@ -282,8 +277,8 @@
           </div>
         {/if}
       </div>
-    {/if}
     {/crmRegion}
+  {/if}
 
   {include file="CRM/Contribute/Form/Contribution/PremiumBlock.tpl" context="confirmContribution" showPremiumSelectionFields=false preview=false}
 
diff --git a/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl b/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
index 04cd616d8e85..b91dbb3404da 100644
--- a/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
@@ -26,30 +26,14 @@
         {/if}
       {/if}
     </div>
-
   {strip}
-    <table id="membership-listings">
+    <div id="membership-listings">
       {foreach from=$membershipTypes item=row}
-        <tr valign="top">
-          <td style="width: auto;">
-                <span class="bold">{$row.name} &nbsp;
-                </span><br />
-            {$row.description} &nbsp;
-          </td>
-
-          <td style="width: auto;">
-          </td>
-        </tr>
-
+        <p>
+          <strong>{$row.name}</strong>
+          <br>{$row.description}
+        </p>
       {/foreach}
-      {if array_key_exists('auto_renew', $form)}
-        <tr id="allow_auto_renew">
-          <td style="width: auto;">{$form.auto_renew.html}</td>
-          <td style="width: auto;">
-            {$form.auto_renew.label}
-          </td>
-        </tr>
-      {/if}
-    </table>
+    </div>
   {/strip}
 {/if}
diff --git a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
index 5dcd0f0f48dd..eab284a81160 100644
--- a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
@@ -10,7 +10,7 @@
 {if $action & 1024}
   {include file="CRM/Contribute/Form/Contribution/PreviewHeader.tpl"}
 {/if}
-
+{* Please keep Confirm.tpl and ThankYou.tpl somewhat in sync *}
 <div class="crm-contribution-page-id-{$contributionPageID} crm-block crm-contribution-thankyou-form-block" data-page-id="{$contributionPageID}" data-page-template="thankyou">
   {if $thankyou_text}
     <div id="thankyou_text" class="crm-section thankyou_text-section">
@@ -78,135 +78,138 @@
         {if !$membershipBlock AND $amount OR ($priceSetID and $lineItem)}{ts}Contribution Information{/ts}{else}{ts}Membership Fee{/ts}{/if}
       </div>
 
-      <div class="display-block">
-        {if $lineItem and $priceSetID}
-          {if !$amount}{assign var="amount" value=0}{/if}
-          {assign var="totalAmount" value=$amount}
-          {include file="CRM/Price/Page/LineItem.tpl" context="Contribution" displayLineItemFinancialType=false pricesetFieldsCount=false currencySymbol='' hookDiscount=''}
-        {elseif $membership_amount}
-          {$membership_name} {ts}Membership{/ts}: <strong>{$membership_amount|crmMoney}</strong><br />
-          {if $amount}
-            {if !$is_separate_payment}
-              {ts}Contribution Amount{/ts}: <strong>{$amount|crmMoney}</strong><br />
-            {else}
-              {ts}Additional Contribution{/ts}: <strong>{$amount|crmMoney}</strong><br />
+      <div class="crm-section no-label amount_display-section">
+        <div class="content">
+          {if $lineItem and $priceSetID}
+            {if !$amount}{assign var="amount" value=0}{/if}
+            {assign var="totalAmount" value=$amount}
+            {include file="CRM/Price/Page/LineItem.tpl" context="Contribution" displayLineItemFinancialType=false pricesetFieldsCount=false currencySymbol='' hookDiscount=''}
+          {elseif $membership_amount}
+            {$membership_name} {ts}Membership{/ts}: <strong>{$membership_amount|crmMoney}</strong><br />
+            {if $amount}
+              {if !$is_separate_payment}
+                {ts}Contribution Amount{/ts}: <strong>{$amount|crmMoney}</strong><br />
+              {else}
+                {ts}Additional Contribution{/ts}: <strong>{$amount|crmMoney}</strong><br />
+              {/if}
             {/if}
+            <strong> -------------------------------------------</strong><br />
+            {ts}Total{/ts}: <strong>{$orderTotal|crmMoney}</strong><br />
+          {else}
+            {if $totalTaxAmount}
+              {ts}Tax Amount{/ts}: <strong>{$totalTaxAmount|crmMoney}</strong><br />
+            {/if}
+            {if $installments}{ts}Installment Amount{/ts}{else}{ts}Amount{/ts}{/if}: <strong>{$amount|crmMoney:$currency}{if $amount_level} &ndash; {$amount_level}{/if}</strong>
           {/if}
-          <strong> -------------------------------------------</strong><br />
-          {ts}Total{/ts}: <strong>{$orderTotal|crmMoney}</strong><br />
-        {else}
-          {if $totalTaxAmount}
-            {ts}Tax Amount{/ts}: <strong>{$totalTaxAmount|crmMoney}</strong><br />
-          {/if}
-          {if $installments}{ts}Installment Amount{/ts}{else}{ts}Amount{/ts}{/if}: <strong>{$amount|crmMoney:$currency}{if $amount_level} &ndash; {$amount_level}{/if}</strong>
-        {/if}
 
-        {if $receive_date}
-          {ts}Date{/ts}: <strong>{$receive_date|crmDate}</strong><br />
-        {/if}
-        {if $trxn_id}
-          {ts}Transaction #{/ts}: {$trxn_id}<br />
-        {/if}
-        {if $membership_trx_id}
-          {ts}Membership Transaction #{/ts}: {$membership_trx_id}
-        {/if}
+          {if $receive_date}
+            {ts}Date{/ts}: <strong>{$receive_date|crmDate}</strong><br />
+          {/if}
+          {if $trxn_id}
+            {ts}Transaction #{/ts}: {$trxn_id}<br />
+          {/if}
+          {if $membership_trx_id}
+            {ts}Membership Transaction #{/ts}: {$membership_trx_id}
+          {/if}
 
-        {* Recurring contribution / pledge information *}
-        {if $is_recur}
-          {if !empty($auto_renew)} {* Auto-renew membership confirmation *}
-            {crmRegion name="contribution-thankyou-recur-membership"}
-              <br />
-                {if $frequency_interval > 1}
-                  {* dev/translation#80 All 'every %1' strings are incorrectly using ts, but focusing on the most important one until we find a better fix. *}
-                  {if $frequency_unit eq 'day'}
-                    <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 days.{/ts}</strong>
-                  {elseif $frequency_unit eq 'week'}
-                    <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 weeks.{/ts}</strong>
-                  {elseif $frequency_unit eq 'month'}
-                    <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 months.{/ts}</strong>
-                  {elseif $frequency_unit eq 'year'}
-                    <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 years.{/ts}</strong>
+          {* Recurring contribution / pledge information *}
+          {if $is_recur}
+            {if !empty($auto_renew)} {* Auto-renew membership confirmation *}
+              {crmRegion name="contribution-thankyou-recur-membership"}
+                <p>
+                  {if $frequency_interval > 1}
+                    {* dev/translation#80 All 'every %1' strings are incorrectly using ts, but focusing on the most important one until we find a better fix. *}
+                    {if $frequency_unit eq 'day'}
+                      <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 days.{/ts}</strong>
+                    {elseif $frequency_unit eq 'week'}
+                      <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 weeks.{/ts}</strong>
+                    {elseif $frequency_unit eq 'month'}
+                      <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 months.{/ts}</strong>
+                    {elseif $frequency_unit eq 'year'}
+                      <strong>{ts 1=$frequency_interval 2=$frequency_unit}This membership will be renewed automatically every %1 years.{/ts}</strong>
+                    {/if}
+                  {else}
+                    {* dev/translation#80 All 'every %1' strings are incorrectly using ts, but focusing on the most important one until we find a better fix. *}
+                    {if $frequency_unit eq 'day'}
+                      <strong>{ts}This membership will be renewed automatically every day.{/ts}</strong>
+                    {elseif $frequency_unit eq 'week'}
+                      <strong>{ts}This membership will be renewed automatically every week.{/ts}</strong>
+                    {elseif $frequency_unit eq 'month'}
+                      <strong>{ts}This membership will be renewed automatically every month.{/ts}</strong>
+                    {elseif $frequency_unit eq 'year'}
+                      <strong>{ts}This membership will be renewed automatically every year.{/ts}</strong>
+                    {/if}
+                  {/if}
+                </p>
+                <div class="description crm-auto-renew-cancel-info">{ts}You will receive an email receipt which includes information about how to cancel the auto-renewal option.{/ts}</div>
+              {/crmRegion}
+            {else}
+              {crmRegion name="contribution-thankyou-recur"}
+                {if $installments > 1}
+                  {if $frequency_interval > 1}
+                    {if $frequency_unit eq 'day'}
+                      <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 days for a total %3 installments (including this initial contribution).{/ts}</strong></p>
+                    {elseif $frequency_unit eq 'week'}
+                      <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 weeks for a total %3 installments (including this initial contribution).{/ts}</strong></p>
+                    {elseif $frequency_unit eq 'month'}
+                      <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 months for a total %3 installments (including this initial contribution).{/ts}</strong></p>
+                    {elseif $frequency_unit eq 'year'}
+                      <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 years for a total %3 installments (including this initial contribution).{/ts}</strong></p>
+                    {/if}
+                  {else}
+                    <p><strong>{ts 1=$frequency_unit 2=$installments}This recurring contribution will be automatically processed every %1 for a total %2 installments (including this initial contribution).{/ts}</strong></p>
                   {/if}
                 {else}
-                  {* dev/translation#80 All 'every %1' strings are incorrectly using ts, but focusing on the most important one until we find a better fix. *}
-                  {if $frequency_unit eq 'day'}
-                    <strong>{ts}This membership will be renewed automatically every day.{/ts}</strong>
-                  {elseif $frequency_unit eq 'week'}
-                    <strong>{ts}This membership will be renewed automatically every week.{/ts}</strong>
-                  {elseif $frequency_unit eq 'month'}
-                    <strong>{ts}This membership will be renewed automatically every month.{/ts}</strong>
-                  {elseif $frequency_unit eq 'year'}
-                    <strong>{ts}This membership will be renewed automatically every year.{/ts}</strong>
+                  {if $frequency_interval > 1}
+                    {if $frequency_unit eq 'day'}
+                      <p><strong>{ts 1=$frequency_interval}This recurring contribution will be automatically processed every %1 days.{/ts}</strong></p>
+                    {elseif $frequency_unit eq 'week'}
+                      <p><strong>{ts 1=$frequency_interval}This recurring contribution will be automatically processed every %1 weeks.{/ts}</strong></p>
+                    {elseif $frequency_unit eq 'month'}
+                      <p><strong>{ts 1=$frequency_interval}This recurring contribution will be automatically processed every %1 months.{/ts}</strong></p>
+                    {elseif $frequency_unit eq 'year'}
+                      <p><strong>{ts 1=$frequency_interval}This recurring contribution will be automatically processed every %1 years.{/ts}</strong></p>
+                    {/if}
+                  {else}
+                    {* dev/translation#32 All 'every %1' strings are incorrectly using ts, but focusing on the most important one until we find a better fix. *}
+                    {if $frequency_unit eq 'day'}
+                      <p><strong>{ts}This contribution will be automatically processed every day.{/ts}</strong></p>
+                    {elseif $frequency_unit eq 'week'}
+                      <p><strong>{ts}This contribution will be automatically processed every week.{/ts}</strong></p>
+                    {elseif $frequency_unit eq 'month'}
+                      <p><strong>{ts}This contribution will be automatically processed every month.{/ts}</strong></p>
+                    {elseif $frequency_unit eq 'year'}
+                      <p><strong>{ts}This contribution will be automatically processed every year.{/ts}</strong></p>
+                    {/if}
                   {/if}
                 {/if}
-              <div class="description crm-auto-renew-cancel-info">({ts}You will receive an email receipt which includes information about how to cancel the auto-renewal option.{/ts})</div>
-            {/crmRegion}
-          {else}
-            {crmRegion name="contribution-thankyou-recur"}
-              {if $installments > 1}
-                {if $frequency_interval > 1}
-                  {if $frequency_unit eq 'day'}
-                    <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 days for a total %3 installments (including this initial contribution).{/ts}</strong></p>
-                  {elseif $frequency_unit eq 'week'}
-                    <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 weeks for a total %3 installments (including this initial contribution).{/ts}</strong></p>
-                  {elseif $frequency_unit eq 'month'}
-                    <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 months for a total %3 installments (including this initial contribution).{/ts}</strong></p>
-                  {elseif $frequency_unit eq 'year'}
-                    <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 years for a total %3 installments (including this initial contribution).{/ts}</strong></p>
-                  {/if}
-                {else}
-                  <p><strong>{ts 1=$frequency_unit 2=$installments}This recurring contribution will be automatically processed every %1 for a total %2 installments (including this initial contribution).{/ts}</strong></p>
+                {if $is_email_receipt}
+                  <p>
+                    {ts}You will receive an email receipt which includes information about how to update or cancel this recurring contribution.{/ts}
+                  </p>
                 {/if}
+              {/crmRegion}
+            {/if}
+          {/if}
+          {if $is_pledge}
+            {if $pledge_frequency_interval GT 1}
+              <p><strong>{ts 1=$pledge_frequency_interval 2=$pledge_frequency_unit 3=$pledge_installments}I pledge to contribute this amount every %1 %2s for %3 installments.{/ts}</strong></p>
+            {else}
+              <p><strong>{ts 1=$pledge_frequency_interval 2=$pledge_frequency_unit 3=$pledge_installments}I pledge to contribute this amount every %2 for %3 installments.{/ts}</strong></p>
+            {/if}
+            <p>
+              {if $is_pay_later}
+                {ts 1=$receiptFromEmail}We will record your initial pledge payment when we receive it from you. You will be able to modify or cancel future pledge payments at any time by logging in to your account or contacting us at %1.{/ts}
               {else}
-                {if $frequency_interval > 1}
-                  {if $frequency_unit eq 'day'}
-                    <p><strong>{ts 1=$frequency_interval}This recurring contribution will be automatically processed every %1 days.{/ts}</strong></p>
-                  {elseif $frequency_unit eq 'week'}
-                    <p><strong>{ts 1=$frequency_interval}This recurring contribution will be automatically processed every %1 weeks.{/ts}</strong></p>
-                  {elseif $frequency_unit eq 'month'}
-                    <p><strong>{ts 1=$frequency_interval}This recurring contribution will be automatically processed every %1 months.{/ts}</strong></p>
-                  {elseif $frequency_unit eq 'year'}
-                    <p><strong>{ts 1=$frequency_interval}This recurring contribution will be automatically processed every %1 years.{/ts}</strong></p>
-                  {/if}
-                {else}
-                  {* dev/translation#32 All 'every %1' strings are incorrectly using ts, but focusing on the most important one until we find a better fix. *}
-                  {if $frequency_unit eq 'day'}
-                    <p><strong>{ts}This contribution will be automatically processed every day.{/ts}</strong></p>
-                  {elseif $frequency_unit eq 'week'}
-                    <p><strong>{ts}This contribution will be automatically processed every week.{/ts}</strong></p>
-                  {elseif $frequency_unit eq 'month'}
-                    <p><strong>{ts}This contribution will be automatically processed every month.{/ts}</strong></p>
-                  {elseif $frequency_unit eq 'year'}
-                    <p><strong>{ts}This contribution will be automatically processed every year.{/ts}</strong></p>
-                  {/if}
-                {/if}
+                {ts 1=$receiptFromEmail}Your initial pledge payment has been processed. You will be able to modify or cancel future pledge payments at any time by contacting us at %1.{/ts}
               {/if}
-              {if $is_email_receipt}
-                <p>
-                  {ts}You will receive an email receipt which includes information about how to update or cancel this recurring contribution.{/ts}
-                </p>
+              {if $max_reminders}
+                {ts 1=$initial_reminder_day}We will send you a payment reminder %1 days prior to each scheduled payment date. The reminder will include a link to a page where you can make your payment online.{/ts}
               {/if}
-            {/crmRegion}
-          {/if}
-        {/if}
-
-        {if $is_pledge}
-          {if $pledge_frequency_interval GT 1}
-            <p><strong>{ts 1=$pledge_frequency_interval 2=$pledge_frequency_unit 3=$pledge_installments}I pledge to contribute this amount every %1 %2s for %3 installments.{/ts}</strong></p>
-          {else}
-            <p><strong>{ts 1=$pledge_frequency_interval 2=$pledge_frequency_unit 3=$pledge_installments}I pledge to contribute this amount every %2 for %3 installments.{/ts}</strong></p>
+            </p>
           {/if}
-          <p>
-            {if $is_pay_later}
-              {ts 1=$receiptFromEmail}We will record your initial pledge payment when we receive it from you. You will be able to modify or cancel future pledge payments at any time by logging in to your account or contacting us at %1.{/ts}
-            {else}
-              {ts 1=$receiptFromEmail}Your initial pledge payment has been processed. You will be able to modify or cancel future pledge payments at any time by contacting us at %1.{/ts}
-            {/if}
-            {if $max_reminders}
-              {ts 1=$initial_reminder_day}We will send you a payment reminder %1 days prior to each scheduled payment date. The reminder will include a link to a page where you can make your payment online.{/ts}
-            {/if}
-          </p>
-        {/if}
+        </div>
+        <div class="clear"></div>
       </div>
     </div>
   {/if}
@@ -214,7 +217,7 @@
   {if $onbehalfProfile && $onbehalfProfile|@count}
     <div class="crm-group onBehalf_display-group label-left crm-profile-view">
       {include file="CRM/UF/Form/Block.tpl" fields=$onbehalfProfile prefix='onbehalf' hideFieldset=false}
-     </div>
+    </div>
   {/if}
 
   {if $honoreeProfileFields && $honoreeProfileFields|@count}
@@ -223,12 +226,12 @@
         {$soft_credit_type}
       </div>
       <div class="display-block">
-       <div class="label-left crm-section honoree_profile-section">
+        <div class="label-left crm-section honoree_profile-section">
           <strong>{$honorName}</strong><br/>
           {include file="CRM/UF/Form/Block.tpl" fields=$honoreeProfileFields prefix='honor' hideFieldset=false}
         </div>
       </div>
-   </div>
+    </div>
   {/if}
 
   {if $customPre}
@@ -277,7 +280,7 @@
   {if !$emailExists && $email}
     <div class="crm-group contributor_email-group">
       <div class="header-dark">
-          {ts}Your Email{/ts}
+        {ts}Your Email{/ts}
       </div>
       <div class="crm-section no-label contributor_email-section">
         <div class="content">{$email}</div>
@@ -294,7 +297,7 @@
             {$paymentFieldsetLabel}
           </div>
         {/if}
-          {if in_array('bank_account_number', $paymentFields) && $bank_account_number}
+        {if in_array('bank_account_number', $paymentFields) && $bank_account_number}
           <div class="display-block">
             {ts}Account Holder{/ts}: {$account_holder}<br />
             {ts}Bank Identification Number{/ts}: {$bank_identification_number}<br />