227213 - Chomping murder in token emails and pages

Status: RESOLVED FIXED

(Bugzilla :: Email Notifications, defect)

Description

[Christian Reis]

Trivial chomping issue when receiving token emails: 

If you do nothing, the request will lapse after3 days
(17:16 on the  4th of December, 2003) or when you log in successfully.

I've found two instances. Patch coming up.

Comment 1

[Christian Reis]

Attachment: part 1: messages.html.tmpl

I've found a couple of errors, so I'll add multiple patches. Here's a trivial
one for messages.html.tmpl.

Comment 2

[Christian Reis]

Comment on attachment 136609 [details] [diff] [review]
part 1: messages.html.tmpl

This covers errors in some of the messages that are displayed after the token
email is generated, as well as some code that suffers from the same problem in
that file. It's tiny and limited to adding +s to [%s.

Comment 3

[Christian Reis]

Attachment: part 2: fix email messages

This second patch covers the email messages. Template-only, though I did two
minor changes to wording. Tested to fix problem.

Comment 4

[Christian Reis]

Comment on attachment 136611 [details] [diff] [review]
part 2: fix email messages

I made sure we are consistently using [%+ where it could become a potential
problem after template customization/editing.

Comment 5

[Christian Reis]

Attachment: part 1, take 2: be consistent about "for account XXX"

Bother. Since I decided to fix "for the kiko@foo account" to (IMO correctly)
read "for the account kiko@foo" in part 2, here goes a consistent part 1.
Consistency is a hobgoblin, etc etc.

Comment 6

[Dave Miller [:justdave]]

*** Bug 226527 has been marked as a duplicate of this bug. ***

Comment 7

[Christian Reis]

I've taken the liberty to add tje "You have ..." correction locally, should I
add part 2, take 2 or fix it while landing?

Comment 8

[Jouni Heikniemi]

>I've taken the liberty to add tje "You have ..." correction locally, should I
>add part 2, take 2 or fix it while landing?

I don't know what you're talking about, so I suggest giving us a new patch. If
Jaypee or Dave can review this without seeing the change you mentioned, fine
with me. :-)

Comment 9

[Jouni Heikniemi]

Comment on attachment 136613 [details] [diff] [review]
part 1, take 2: be consistent about "for account XXX" 

r=jouni, but why we're using |FILTER html| in text messages (not like it was
you who added them, though)?

Comment 10

[Christian Reis]

I think the reason is that there is just no other filter applicable. From
http://template-toolkit.org/docs/default/Modules/Template/Filters.html 
I see that the html filter (which is basically what we do, along with swapping
@s for @s) just entitizes.

Jouni pointed out over IRC that perhaps an HTML email client will know how to
render them, but I always thought that text email was always rendered literally.

If someone has a strong opinion over it, I can remove the filters.

Comment 11

[Christian Reis]

Jouni, wrt my cryptic "You have" comment: 

The text at the beginning of forgotten-password was changed by justdave in bug
226527 to say "You have (or someone ... has)" which is gramatically "more
correct"  -- I forgot to add it to attachment 136611 [details] [diff] [review] but I've added it locally
and I'll commit it when/if this is approved.

Comment 12

[Jouni Heikniemi]

Comment on attachment 136611 [details] [diff] [review]
part 2: fix email messages

Ok, that wording change by Dave is fine with me. r=jouni

Comment 13

[Christian Reis]

Justdave, let's get this in for the bmo updates, shall we? 

Comment 14

[Christian Reis]

Thanks! One more bites the dust: 

/cvsroot/mozilla/webtools/bugzilla/template/en/default/account/email/change-new.txt.tmpl,v
 <--  change-new.txt.tmpl
new revision: 1.5; previous revision: 1.4
/cvsroot/mozilla/webtools/bugzilla/template/en/default/account/email/change-old.txt.tmpl,v
 <--  change-old.txt.tmpl
new/cvsroot/mozilla/webtools/bugzilla/template/en/default/account/password/forgotten-password.txt.tmpl,v
 <--  forgotten-password.txt.tmpl
new revision: 1.4; previous revision: 1.3
 revision: 1.6; previous revision: 1.5
/cvsroot/mozilla/webtools/bugzilla/template/en/default/global/messages.html.tmpl,v
 <--  messages.html.tmpl
new revision: 1.18; previous revision: 1.17