Tiny typo I noticed... 2FA ack email says 'hasbeen' not 'has been'

furicle commented 1 year ago

Steps to reproduce the problem

Turn on 2FA, and it emails you an acknowledgement (quite nice!)

But the ack email has a tiny typo - hasbeen run all together typo

Expected behaviour

Perfect Canadian English

Actual behaviour

Something suspiciously American looking (kidding)

Detailed description

The same typo is present in both the plain text AND html in the email

`Subject: Mastodon: Two-factor authentication enabled

[Mastodon] https://botsin.space/ [https://botsin.space/packs/media/images/mailer/icon_lock_open-8e5ae4f888e6= ea016e3046b607314d02.png] 2FA enabled

Two-factor authentication hasbeen enabled for your account. A token generat= ed by the paired TOTP app will be required for login.

Account settings https://botsin.space/auth/edit

Mastodon hosted on botsin.space

Change e-mail preferenceshttps://botsin.space/settings/preferences/notific= ations

[Mastodon] https://botsin.space/ `

<p class=3D"x_lead" style=3D"font-family:"mastodon-font-sans-serif&quo= t;,sans-serif!important; font-size:19px; line-height:27px; color:#9baec8; d= isplay:block; margin-top:0; margin-bottom:16px"> Two-factor authentication hasbeen enabled for your account. A token generat= ed by the paired TOTP app will be required for login.</p>

Specifications

I'm not certain how to determine what software is running on the system that sends me email. I noticed this issue on July 12th, 2023

vmstan commented 1 year ago

I can't find anywhere in the code where "hasbeen" appears. Possible it's in one of the upstream 2FA modules?

vmstan commented 1 year ago

I think this is already fixed in main.

mjankowski commented 1 year ago

The i18n string in question was added here as "has been" - https://github.com/mastodon/mastodon/commit/e1066cd4319a220d5be16e51ffaf5236a2f6e866#diff-d733cfb37ae18c03440b09d8f63bc1147ff3f379dc5a5f2fc004e310512e5adbR54 - and has never been changed.

My guess is this email is being sent correctly but somewhere between your mail server and email client there's some reformatting happening that's causing the issue.

Could you "view source" on the email, and then paste the whole thing in, making sure this time to correctly escape the markdown so it all comes through as plain text?

furicle commented 1 year ago

Sorry, just tripped over this thread again. There sure seems like there's something odd going on with Outlook.com/Firefox here....

If I do a view source on the message from Jul 12, today, it is wrong in the html, but not the plain text portion. That contradicts what I saw before, and it's the same email message?

html

<table cellpadding=3D"0" cellspacing=3D"0" class=3D"column" style=3D"box-si=

zing: border-box; border-spacing: 0; mso-table-lspace: 0; mso-table-rspace:=

 0; width: 100%; min-width: 100%;">=0D

<tbody>=0D

<tr>=0D

<td class=3D"column-cell text-center padded" style=3D"box-sizing: border-bo=

x; line-height: 23px; width: 100%; min-width: 100%; font-family: &quot;mast=

odon-font-sans-serif&quot;,sans-serif !important; font-size: 15px; color: #=

9baec8; mso-line-height-rule: exactly; text-rendering: optimizelegibility; =

padding: 16px 0;" align=3D"center" valign=3D"top">=0D

<table align=3D"center" cellpadding=3D"0" cellspacing=3D"0" class=3D"hero-i=

con" style=3D"box-sizing: border-box; border-spacing: 0; mso-table-lspace: =

0; mso-table-rspace: 0; width: 64px;">=0D

<tbody>=0D

<tr>=0D

<td style=3D"box-sizing: border-box; line-height: 100%; font-family: &quot;=

mastodon-font-sans-serif&quot;,sans-serif !important; mso-line-height-rule:=

 exactly; border-radius: 80px; padding: 16px;" align=3D"center" bgcolor=3D"=

#79bd9a" valign=3D"middle">=0D

<img alt=3D"" src=3D"https://botsin.space/packs/media/images/mailer/icon_lo=

ck_open-8e5ae4f888e6ea016e3046b607314d02.png" style=3D"outline: none; text-=

decoration: none; -ms-interpolation-mode: bicubic; clear: both; line-height=

: 100%; max-width: 32px; width: 32px; height: 32px; display: block; border-=

width: 0;">=0D

</td>=0D

</tr>=0D

</tbody>=0D

</table>=0D

<h1 style=3D"color: #d9e1e8; font-weight: 500; font-size: 26px; line-height=

: 36px; margin: 20px 0 8px; padding: 0;">2FA enabled</h1>=0D

<p class=3D"lead" style=3D"font-family: &quot;mastodon-font-sans-serif&quot=

;,sans-serif !important; font-size: 19px; line-height: 27px; color: #9baec8=

; mso-line-height-rule: exactly; text-rendering: optimizelegibility; displa=

y: block; margin-top: 0; margin-bottom: 16px;">Two-factor authentication ha=

sbeen enabled for your account. A token generated by the paired TOTP app wi=

ll be required for login.</p>=0D

</td>=0D

</tr>=0D

</tbody>=0D

</table>=0D

</div>=0D

</div>=0D

</td>=0D

</tr>=0D

</tbody>=0D

</table>=0D

No, I have no idea why that's so odd looking.

Here's the plain text portion


----==_mimepart_64aee988b61e9_25583181375325a

Content-Type: text/plain;

 charset=UTF-8

Content-Transfer-Encoding: 7bit

2FA enabled

===

Two-factor authentication has been enabled for your account. A token generated by the paired TOTP app will be required for login.

=> https://botsin.space/auth/edit

---

Mastodon hosted on botsin.space

Change e-mail preferences: https://botsin.space/settings/preferences

----==_mimepart_64aee988b61e9_25583181375325a

mastodon / mastodon