Renamed show_subhead to show_subtitle (#20320)

closes https://linear.app/tryghost/issue/MOM-194

- whilst working on the feature our naming changed from "Subhead" to "Subtitle"
- this rename of the newsletter design setting column brings naming back into a consistent state before public release

apps/admin-x-framework/src/api/newsletters.ts

@@ -21,7 +21,7 @@ export type Newsletter = {
     show_header_title: boolean;
     title_font_category: string;
     title_alignment: string;
-    show_subhead: boolean;
+    show_subtitle: boolean;
     show_feature_image: boolean;
     body_font_category: string;
     footer_content: string | null;

apps/admin-x-framework/src/test/responses/newsletters.json

@@ -19,7 +19,7 @@
             "show_header_title": true,
             "title_font_category": "serif",
             "title_alignment": "center",
-            "show_subhead": true,
+            "show_subtitle": true,
             "show_feature_image": true,
             "body_font_category": "serif",
             "footer_content": "",

apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterDetailModal.tsx

@@ -421,10 +421,10 @@ const Sidebar: React.FC<{
                     <ToggleGroup gap='lg'>
                         {(hasNewsletterSubtitle && newsletter.show_post_title_section) &&
                             <Toggle
-                                checked={newsletter.show_subhead}
+                                checked={newsletter.show_subtitle}
                                 direction="rtl"
                                 label={hasEditorSubtitle ? 'Subtitle' : 'Post excerpt'}
-                                onChange={e => updateNewsletter({show_subhead: e.target.checked})}
+                                onChange={e => updateNewsletter({show_subtitle: e.target.checked})}
                             />
                         }
                         <Toggle

apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreview.tsx

@@ -110,8 +110,8 @@ const NewsletterPreview: React.FC<{newsletter: Newsletter}> = ({newsletter}) =>
         showFeedback={showFeedback}
         showLatestPosts={newsletter.show_latest_posts}
         showPostTitleSection={newsletter.show_post_title_section}
-        showSubhead={newsletter.show_subhead}
         showSubscriptionDetails={newsletter.show_subscription_details}
+        showSubtitle={newsletter.show_subtitle}
         siteTitle={title}
         titleAlignment={newsletter.title_alignment}
         titleFontCategory={newsletter.title_font_category}

apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreviewContent.tsx

@@ -18,7 +18,7 @@ const NewsletterPreviewContent: React.FC<{
     headerTitle?: string | null;
     headerSubtitle?: string | null;
     showPostTitleSection: boolean;
-    showSubhead: boolean;
+    showSubtitle: boolean;
     titleAlignment?: string;
     titleFontCategory?: string;
     bodyFontCategory?: string;
@@ -50,7 +50,7 @@ const NewsletterPreviewContent: React.FC<{
     headerTitle,
     headerSubtitle,
     showPostTitleSection,
-    showSubhead,
+    showSubtitle,
     titleAlignment,
     titleFontCategory,
     bodyFontCategory,
@@ -134,7 +134,7 @@ const NewsletterPreviewContent: React.FC<{
                                     )} style={{color: titleColor}}>
                                         Your email newsletter
                                     </h2>
-                                    {(hasNewsletterSubtitle && showSubhead) && (
+                                    {(hasNewsletterSubtitle && showSubtitle) && (
                                         <p className={clsx(
                                             'mb-5 text-pretty text-[1.6rem] leading-[1.7] text-black',
                                             bodyFontCategory === 'serif' && 'font-serif'

ghost/admin/app/components/gh-koenig-editor-lexical.js

@@ -164,7 +164,7 @@ export default class GhKoenigEditorReactComponent extends Component {
         }
     }
 
-    // Subhead ("excerpt") Actions -------------------------------------------
+    // Subtitle ("excerpt") Actions -------------------------------------------
 
     @action
     registerSubtitleElement(element) {

ghost/admin/app/models/newsletter.js

@@ -24,7 +24,7 @@ export default class Newsletter extends Model.extend(ValidationEngine) {
     @attr({defaultValue: true}) showHeaderTitle;
     @attr({defaultValue: true}) showHeaderName;
     @attr({defaultValue: true}) showPostTitleSection;
-    @attr({defaultValue: false}) showSubhead;
+    @attr({defaultValue: false}) showSubtitle;
     @attr({defaultValue: true}) showCommentCta;
     @attr({defaultValue: false}) showSubscriptionDetails;
     @attr({defaultValue: false}) showLatestPosts;

ghost/core/core/server/data/migrations/versions/5.84/2024-06-04-09-13-33-rename-newsletters-show-subhead.js

@@ -0,0 +1,3 @@
+const {createRenameColumnMigration} = require('../../utils');
+
+module.exports = createRenameColumnMigration('newsletters', 'show_subhead', 'show_subtitle');

ghost/core/core/server/data/schema/schema.js

@@ -30,7 +30,7 @@ module.exports = {
         header_image: {type: 'string', maxlength: 2000, nullable: true},
         show_header_icon: {type: 'boolean', nullable: false, defaultTo: true},
         show_header_title: {type: 'boolean', nullable: false, defaultTo: true},
-        show_subhead: {type: 'boolean', nullable: false, defaultTo: false},
+        show_subtitle: {type: 'boolean', nullable: false, defaultTo: false},
         title_font_category: {type: 'string', maxlength: 191, nullable: false, defaultTo: 'sans_serif', validations: {isIn: [['serif', 'sans_serif']]}},
         title_alignment: {type: 'string', maxlength: 191, nullable: false, defaultTo: 'center', validations: {isIn: [['center', 'left']]}},
         show_feature_image: {type: 'boolean', nullable: false, defaultTo: true},

ghost/core/core/server/models/newsletter.js

@@ -30,7 +30,7 @@ const Newsletter = ghostBookshelf.Model.extend({
             border_color: null,
             title_color: null,
             feedback_enabled: false,
-            show_subhead: false
+            show_subtitle: false
         };
     },
 

ghost/core/test/e2e-api/admin/__snapshots__/members.test.js.snap

@@ -5351,7 +5351,7 @@ exports[`Members API Can subscribe to a newsletter 5: [headers] 1`] = `
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "4601",
+  "content-length": "4604",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,

ghost/core/test/e2e-api/admin/__snapshots__/newsletters.test.js.snap

@@ -25,8 +25,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -46,7 +46,7 @@ exports[`Newsletters API [Legacy] Can only set newsletter reply to to newsletter
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "947",
+  "content-length": "948",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -81,8 +81,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -102,7 +102,7 @@ exports[`Newsletters API [Legacy] Can only set newsletter reply to to newsletter
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "950",
+  "content-length": "951",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -233,8 +233,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "new-newsletter-with-existing-members-subscribed",
       "sort_order": 8,
       "status": "active",
@@ -254,7 +254,7 @@ exports[`Newsletters API Can add a newsletter - and subscribe existing members 2
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "972",
+  "content-length": "973",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -295,8 +295,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "my-test-newsletter-with-custom-sender_email",
       "sort_order": 7,
       "status": "active",
@@ -316,7 +316,7 @@ exports[`Newsletters API Can add a newsletter - with custom sender_email 2: [hea
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "981",
+  "content-length": "982",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -561,8 +561,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "my-test-newsletter-with-custom-sender_email-and-subscribe-existing",
       "sort_order": 10,
       "status": "active",
@@ -582,7 +582,7 @@ exports[`Newsletters API Can add a newsletter - with custom sender_email and sub
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "1054",
+  "content-length": "1055",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1007,8 +1007,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "my-test-newsletter",
       "sort_order": 3,
       "status": "active",
@@ -1028,7 +1028,7 @@ exports[`Newsletters API Can add a newsletter 2: [headers] 1`] = `
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "937",
+  "content-length": "938",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1064,8 +1064,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "my-first-test-newsletter",
       "sort_order": 5,
       "status": "active",
@@ -1085,7 +1085,7 @@ exports[`Newsletters API Can add multiple newsletters 2: [headers] 1`] = `
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "899",
+  "content-length": "900",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1121,8 +1121,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "my-second-test-newsletter",
       "sort_order": 6,
       "status": "active",
@@ -1142,7 +1142,7 @@ exports[`Newsletters API Can add multiple newsletters 4: [headers] 1`] = `
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "901",
+  "content-length": "902",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1188,8 +1188,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "default-newsletter",
       "sort_order": 0,
       "status": "active",
@@ -1223,8 +1223,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -1258,8 +1258,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "weekly-newsletter",
       "sort_order": 2,
       "status": "active",
@@ -1293,8 +1293,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "old-newsletter",
       "sort_order": 2,
       "status": "archived",
@@ -1314,7 +1314,7 @@ exports[`Newsletters API Can browse newsletters 2: [headers] 1`] = `
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "3751",
+  "content-length": "3755",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1353,8 +1353,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -1374,7 +1374,7 @@ exports[`Newsletters API Can edit a newsletters and update the sender_email when
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "1002",
+  "content-length": "1003",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1612,8 +1612,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -1633,7 +1633,7 @@ exports[`Newsletters API Can edit newsletters 2: [headers] 1`] = `
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "950",
+  "content-length": "951",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1733,8 +1733,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "my-test-newsletter-2",
       "sort_order": 4,
       "status": "active",
@@ -1754,7 +1754,7 @@ exports[`Newsletters API Can include members, active members & posts counts when
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "934",
+  "content-length": "935",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1805,8 +1805,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "default-newsletter",
       "sort_order": 0,
       "status": "active",
@@ -1845,8 +1845,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -1885,8 +1885,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "weekly-newsletter",
       "sort_order": 2,
       "status": "active",
@@ -1925,8 +1925,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "old-newsletter",
       "sort_order": 2,
       "status": "archived",
@@ -1946,7 +1946,7 @@ exports[`Newsletters API Can include members, active members & posts counts when
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "3955",
+  "content-length": "3959",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -1985,8 +1985,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -2006,7 +2006,7 @@ exports[`Newsletters API Can include members, active members & posts counts when
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "1003",
+  "content-length": "1004",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2046,8 +2046,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -2067,7 +2067,7 @@ exports[`Newsletters API Can include members, active members & posts counts when
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "994",
+  "content-length": "995",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2101,8 +2101,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -2122,7 +2122,7 @@ exports[`Newsletters API Can read a newsletter 2: [headers] 1`] = `
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "943",
+  "content-length": "944",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2403,8 +2403,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -2445,8 +2445,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "duplicate-newsletter",
       "sort_order": Any<Number>,
       "status": "active",
@@ -2466,7 +2466,7 @@ exports[`Newsletters API Can't add multiple newsletters with same name 2: [heade
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "891",
+  "content-length": "892",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2567,8 +2567,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "naughty-newsletter",
       "sort_order": 3,
       "status": "active",
@@ -2588,7 +2588,7 @@ exports[`Newsletters API Host Settings: newsletter limits Max limit Adding a new
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "922",
+  "content-length": "923",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2627,8 +2627,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "archived-newsletter",
       "sort_order": 3,
       "status": "archived",
@@ -2648,7 +2648,7 @@ exports[`Newsletters API Host Settings: newsletter limits Max limit Adding an ar
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "926",
+  "content-length": "927",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2728,8 +2728,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "default-newsletter",
       "sort_order": 0,
       "status": "archived",
@@ -2749,7 +2749,7 @@ exports[`Newsletters API Host Settings: newsletter limits Max limit Archiving a
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "889",
+  "content-length": "890",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2784,8 +2784,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "old-newsletter",
       "sort_order": 2,
       "status": "archived",
@@ -2805,7 +2805,7 @@ exports[`Newsletters API Host Settings: newsletter limits Max limit Editing an a
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "956",
+  "content-length": "957",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2840,8 +2840,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "old-newsletter",
       "sort_order": 2,
       "status": "archived",
@@ -2861,7 +2861,7 @@ exports[`Newsletters API Host Settings: newsletter limits Max limit Editing an a
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "958",
+  "content-length": "959",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2917,7 +2917,7 @@ exports[`Newsletters API Managed email with custom sending domain Auto correctin
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "5501",
+  "content-length": "5507",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -2951,8 +2951,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -2972,7 +2972,7 @@ exports[`Newsletters API Managed email with custom sending domain Auto correctin
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "945",
+  "content-length": "946",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -3007,8 +3007,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -3028,7 +3028,7 @@ exports[`Newsletters API Managed email with custom sending domain Auto correctin
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "945",
+  "content-length": "946",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -3062,8 +3062,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -3083,7 +3083,7 @@ exports[`Newsletters API Managed email with custom sending domain Auto correctin
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "935",
+  "content-length": "936",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -3118,8 +3118,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -3139,7 +3139,7 @@ exports[`Newsletters API Managed email with custom sending domain Can clear send
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "938",
+  "content-length": "939",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -3174,8 +3174,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -3195,7 +3195,7 @@ exports[`Newsletters API Managed email with custom sending domain Can keep sende
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "945",
+  "content-length": "946",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -3235,8 +3235,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -3256,7 +3256,7 @@ exports[`Newsletters API Managed email with custom sending domain Can set newsle
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "993",
+  "content-length": "994",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -3550,8 +3550,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -3571,7 +3571,7 @@ exports[`Newsletters API Managed email with custom sending domain Can set newsle
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "954",
+  "content-length": "955",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -3606,8 +3606,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -3627,7 +3627,7 @@ exports[`Newsletters API Managed email with custom sending domain Can set newsle
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "935",
+  "content-length": "936",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -3662,8 +3662,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -3683,7 +3683,7 @@ exports[`Newsletters API Managed email with custom sending domain Can set newsle
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "938",
+  "content-length": "939",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -3718,8 +3718,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -3739,7 +3739,7 @@ exports[`Newsletters API Managed email with custom sending domain Can set sender
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "962",
+  "content-length": "963",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -3877,7 +3877,7 @@ exports[`Newsletters API Managed email without custom sending domain Auto correc
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "5491",
+  "content-length": "5497",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -3911,8 +3911,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -3932,7 +3932,7 @@ exports[`Newsletters API Managed email without custom sending domain Auto correc
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "935",
+  "content-length": "936",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -3967,8 +3967,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -3988,7 +3988,7 @@ exports[`Newsletters API Managed email without custom sending domain Auto correc
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "945",
+  "content-length": "946",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -4078,8 +4078,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -4099,7 +4099,7 @@ exports[`Newsletters API Managed email without custom sending domain Auto correc
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "935",
+  "content-length": "936",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -4133,8 +4133,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -4154,7 +4154,7 @@ exports[`Newsletters API Managed email without custom sending domain Auto correc
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "925",
+  "content-length": "926",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -4194,8 +4194,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -4215,7 +4215,7 @@ exports[`Newsletters API Managed email without custom sending domain Auto correc
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "983",
+  "content-length": "984",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -4255,8 +4255,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -4276,7 +4276,7 @@ exports[`Newsletters API Managed email without custom sending domain Auto correc
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "983",
+  "content-length": "984",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -4365,8 +4365,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -4386,7 +4386,7 @@ exports[`Newsletters API Managed email without custom sending domain Can clear s
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "928",
+  "content-length": "929",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -4421,8 +4421,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -4442,7 +4442,7 @@ exports[`Newsletters API Managed email without custom sending domain Can keep se
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "935",
+  "content-length": "936",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -4592,8 +4592,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -4613,7 +4613,7 @@ exports[`Newsletters API Managed email without custom sending domain Can set new
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "983",
+  "content-length": "984",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -4852,8 +4852,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -4873,7 +4873,7 @@ exports[`Newsletters API Managed email without custom sending domain Can set new
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "925",
+  "content-length": "926",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -4908,8 +4908,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -4929,7 +4929,7 @@ exports[`Newsletters API Managed email without custom sending domain Can set new
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "928",
+  "content-length": "929",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -4964,8 +4964,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -4985,7 +4985,7 @@ exports[`Newsletters API Managed email without custom sending domain Can set new
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "935",
+  "content-length": "936",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -5020,8 +5020,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -5041,7 +5041,7 @@ exports[`Newsletters API Managed email without custom sending domain Can set sen
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "943",
+  "content-length": "944",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -5200,8 +5200,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -5221,7 +5221,7 @@ exports[`Newsletters API Self hoster without managed email Can change sender_ema
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "954",
+  "content-length": "955",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -5256,8 +5256,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -5277,7 +5277,7 @@ exports[`Newsletters API Self hoster without managed email Can clear sender_emai
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "942",
+  "content-length": "943",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -5367,8 +5367,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -5388,7 +5388,7 @@ exports[`Newsletters API Self hoster without managed email Can set newsletter re
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "942",
+  "content-length": "943",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -5423,8 +5423,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -5444,7 +5444,7 @@ exports[`Newsletters API Self hoster without managed email Can set newsletter re
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "935",
+  "content-length": "936",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
@@ -5479,8 +5479,8 @@ Object {
       "show_header_title": true,
       "show_latest_posts": false,
       "show_post_title_section": true,
-      "show_subhead": false,
       "show_subscription_details": false,
+      "show_subtitle": false,
       "slug": "daily-newsletter",
       "sort_order": 1,
       "status": "active",
@@ -5500,7 +5500,7 @@ exports[`Newsletters API Self hoster without managed email Can set newsletter re
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "938",
+  "content-length": "939",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,

ghost/core/test/unit/server/data/schema/integrity.test.js

@@ -35,7 +35,7 @@ const validateRouteSettings = require('../../../../../core/server/services/route
  */
 describe('DB version integrity', function () {
     // Only these variables should need updating
-    const currentSchemaHash = 'd861a9b5a0a061b1f45f417d93029461';
+    const currentSchemaHash = '8e52be4cf84cae82a406e5a153ecbd43';
     const currentFixturesHash = 'a489d615989eab1023d4b8af0ecee7fd';
     const currentSettingsHash = '5c957ceb48c4878767d7d3db484c592d';
     const currentRoutesHash = '3d180d52c663d173a6be791ef411ed01';

ghost/email-service/lib/EmailRenderer.js

@@ -1046,7 +1046,7 @@ class EmailRenderer {
             newsletter: {
                 name: newsletter.get('name'),
                 showPostTitleSection: newsletter.get('show_post_title_section'),
-                showSubhead: newsletter.get('show_subhead'),
+                showSubtitle: newsletter.get('show_subtitle'),
                 showCommentCta: newsletter.get('show_comment_cta') && this.#settingsCache.get('comments_enabled') !== 'off' && !hasEmailOnlyFlag,
                 showSubscriptionDetails: newsletter.get('show_subscription_details')
             },

ghost/email-service/lib/email-templates/template-old.hbs

@@ -80,7 +80,7 @@
                                                 </td>
                                             </tr>
                                             {{#hasFeature 'newsletterSubtitle'}}
-                                                {{#if (and newsletter.showSubhead post.customExcerpt)}}
+                                                {{#if (and newsletter.showSubtitle post.customExcerpt)}}
                                                     <tr>
                                                         <td class="post-subtitle-wrapper" style="width: 100%">
                                                             <p class="{{classes.subtitle}}">{{post.customExcerpt}}</p>

ghost/email-service/test/email-renderer.test.js

@@ -1780,7 +1780,7 @@ describe('Email renderer', function () {
                 const post = createModel(Object.assign({}, basePost, {custom_excerpt: 'This is a subtitle'}));
                 const newsletter = createModel({
                     show_post_title_section: true,
-                    show_subhead: true
+                    show_subtitle: true
                 });
                 const segment = null;
                 const options = {};
@@ -1801,7 +1801,7 @@ describe('Email renderer', function () {
                 const post = createModel(Object.assign({}, basePost, {custom_excerpt: 'This is a subtitle'}));
                 const newsletter = createModel({
                     show_post_title_section: true,
-                    show_subhead: false
+                    show_subtitle: false
                 });
                 const segment = null;
                 const options = {};
@@ -1823,7 +1823,7 @@ describe('Email renderer', function () {
                 const post = createModel(Object.assign({}, basePost, {custom_excerpt: null}));
                 const newsletter = createModel({
                     show_post_title_section: true,
-                    show_subhead: true
+                    show_subtitle: true
                 });
                 const segment = null;
                 const options = {};