From d17f52df9d8e484d5624b87657ff84295563f856 Mon Sep 17 00:00:00 2001 From: Princi Vershwal Date: Tue, 19 Nov 2024 16:13:32 +0530 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20words=20breaking=20to=20?= =?UTF-8?q?new=20line=20in=20emails=20on=20mobile=20(#21652)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes https://linear.app/ghost/issue/DES-977/word-breaks-to-new-line-on-mobile-for-new-member-sign-up-email - word-break is not required in the text "You can also copy & paste this URL into your browser:", so removed it - word-break should be used in case of urls. No change in this - Observed this patter across multiple email templates. Fixed all. --- .../comments/email-templates/new-comment-reply.hbs | 2 +- .../comments/email-templates/new-comment.hbs | 2 +- .../services/comments/email-templates/report.hbs | 2 +- .../core/server/services/members/emails/signin.js | 2 +- .../server/services/members/emails/signup-paid.js | 2 +- .../core/server/services/members/emails/signup.js | 2 +- .../server/services/members/emails/subscribe.js | 2 +- .../server/services/members/emails/update-email.js | 2 +- .../services/newsletters/emails/verify-email.js | 2 +- .../services/settings/emails/verify-email.js | 2 +- .../admin/__snapshots__/members.test.js.snap | 2 +- .../admin/__snapshots__/newsletters.test.js.snap | 14 +++++++------- .../recommendation-emails.test.js.snap | 6 +++--- .../settings-bread-service.test.js.snap | 2 +- .../lib/email-templates/mention-report.hbs | 2 +- .../lib/email-templates/new-free-signup.hbs | 2 +- .../lib/email-templates/new-paid-cancellation.hbs | 2 +- .../lib/email-templates/new-paid-started.hbs | 2 +- .../email-templates/recommendation-received.hbs | 2 +- 19 files changed, 27 insertions(+), 27 deletions(-) diff --git a/ghost/core/core/server/services/comments/email-templates/new-comment-reply.hbs b/ghost/core/core/server/services/comments/email-templates/new-comment-reply.hbs index a615121433..a8042b99d3 100644 --- a/ghost/core/core/server/services/comments/email-templates/new-comment-reply.hbs +++ b/ghost/core/core/server/services/comments/email-templates/new-comment-reply.hbs @@ -166,7 +166,7 @@
-

You can also copy & paste this URL into your browser:

+

You can also copy & paste this URL into your browser:

{{postUrl}}#ghost-comments

diff --git a/ghost/core/core/server/services/comments/email-templates/new-comment.hbs b/ghost/core/core/server/services/comments/email-templates/new-comment.hbs index 4d67270404..b818531a5e 100644 --- a/ghost/core/core/server/services/comments/email-templates/new-comment.hbs +++ b/ghost/core/core/server/services/comments/email-templates/new-comment.hbs @@ -166,7 +166,7 @@
-

You can also copy & paste this URL into your browser:

+

You can also copy & paste this URL into your browser:

{{postUrl}}#ghost-comments

diff --git a/ghost/core/core/server/services/comments/email-templates/report.hbs b/ghost/core/core/server/services/comments/email-templates/report.hbs index 56545a5f3e..88b1517615 100644 --- a/ghost/core/core/server/services/comments/email-templates/report.hbs +++ b/ghost/core/core/server/services/comments/email-templates/report.hbs @@ -161,7 +161,7 @@
-

You can also copy & paste this URL into your browser:

+

You can also copy & paste this URL into your browser:

{{postUrl}}#ghost-comments

diff --git a/ghost/core/core/server/services/members/emails/signin.js b/ghost/core/core/server/services/members/emails/signin.js index 7940edec71..56a83584a4 100644 --- a/ghost/core/core/server/services/members/emails/signin.js +++ b/ghost/core/core/server/services/members/emails/signin.js @@ -136,7 +136,7 @@ module.exports = ({t, siteTitle, email, url, accentColor = '#15212A', siteDomain

${t('For your security, the link will expire in 24 hours time.')}

${t('See you soon!')}

-

${t('You can also copy & paste this URL into your browser:')}

+

${t('You can also copy & paste this URL into your browser:')}

${url}

diff --git a/ghost/core/core/server/services/members/emails/signup-paid.js b/ghost/core/core/server/services/members/emails/signup-paid.js index bfedf1610a..9e5fcc7dec 100644 --- a/ghost/core/core/server/services/members/emails/signup-paid.js +++ b/ghost/core/core/server/services/members/emails/signup-paid.js @@ -136,7 +136,7 @@ module.exports = ({t, siteTitle, email, url, accentColor = '#15212A', siteDomain

${t('For your security, the link will expire in 24 hours time.')}

${t('See you soon!')}

-

${t('You can also copy & paste this URL into your browser:')}

+

${t('You can also copy & paste this URL into your browser:')}

${url}

diff --git a/ghost/core/core/server/services/members/emails/signup.js b/ghost/core/core/server/services/members/emails/signup.js index a81f3c7f93..d1be5e12c3 100644 --- a/ghost/core/core/server/services/members/emails/signup.js +++ b/ghost/core/core/server/services/members/emails/signup.js @@ -136,7 +136,7 @@ module.exports = ({t, siteTitle, email, url, accentColor = '#15212A', siteDomain

${t('For your security, the link will expire in 24 hours time.')}

${t('See you soon!')}

-

${t('You can also copy & paste this URL into your browser:')}

+

${t('You can also copy & paste this URL into your browser:')}

${url}

diff --git a/ghost/core/core/server/services/members/emails/subscribe.js b/ghost/core/core/server/services/members/emails/subscribe.js index b432ca7b6a..7f241cbc10 100644 --- a/ghost/core/core/server/services/members/emails/subscribe.js +++ b/ghost/core/core/server/services/members/emails/subscribe.js @@ -136,7 +136,7 @@ module.exports = ({t, siteTitle, email, url, accentColor = '#15212A', siteDomain

${t('For your security, the link will expire in 24 hours time.')}

${t('All the best!')}

-

${t('You can also copy & paste this URL into your browser:')}

+

${t('You can also copy & paste this URL into your browser:')}

${url}

diff --git a/ghost/core/core/server/services/members/emails/update-email.js b/ghost/core/core/server/services/members/emails/update-email.js index ef946f2011..20d315aaa6 100644 --- a/ghost/core/core/server/services/members/emails/update-email.js +++ b/ghost/core/core/server/services/members/emails/update-email.js @@ -127,7 +127,7 @@ module.exports = ({t, email, url}) => `

${t('For your security, the link will expire in 24 hours time.')}

-

${t('You can also copy & paste this URL into your browser:')}

+

${t('You can also copy & paste this URL into your browser:')}

${url}

diff --git a/ghost/core/core/server/services/newsletters/emails/verify-email.js b/ghost/core/core/server/services/newsletters/emails/verify-email.js index 14238461b4..da99cdde93 100644 --- a/ghost/core/core/server/services/newsletters/emails/verify-email.js +++ b/ghost/core/core/server/services/newsletters/emails/verify-email.js @@ -135,7 +135,7 @@ module.exports = ({email, url}) => `

For your security, the link will expire in 24 hours time.

-

You can also copy & paste this URL into your browser:

+

You can also copy & paste this URL into your browser:

${url}

diff --git a/ghost/core/core/server/services/settings/emails/verify-email.js b/ghost/core/core/server/services/settings/emails/verify-email.js index 5196411498..51f4ee1085 100644 --- a/ghost/core/core/server/services/settings/emails/verify-email.js +++ b/ghost/core/core/server/services/settings/emails/verify-email.js @@ -127,7 +127,7 @@ module.exports = ({email, url}) => `

For your security, the link will expire in 24 hours time.

-

You can also copy & paste this URL into your browser:

+

You can also copy & paste this URL into your browser:

${url}

diff --git a/ghost/core/test/e2e-api/admin/__snapshots__/members.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/members.test.js.snap index 46669eaa79..c1588a2864 100644 --- a/ghost/core/test/e2e-api/admin/__snapshots__/members.test.js.snap +++ b/ghost/core/test/e2e-api/admin/__snapshots__/members.test.js.snap @@ -1769,7 +1769,7 @@ exports[`Members API Can add and send a signup confirmation email 3: [html 1] 1`

For your security, the link will expire in 24 hours time.

See you soon!

-

You can also copy & paste this URL into your browser:

+

You can also copy & paste this URL into your browser:

http://127.0.0.1:2369/members/?token=REPLACED_TOKEN&action=signup

diff --git a/ghost/core/test/e2e-api/admin/__snapshots__/newsletters.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/newsletters.test.js.snap index d97120bc4b..de5816d09f 100644 --- a/ghost/core/test/e2e-api/admin/__snapshots__/newsletters.test.js.snap +++ b/ghost/core/test/e2e-api/admin/__snapshots__/newsletters.test.js.snap @@ -476,7 +476,7 @@ exports[`Newsletters API Can add a newsletter - with custom sender_email 4: [htm

For your security, the link will expire in 24 hours time.

-

You can also copy & paste this URL into your browser:

+

You can also copy & paste this URL into your browser:

http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN

@@ -723,7 +723,7 @@ exports[`Newsletters API Can add a newsletter - with custom sender_email and sub

For your security, the link will expire in 24 hours time.

-

You can also copy & paste this URL into your browser:

+

You can also copy & paste this URL into your browser:

http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN

@@ -911,7 +911,7 @@ exports[`Newsletters API Can add a newsletter - with custom sender_email and sub

For your security, the link will expire in 24 hours time.

-

You can also copy & paste this URL into your browser:

+

You can also copy & paste this URL into your browser:

http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN

@@ -1533,7 +1533,7 @@ exports[`Newsletters API Can edit a newsletters and update the sender_email when

For your security, the link will expire in 24 hours time.

-

You can also copy & paste this URL into your browser:

+

You can also copy & paste this URL into your browser:

http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN

@@ -2321,7 +2321,7 @@ exports[`Newsletters API Can verify property updates 2: [html 1] 1`] = `

For your security, the link will expire in 24 hours time.

-

You can also copy & paste this URL into your browser:

+

You can also copy & paste this URL into your browser:

http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN

@@ -3416,7 +3416,7 @@ exports[`Newsletters API Managed email with custom sending domain Can set newsle

For your security, the link will expire in 24 hours time.

-

You can also copy & paste this URL into your browser:

+

You can also copy & paste this URL into your browser:

http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN

@@ -4773,7 +4773,7 @@ exports[`Newsletters API Managed email without custom sending domain Can set new

For your security, the link will expire in 24 hours time.

-

You can also copy & paste this URL into your browser:

+

You can also copy & paste this URL into your browser:

http://127.0.0.1:2369/ghost/#/settings/newsletters/?verifyEmail=REPLACED_TOKEN

diff --git a/ghost/core/test/e2e-server/services/__snapshots__/recommendation-emails.test.js.snap b/ghost/core/test/e2e-server/services/__snapshots__/recommendation-emails.test.js.snap index a40dc54480..4ff46bba73 100644 --- a/ghost/core/test/e2e-server/services/__snapshots__/recommendation-emails.test.js.snap +++ b/ghost/core/test/e2e-server/services/__snapshots__/recommendation-emails.test.js.snap @@ -181,7 +181,7 @@ table.body a.small { -

Or copy and paste this URL into your browser:

+

Or copy and paste this URL into your browser:

http://127.0.0.1:2369/ghost/#/settings/recommendations

@@ -426,7 +426,7 @@ table.body a.small { -

Or copy and paste this URL into your browser:

+

Or copy and paste this URL into your browser:

http://127.0.0.1:2369/ghost/#/settings/recommendations

@@ -649,7 +649,7 @@ table.body a.small { -

Or copy and paste this URL into your browser:

+

Or copy and paste this URL into your browser:

http://127.0.0.1:2369/ghost/#/settings/recommendations

diff --git a/ghost/core/test/unit/server/services/settings/__snapshots__/settings-bread-service.test.js.snap b/ghost/core/test/unit/server/services/settings/__snapshots__/settings-bread-service.test.js.snap index 2426f5b0a9..24e057e694 100644 --- a/ghost/core/test/unit/server/services/settings/__snapshots__/settings-bread-service.test.js.snap +++ b/ghost/core/test/unit/server/services/settings/__snapshots__/settings-bread-service.test.js.snap @@ -130,7 +130,7 @@ exports[`UNIT > Settings BREAD Service: edit setting members_support_address tri

For your security, the link will expire in 24 hours time.

-

You can also copy & paste this URL into your browser:

+

You can also copy & paste this URL into your browser:

http://127.0.0.1:2369/ghost/#/settings/portal/edit?verifyEmail=test

diff --git a/ghost/staff-service/lib/email-templates/mention-report.hbs b/ghost/staff-service/lib/email-templates/mention-report.hbs index 83d62a832a..e2f1f4d308 100644 --- a/ghost/staff-service/lib/email-templates/mention-report.hbs +++ b/ghost/staff-service/lib/email-templates/mention-report.hbs @@ -100,7 +100,7 @@
-

You can also copy & paste this URL into your browser:

+

You can also copy & paste this URL into your browser:

{{siteUrl}}ghost/#/mentions

diff --git a/ghost/staff-service/lib/email-templates/new-free-signup.hbs b/ghost/staff-service/lib/email-templates/new-free-signup.hbs index db82aa1f51..97d0058416 100644 --- a/ghost/staff-service/lib/email-templates/new-free-signup.hbs +++ b/ghost/staff-service/lib/email-templates/new-free-signup.hbs @@ -78,7 +78,7 @@ -

Or copy and paste this URL into your browser:

+

Or copy and paste this URL into your browser:

{{memberData.adminUrl}}

diff --git a/ghost/staff-service/lib/email-templates/new-paid-cancellation.hbs b/ghost/staff-service/lib/email-templates/new-paid-cancellation.hbs index 5d0aabb3d3..cf0e4db001 100644 --- a/ghost/staff-service/lib/email-templates/new-paid-cancellation.hbs +++ b/ghost/staff-service/lib/email-templates/new-paid-cancellation.hbs @@ -85,7 +85,7 @@ -

Or copy and paste this URL into your browser:

+

Or copy and paste this URL into your browser:

{{memberData.adminUrl}}

diff --git a/ghost/staff-service/lib/email-templates/new-paid-started.hbs b/ghost/staff-service/lib/email-templates/new-paid-started.hbs index 38cc764c65..0817572d8f 100644 --- a/ghost/staff-service/lib/email-templates/new-paid-started.hbs +++ b/ghost/staff-service/lib/email-templates/new-paid-started.hbs @@ -84,7 +84,7 @@ -

Or copy and paste this URL into your browser:

+

Or copy and paste this URL into your browser:

{{memberData.adminUrl}}

diff --git a/ghost/staff-service/lib/email-templates/recommendation-received.hbs b/ghost/staff-service/lib/email-templates/recommendation-received.hbs index ca81863d79..f1ca895e41 100644 --- a/ghost/staff-service/lib/email-templates/recommendation-received.hbs +++ b/ghost/staff-service/lib/email-templates/recommendation-received.hbs @@ -114,7 +114,7 @@ -

Or copy and paste this URL into your browser:

+

Or copy and paste this URL into your browser:

{{siteUrl}}ghost/#/settings/recommendations