From 358962add031241006d61f1a20194acfa0f5467d Mon Sep 17 00:00:00 2001
From: Samuele Masetto <samuele.masetto@gmail.com>
Date: Fri, 14 May 2021 19:33:34 +0200
Subject: [PATCH] fixed unit translation for recurring contributions

small fix

 double "every" and `p` tag fixed, removed final `else`
---
 .../Contribute/Form/Contribution/Confirm.tpl  | 24 +++++++---
 .../Contribute/Form/Contribution/ThankYou.tpl | 44 +++++++++++--------
 2 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
index 617dadbabc..38cc30f0ae 100644
--- a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
@@ -110,14 +110,28 @@
               {/if}
             {else}
               {if $frequency_interval > 1}
-                <p>
-                  <strong>{ts 1=$frequency_interval 2=$frequency_unit}I want to contribute this amount every %1 %2s.{/ts}</strong>
-                </p>
+                {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}
               {else}
-                <p><strong>{ts 1=$frequency_unit }I want to contribute this amount every %1.{/ts}</strong></p>
+                {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 processed every week.{/ts}</strong></p>
+                {elseif $frequency_unit eq 'month'}
+                  <p><strong>{ts}I want to contribute this amount processed every month.{/ts}</strong></p>
+                {elseif $frequency_unit eq 'year'}
+                  <p><strong>{ts}I want to contribute this amount processed every year.{/ts}</strong></p>
+                {/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>
+            <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}
diff --git a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
index a8b6de9a84..2943825169 100644
--- a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
@@ -133,29 +133,37 @@
                 {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>
                 {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>
+                  <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}
-                  {if $frequency_interval > 1}
-                    <p><strong>{ts 1=$frequency_interval 2=$frequency_unit}This recurring contribution will be automatically processed every %1 %2s.{/ts}</strong></p>
-                  {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}
+                  {* 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}
-                  <p>
-                  {if $is_email_receipt}
-                    {ts}You will receive an email receipt which includes information about how to update or cancel this recurring contribution.{/ts}
-                  {/if}
+              {/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}
             {/crmRegion}
           {/if}
         {/if}
-- 
2.25.1