From 4478c66b762e8e60259ea26ba11b230af44f196b Mon Sep 17 00:00:00 2001 From: DustyReagan Date: Wed, 11 Dec 2024 11:53:38 -0600 Subject: [PATCH 1/2] Update Reader Conversations copy --- client/blocks/conversations/empty.jsx | 2 +- client/reader/conversations/controller.js | 1 + client/reader/conversations/intro.jsx | 16 +++++++--------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/client/blocks/conversations/empty.jsx b/client/blocks/conversations/empty.jsx index 8f47f36f3b38d..c858474585257 100644 --- a/client/blocks/conversations/empty.jsx +++ b/client/blocks/conversations/empty.jsx @@ -37,7 +37,7 @@ class ConversationsEmptyContent extends Component { title={ this.props.translate( 'Welcome to Conversations' ) } line={ this.props.translate( "When WordPress posts spark lively conversations, they'll appear here. " + - 'To get started, like or comment on some posts.' + 'To get started, Follow or comment on some posts.' ) } action={ action } secondaryAction={ secondaryAction } diff --git a/client/reader/conversations/controller.js b/client/reader/conversations/controller.js index 5078aaeb68759..4a171eb59626d 100644 --- a/client/reader/conversations/controller.js +++ b/client/reader/conversations/controller.js @@ -60,6 +60,7 @@ export function conversationsA8c( context, next ) { key="conversations" title="Conversations @ Automattic" streamKey={ streamKey } + store={ { id: streamKey } } trackScrollPage={ scrollTracker } /> ); diff --git a/client/reader/conversations/intro.jsx b/client/reader/conversations/intro.jsx index 5b324a3c3191c..5d3ec363dd579 100644 --- a/client/reader/conversations/intro.jsx +++ b/client/reader/conversations/intro.jsx @@ -61,11 +61,10 @@ class ConversationsIntro extends Component { { isInternal ? translate( - '{{strong}}Welcome to A8C Conversations{{/strong}}, where you can read ' + - 'and reply to all your P2 conversations in one place. ' + - "Automattic P2 posts you've liked or commented on " + - 'will appear when they have new comments. ' + - '{{a}}More info. {{/a}}', + `{{strong}}Welcome to A8C Conversations.{{/strong}} ` + + `Automattic P2 posts you've written, Followed, or commented on will appear here when they have new comments. ` + + `Posts with the most recent comments appear on top. ` + + `{{a}}More info.{{/a}}`, { components: { strong: , @@ -74,10 +73,9 @@ class ConversationsIntro extends Component { } ) : translate( - '{{strong}}Welcome to Conversations.{{/strong}} You can read ' + - 'and reply to all your conversations in one place. ' + - "WordPress posts you've liked or commented on " + - 'will appear when they have new comments.', + `{{strong}}Welcome to Conversations{{/strong}} ` + + `WordPress posts you've written, Followed, or commented on will appear here when they have new comments. ` + + `Posts with the most recent comments appear on top.`, { components: { strong: , From 78509c666e8d7923ed20dc8e3d27d30ce4c76552 Mon Sep 17 00:00:00 2001 From: DustyReagan Date: Wed, 11 Dec 2024 14:50:25 -0600 Subject: [PATCH 2/2] Use lowercase follow --- client/blocks/conversations/empty.jsx | 2 +- client/reader/conversations/intro.jsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/blocks/conversations/empty.jsx b/client/blocks/conversations/empty.jsx index c858474585257..e567347110ec9 100644 --- a/client/blocks/conversations/empty.jsx +++ b/client/blocks/conversations/empty.jsx @@ -37,7 +37,7 @@ class ConversationsEmptyContent extends Component { title={ this.props.translate( 'Welcome to Conversations' ) } line={ this.props.translate( "When WordPress posts spark lively conversations, they'll appear here. " + - 'To get started, Follow or comment on some posts.' + 'To get started, follow or comment on some posts.' ) } action={ action } secondaryAction={ secondaryAction } diff --git a/client/reader/conversations/intro.jsx b/client/reader/conversations/intro.jsx index 5d3ec363dd579..ecf9470a114df 100644 --- a/client/reader/conversations/intro.jsx +++ b/client/reader/conversations/intro.jsx @@ -62,7 +62,7 @@ class ConversationsIntro extends Component { { isInternal ? translate( `{{strong}}Welcome to A8C Conversations.{{/strong}} ` + - `Automattic P2 posts you've written, Followed, or commented on will appear here when they have new comments. ` + + `Automattic P2 posts you've written, followed, or commented on will appear here when they have new comments. ` + `Posts with the most recent comments appear on top. ` + `{{a}}More info.{{/a}}`, { @@ -74,7 +74,7 @@ class ConversationsIntro extends Component { ) : translate( `{{strong}}Welcome to Conversations{{/strong}} ` + - `WordPress posts you've written, Followed, or commented on will appear here when they have new comments. ` + + `WordPress posts you've written, followed, or commented on will appear here when they have new comments. ` + `Posts with the most recent comments appear on top.`, { components: {