Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev/core#1010 pledge_acknowledge template - capitalization and greeting #14465

Merged
merged 1 commit into from
Jun 6, 2019

Conversation

philmb
Copy link
Contributor

@philmb philmb commented Jun 6, 2019

Overview

Pledge Acknowledgements have incorrect capitalization in greetings, and greetings do not use email_greeting.

Before

dear DisplayName
thank you....

After

Uses Email_Greeting and fixes capitalization

Technical Details

https://lab.civicrm.org/dev/core/issues/1010

Comments

Not sure what version to use in MessageTemplates.php.

Pledge Acknowledgements have incorrect capitalization in greetings, and greetings do not use email_greeting.
@civicrm-builder
Copy link

Can one of the admins verify this patch?

@civibot
Copy link

civibot bot commented Jun 6, 2019

(Standard links)

@civibot civibot bot added the master label Jun 6, 2019
@totten
Copy link
Member

totten commented Jun 6, 2019

jenkins, ok to test

@eileenmcnaughton
Copy link
Contributor

@philmb well done - I'm gonna add a couple of inline comments

@@ -1,4 +1,4 @@
{ts 1=$contact.display_name}Dear %1{/ts},
{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}<p>{$greeting},</p>{/if}

{ts}Thank you for your generous pledge. Please print this acknowledgment for your records.{/ts}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove this " Please print this acknowledgment for your records." too while we are at it - there is a gitlab somewhere but summary is it's not environmental

@@ -112,6 +112,15 @@ protected function getTemplateUpdates() {
['name' => 'payment_or_refund_notification', 'type' => 'html'],
],
],
[
'version' => '5.14',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

version is a little tricky just because today is the day it changes - if changed right now it should be 5.15 - but later today the 5.15 rc will be cut & the master branch will be 5.16

@eileenmcnaughton
Copy link
Contributor

Actually I'm going to merge this & do those changes as a follow up - I'm concerned that 'version' is a moving target today so I want to wrap this up before it moves!

@eileenmcnaughton eileenmcnaughton merged commit b5355dd into civicrm:master Jun 6, 2019
@eileenmcnaughton
Copy link
Contributor

@philmb Oh one more thing - getting adding to Contributors is DIY - wanna do a PR on Contributors.yml?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
4 participants