Merge branch 'develop' into release/3.7.0

* develop: Fix linting Update comments text Update settings text
bluehost · Dec 5, 2023 · 0ae6558 · 0ae6558
2 parents c54940e + 73106d1
commit 0ae6558
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/app/pages/settings/automaticUpdates.js b/src/app/pages/settings/automaticUpdates.js
@@ -88,7 +88,10 @@ const AutomaticUpdatesAll = ( { setError, notify } ) => {
 	return (
 		<ToggleField
 			id="autoupdate-all-toggle"
-			label={ __( 'Manage All Updates', 'wp-plugin-bluehost' ) }
+			label={ __(
+				'Automatically keep all up to date',
+				'wp-plugin-bluehost'
+			) }
 			checked={ autoUpdatesAll }
 			onChange={ toggleAutoUpdatesAll }
 		/>

diff --git a/src/app/pages/settings/commentSettings.js b/src/app/pages/settings/commentSettings.js
@@ -223,11 +223,7 @@ const CommentsPerPage = ( { setError, notify } ) => {
 	return (
 		<SelectField
 			id="comments-per-page-select"
-			label={
-				__( 'Display ', 'wp-plugin-bluehost' ) +
-				commentsPerPage +
-				__( ' comments per page.', 'wp-plugin-bluehost' )
-			}
+			label={ __( 'Comments to display per page', 'wp-plugin-bluehost' ) }
 			value={ commentsPerPage }
 			selectedLabel={ commentsPerPage }
 			options={ [

diff --git a/src/app/pages/settings/contentSettings.js b/src/app/pages/settings/contentSettings.js
@@ -77,7 +77,7 @@ const ContentRevisions = ( { setError, notify } ) => {
 		<SelectField
 			id="content-revisions-select"
 			label={ __(
-				'Number of revisions posts can save ',
+				'Number of revisions per post to save ',
 				'wp-plugin-bluehost'
 			) }
 			description={ contentRevisionsDescriptionText() }
@@ -156,7 +156,10 @@ const EmptyTrash = ( { setError, notify } ) => {
 	return (
 		<SelectField
 			id="empty-trash-select"
-			label={ __( 'Trash emptying frequency ', 'wp-plugin-bluehost' ) }
+			label={ __(
+				'Number of weeks inbetween emptying trash ',
+				'wp-plugin-bluehost'
+			) }
 			description={
 				__(
 					'The trash will automatically empty every ',