Skip to content

Commit 24519cf

Browse files
committed
🐛 Fixed CI breakages for Portal native share
ref #26866 Bumped @tryghost/portal version, aligned share action order with spec, and regenerated portal locale keys required by i18n checks.
1 parent 76b2be4 commit 24519cf

63 files changed

Lines changed: 140 additions & 20 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/portal/src/components/pages/share-modal.js‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -293,20 +293,16 @@ export const ShareModalStyles = `
293293
order: 2;
294294
}
295295
296-
.gh-portal-share-action.threads {
297-
order: 3;
298-
}
299-
300296
.gh-portal-share-action.facebook {
301-
order: 4;
297+
order: 3;
302298
}
303299
304300
.gh-portal-share-action.email {
305-
order: 5;
301+
order: 4;
306302
}
307303
308304
.gh-portal-share-action.more {
309-
order: 6;
305+
order: 5;
310306
}
311307
312308
.gh-portal-share-more {
@@ -588,19 +584,6 @@ const ShareModal = () => {
588584
<span className='gh-portal-share-label'>{copied ? t('Copied') : t('Copy link')}</span>
589585
</button>
590586

591-
<a
592-
className='gh-portal-btn gh-portal-share-action email'
593-
href={socialLinks.email}
594-
target='_blank'
595-
rel='noopener noreferrer'
596-
aria-label={t('Email')}
597-
title={t('Email')}
598-
>
599-
<span className='gh-portal-share-icon' aria-hidden='true'>
600-
<EnvelopeIcon />
601-
</span>
602-
</a>
603-
604587
<a
605588
className='gh-portal-btn gh-portal-share-action twitter'
606589
href={socialLinks.twitter}
@@ -627,6 +610,19 @@ const ShareModal = () => {
627610
</span>
628611
</a>
629612

613+
<a
614+
className='gh-portal-btn gh-portal-share-action email'
615+
href={socialLinks.email}
616+
target='_blank'
617+
rel='noopener noreferrer'
618+
aria-label={t('Email')}
619+
title={t('Email')}
620+
>
621+
<span className='gh-portal-share-icon' aria-hidden='true'>
622+
<EnvelopeIcon />
623+
</span>
624+
</a>
625+
630626
<div className='gh-portal-share-more' ref={moreMenuRef}>
631627
<button
632628
className='gh-portal-btn gh-portal-share-action more'

‎ghost/i18n/locales/af/portal.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"Before you go": "",
3030
"Billing info & receipts": "",
3131
"Black Friday": "Swart Vrydag",
32+
"Bluesky": "",
3233
"Cancel anytime.": "Kanselleer enige tyd.",
3334
"Cancel subscription": "Kanselleer inskrywing",
3435
"Canceled": "",
@@ -132,6 +133,7 @@
132133
"month": "",
133134
"Monthly": "Maandeliks",
134135
"More like this": "Meer soos hierdie",
136+
"More options": "",
135137
"Name": "Naam",
136138
"Need more help? Contact support": "Benodig meer hulp? Kontak kliëntediens",
137139
"Newsletters can be disabled on your account for two reasons: A previous email was marked as spam, or attempting to send an email resulted in a permanent failure (bounce).": "Nuusbriewe kan op u rekening afgeskakel word vir twee redes: 'n Vorige e-pos is as spam gemerk, of 'n poging om 'n e-pos te stuur het tot 'n permanente fout gelei (bounce).",

‎ghost/i18n/locales/ar/portal.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"Before you go": "",
3030
"Billing info & receipts": "",
3131
"Black Friday": "Ù…Ű«Ű§Ù„: Ű§Ù„ŰŹÙ…ŰčŰ© Ű§Ù„ŰšÙŠŰ¶Ű§ŰĄ",
32+
"Bluesky": "",
3233
"Cancel anytime.": "Ű„Ù„Űșۧۥ في ŰŁÙŠ وقŰȘ",
3334
"Cancel subscription": "Ű„Ù„Űșۧۥ Ű§Ù„Ű§ŰŽŰȘŰ±Ű§Ùƒ",
3435
"Canceled": "",
@@ -132,6 +133,7 @@
132133
"month": "ŰŽÙ‡Ű±",
133134
"Monthly": "ŰŽÙ‡Ű±ÙŠ",
134135
"More like this": "Ű§Ù„Ù…ŰČÙŠŰŻ من Ù‡Ű°Ű§",
136+
"More options": "",
135137
"Name": "Ű§Ù„Ű§ŰłÙ…",
136138
"Need more help? Contact support": "ŰȘŰ­ŰȘۧۏ Ű„Ù„Ù‰ Ű§Ù„Ù…ŰČÙŠŰŻ من Ű§Ù„Ù…ŰłŰ§ŰčŰŻŰ©ŰŸ ۧŰȘŰ”Ù„ ŰšŰ§Ù„ŰŻŰčم",
137139
"Newsletters can be disabled on your account for two reasons: A previous email was marked as spam, or attempting to send an email resulted in a permanent failure (bounce).": ".(bounce) يمكن ŰȘŰčŰ·ÙŠÙ„ Ű§Ù„Ù†ŰŽŰ±Ű§ŰȘ Ű§Ù„Ű„ŰźŰšŰ§Ű±ÙŠŰ© Űčلى Ű­ŰłŰ§ŰšÙƒ Ù„ŰłŰšŰšÙŠÙ†: ŰȘم ŰȘŰ”Ù†ÙŠÙ ŰšŰ±ÙŠŰŻ Ű„Ù„ÙƒŰȘŰ±ÙˆÙ†ÙŠ ŰłŰ§ŰšÙ‚ ÙƒŰ±ŰłŰ§Ù„Ű© ŰșÙŠŰ± Ù…Ű±ŰșÙˆŰš ÙÙŠÙ‡Ű§ŰŒ ŰŁÙˆ Ù…Ű­Ű§ÙˆÙ„Ű© Ű„Ű±ŰłŰ§Ù„ ŰšŰ±ÙŠŰŻŰ„Ù„ÙƒŰȘŰ±ÙˆÙ†Ù‰ ŰŁŰŻÙ‰ Ű„Ù„Ù‰ ÙŰŽÙ„ ŰŻŰ§ŰŠÙ…",

‎ghost/i18n/locales/bg/portal.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"Before you go": "",
3030
"Billing info & receipts": "ĐŸĐ»Đ°Ń‚Đ”Đ¶ĐœĐ° ĐžĐœŃ„ĐŸŃ€ĐŒĐ°Ń†ĐžŃ",
3131
"Black Friday": "Đ§Đ”Ń€Đ”Đœ пДтъĐș",
32+
"Bluesky": "",
3233
"Cancel anytime.": "ОтĐșазĐČĐ°ĐœĐ” ĐżĐŸ ĐČсяĐșĐŸ ĐČŃ€Đ”ĐŒĐ”.",
3334
"Cancel subscription": "ОтĐșажО Đ°Đ±ĐŸĐœĐ°ĐŒĐ”ĐœŃ‚",
3435
"Canceled": "",
@@ -132,6 +133,7 @@
132133
"month": "ĐŒĐ”ŃĐ”Ń†",
133134
"Monthly": "ĐœĐ”ŃĐ”Ń‡ĐœĐŸ",
134135
"More like this": "ĐŸĐŸĐČДчД таĐșĐžĐČа",
136+
"More options": "",
135137
"Name": "Đ˜ĐŒĐ”",
136138
"Need more help? Contact support": "ОщД ĐžĐŒĐ°Ń‚Đ” ĐœŃƒĐ¶ĐŽĐ° ĐŸŃ‚ ĐżĐŸĐŒĐŸŃ‰? ĐŸĐŸŃ‚ŃŠŃ€ŃĐ”Ń‚Đ” ĐżĐŸĐŽĐŽŃ€ŃŠĐ¶Đșата",
137139
"Newsletters can be disabled on your account for two reasons: A previous email was marked as spam, or attempting to send an email resulted in a permanent failure (bounce).": "Đ‘ŃŽĐ»Đ”Ń‚ĐžĐœĐžŃ‚Đ” ĐŒĐŸĐłĐ°Ń‚ Ўа бъЎат ЎДаĐșтоĐČĐžŃ€Đ°ĐœĐž ĐČ ĐżŃ€ĐŸŃ„ĐžĐ»Đ° ĐČĐž ĐżĐŸ ĐŽĐČĐ” ĐżŃ€ĐžŃ‡ĐžĐœĐž: ĐżŃ€Đ”ĐŽĐžŃˆĐ”Đœ ĐžĐŒĐ”ĐčĐ» Đ” бОл ĐŒĐ°Ń€ĐșĐžŃ€Đ°Đœ ĐșĐ°Ń‚ĐŸ ŃĐżĐ°ĐŒ ОлО ĐŸĐżĐžŃ‚ŃŠŃ‚ за ĐžĐ·ĐżŃ€Đ°Ń‰Đ°ĐœĐ” ĐœĐ° ĐžĐŒĐ”ĐčĐ» Đ” ĐŽĐŸĐČДл ĐŽĐŸ Ń‚Ń€Đ°Đ”Đœ ĐœĐ”ŃƒŃĐżĐ”Ń… (ĐŸŃ‚Đșаз).",

‎ghost/i18n/locales/bn/portal.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"Before you go": "",
3030
"Billing info & receipts": "",
3131
"Black Friday": "àŠˆàŠŠ-àŠ‰àŠČ-àŠ«àŠżàŠ€àŠ°",
32+
"Bluesky": "",
3233
"Cancel anytime.": "àŠŻà§‡ àŠ•à§‹àŠšà§‹ àŠžàŠźàŠŻàŠŒ àŠŹàŠŸàŠ€àŠżàŠČ àŠ•àŠ°à§àŠšà„€",
3334
"Cancel subscription": "àŠžàŠŸàŠŹàŠžà§àŠ•à§àŠ°àŠżàŠȘàŠ¶àŠš àŠŹàŠŸàŠ€àŠżàŠČ àŠ•àŠ°à§àŠš",
3435
"Canceled": "",
@@ -132,6 +133,7 @@
132133
"month": "",
133134
"Monthly": "àŠźàŠŸàŠžàŠżàŠ•",
134135
"More like this": "àŠàŠŸàŠżàŠ° àŠźàŠ€à§‹ àŠ†àŠ°à§‹",
136+
"More options": "",
135137
"Name": "àŠšàŠŸàŠź",
136138
"Need more help? Contact support": "àŠ†àŠ°àŠ“ àŠžàŠŸàŠčàŠŸàŠŻà§àŠŻ àŠȘà§àŠ°àŠŻàŠŒà§‹àŠœàŠš? àŠžàŠŸàŠȘà§‹àŠ°à§àŠŸà§‡àŠ° àŠžàŠŸàŠ„à§‡ àŠŻà§‹àŠ—àŠŸàŠŻà§‹àŠ— àŠ•àŠ°à§àŠš",
137139
"Newsletters can be disabled on your account for two reasons: A previous email was marked as spam, or attempting to send an email resulted in a permanent failure (bounce).": "àŠ†àŠȘàŠšàŠŸàŠ° àŠ…à§àŠŻàŠŸàŠ•àŠŸàŠ‰àŠšà§àŠŸà§‡ àŠŠà§àŠŸàŠż àŠ•àŠŸàŠ°àŠŁà§‡ àŠšàŠżàŠ‰àŠœàŠČà§‡àŠŸàŠŸàŠ° àŠšàŠżàŠ·à§àŠ•à§àŠ°àŠżàŠŻàŠŒ àŠ•àŠ°àŠŸ àŠŻà§‡àŠ€à§‡ àŠȘàŠŸàŠ°à§‡: àŠàŠ•àŠŸàŠż àŠȘà§‚àŠ°à§àŠŹàŠŹàŠ°à§àŠ€à§€ àŠ‡àŠźà§‡àŠČ àŠžà§àŠȘà§àŠŻàŠŸàŠź àŠčàŠżàŠžàŠŸàŠŹà§‡ àŠšàŠżàŠčà§àŠšàŠżàŠ€ àŠ•àŠ°àŠŸ àŠčàŠŻàŠŒà§‡àŠ›àŠżàŠČ, àŠ…àŠ„àŠŹàŠŸ àŠàŠ•àŠŸàŠż àŠ‡àŠźà§‡àŠČ àŠȘàŠŸàŠ àŠŸàŠšà§‹àŠ° àŠšà§‡àŠ·à§àŠŸàŠŸ àŠžà§àŠ„àŠŸàŠŻàŠŒà§€ àŠŹà§àŠŻàŠ°à§àŠ„àŠ€àŠŸàŠ° (àŠŹàŠŸàŠ‰àŠšà§àŠž) àŠ«àŠČàŠŸàŠ«àŠČà„€",

‎ghost/i18n/locales/bs/portal.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"Before you go": "",
3030
"Billing info & receipts": "",
3131
"Black Friday": "Black Friday",
32+
"Bluesky": "",
3233
"Cancel anytime.": "OtkaĆŸi u bilo koje vrijeme.",
3334
"Cancel subscription": "OtkaĆŸi pretplatu",
3435
"Canceled": "",
@@ -132,6 +133,7 @@
132133
"month": "",
133134
"Monthly": "Mjesečno",
134135
"More like this": "ViĆĄe poput ovoga",
136+
"More options": "",
135137
"Name": "Ime",
136138
"Need more help? Contact support": "Treba ti dodatna pomoć? Kontaktiraj podrơku",
137139
"Newsletters can be disabled on your account for two reasons: A previous email was marked as spam, or attempting to send an email resulted in a permanent failure (bounce).": "Newletteri na vaơem računu se mogu onemogućiti iz dva razloga: Prethodni Email označena je kao spam ili pokuơaj slanja Email poruke rezultirao je greơkom (doơlo je do odbacivanja nakon viơe neuspjelih pokuơaja).",

‎ghost/i18n/locales/ca/portal.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"Before you go": "",
3030
"Billing info & receipts": "",
3131
"Black Friday": "Black Friday",
32+
"Bluesky": "",
3233
"Cancel anytime.": "Cancel·la en qualsevol moment.",
3334
"Cancel subscription": "Cancel·la la subscripció",
3435
"Canceled": "",
@@ -132,6 +133,7 @@
132133
"month": "mes",
133134
"Monthly": "Mensual",
134135
"More like this": "Més d'aquest tipus",
136+
"More options": "",
135137
"Name": "Nom",
136138
"Need more help? Contact support": "Necessites més ajuda? Contacta amb suport tÚcnic",
137139
"Newsletters can be disabled on your account for two reasons: A previous email was marked as spam, or attempting to send an email resulted in a permanent failure (bounce).": "Els butlletins de notĂ­cies poden estar desactivats al teu compte per dos motius: un correu electrĂČnic anterior s'ha marcat com a correu brossa o bĂ© s'ha intentat enviar un correu electrĂČnic que ha provocat un error permanent (rebot).",

‎ghost/i18n/locales/context.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"Best": "Text appears in the sorting selector for comments",
3131
"Billing info & receipts": "Title in Portal for the section which links to Stripe's billing portal",
3232
"Black Friday": "An example offer name",
33+
"Bluesky": "",
3334
"By {authors}": "Newsletter header text",
3435
"Cancel": "Button text",
3536
"Cancel anytime.": "A label explaining that the trial can be cancelled at any time",
@@ -175,6 +176,7 @@
175176
"Memberships unavailable, contact the owner for access.": "Inform a user that memberships are only available by contacting the site owner",
176177
"Monthly": "A label to indicate a monthly payment cadence",
177178
"More like this": "A label for the thumbs-up response in member feedback at the bottom of emails",
179+
"More options": "",
178180
"Name": "A label to indicate a member's name",
179181
"Need more help? Contact support": "A link to contact support",
180182
"Neurosurgeon": "Example of an expertise of a person used in comments when editing your expertise",

‎ghost/i18n/locales/cs/portal.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"Before you go": "",
3030
"Billing info & receipts": "",
3131
"Black Friday": "ČernĂœ pĂĄtek",
32+
"Bluesky": "",
3233
"Cancel anytime.": "ZruĆĄit kdykoli.",
3334
"Cancel subscription": "Zruơit odběr",
3435
"Canceled": "",
@@ -132,6 +133,7 @@
132133
"month": "",
133134
"Monthly": "Měsíčně",
134135
"More like this": "VĂ­c podobnĂœch",
136+
"More options": "",
135137
"Name": "Jméno",
136138
"Need more help? Contact support": "Potƙebujete dalơí pomoc? Kontaktujte podporu",
137139
"Newsletters can be disabled on your account for two reasons: A previous email was marked as spam, or attempting to send an email resulted in a permanent failure (bounce).": "Newslettery mohou bĂœt na vaĆĄem Ășčtu deaktivovĂĄny ze dvou dĆŻvodĆŻ: PƙedchozĂ­ e-mail byl označen jako spam, nebo pokus o odeslĂĄnĂ­ e-mailu skončil trvalĂœm selhĂĄnĂ­m (odrazem).",

‎ghost/i18n/locales/da/portal.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"Before you go": "",
3030
"Billing info & receipts": "",
3131
"Black Friday": "Black Friday",
32+
"Bluesky": "",
3233
"Cancel anytime.": "Annuller nÄr som helst.",
3334
"Cancel subscription": "Annuller abonnement",
3435
"Canceled": "",
@@ -132,6 +133,7 @@
132133
"month": "mÄned",
133134
"Monthly": "MÄnedlig",
134135
"More like this": "Mere af dette",
136+
"More options": "",
135137
"Name": "Navn",
136138
"Need more help? Contact support": "Brug for hjĂŠlp? Kontakt support",
137139
"Newsletters can be disabled on your account for two reasons: A previous email was marked as spam, or attempting to send an email resulted in a permanent failure (bounce).": "Nyhedsbreve kan deaktiveres pÄ din konto af to Ärsager: En tidligere e-mail blev markeret som spam, eller forsÞg pÄ at sende en e-mail resulterede i en permanent fejl (bounce).",

0 commit comments

Comments
 (0)