From 6687af3bb0526a05ed6304a197e2060986a6293b Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Fri, 28 Nov 2014 12:18:44 +1300
Subject: [PATCH] CRM-15659 - Contribution Thank you page says ' will be
 processed every 1 week(s)'

Conflicts:
	templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
---
 .../CRM/Contribute/Form/Contribution/ThankYou.tpl  | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
index 598a604859..a26f7ed925 100644
--- a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
@@ -138,11 +138,19 @@
 {/crmRegion}
                 {else}
 {crmRegion name="contribution-thankyou-recur"}
-                    {if $installments}
-                 <p><strong>{ts 1=$frequency_interval 2=$frequency_unit 3=$installments}This recurring contribution will be automatically processed every %1 %2(s) for a total %3 installments (including this initial contribution).{/ts}</strong></p>
+                  {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>
                     {else}
-                        <p><strong>{ts 1=$frequency_interval 2=$frequency_unit}This recurring contribution will be automatically processed every %1 %2(s).{/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}
+                      <p><strong>{ts 1=$frequency_interval 2=$frequency_unit}This recurring contribution will be automatically processed every %1 %2s.{/ts}</strong></p>
+                    {else}
+                      <p><strong>{ts 1=$frequency_unit}This recurring contribution will be automatically processed every %1.{/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}
-- 
2.25.1