From adf03e29f068cd3fdaeee996d0954269d2aa3e73 Mon Sep 17 00:00:00 2001
From: Zebulan Stanphill <zebulanstanphill@gmail.com>
Date: Tue, 28 Aug 2018 02:22:57 -0500
Subject: [PATCH] Improve consistency of widget block settings (#9389)

* Improve option order consistency in widgets

* Use Title Case in Categories block settings

* Use Title Case in Latest Comments block settings

* Categories block: inspector toggles in alphabetic order
---
 packages/block-library/src/archives/edit.js        | 10 +++++-----
 packages/block-library/src/categories/edit.js      | 14 +++++++-------
 packages/block-library/src/latest-comments/edit.js |  8 ++++----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/block-library/src/archives/edit.js b/packages/block-library/src/archives/edit.js
index 0a53c463a47d1..83b79b536eb87 100644
--- a/packages/block-library/src/archives/edit.js
+++ b/packages/block-library/src/archives/edit.js
@@ -26,16 +26,16 @@ export default function ArchivesEdit( { attributes, setAttributes } ) {
 		<Fragment>
 			<InspectorControls>
 				<PanelBody title={ __( 'Archives Settings' ) }>
-					<ToggleControl
-						label={ __( 'Show Post Counts' ) }
-						checked={ showPostCounts }
-						onChange={ () => setAttributes( { showPostCounts: ! showPostCounts } ) }
-					/>
 					<ToggleControl
 						label={ __( 'Display as Dropdown' ) }
 						checked={ displayAsDropdown }
 						onChange={ () => setAttributes( { displayAsDropdown: ! displayAsDropdown } ) }
 					/>
+					<ToggleControl
+						label={ __( 'Show Post Counts' ) }
+						checked={ showPostCounts }
+						onChange={ () => setAttributes( { showPostCounts: ! showPostCounts } ) }
+					/>
 				</PanelBody>
 			</InspectorControls>
 			<BlockControls>
diff --git a/packages/block-library/src/categories/edit.js b/packages/block-library/src/categories/edit.js
index 09cfb9e045524..d0c0f1b00e104 100644
--- a/packages/block-library/src/categories/edit.js
+++ b/packages/block-library/src/categories/edit.js
@@ -146,20 +146,20 @@ class CategoriesEdit extends Component {
 			<InspectorControls>
 				<PanelBody title={ __( 'Categories Settings' ) }>
 					<ToggleControl
-						label={ __( 'Display as dropdown' ) }
+						label={ __( 'Display as Dropdown' ) }
 						checked={ displayAsDropdown }
 						onChange={ this.toggleDisplayAsDropdown }
 					/>
 					<ToggleControl
-						label={ __( 'Show post counts' ) }
-						checked={ showPostCounts }
-						onChange={ this.toggleShowPostCounts }
-					/>
-					<ToggleControl
-						label={ __( 'Show hierarchy' ) }
+						label={ __( 'Show Hierarchy' ) }
 						checked={ showHierarchy }
 						onChange={ this.toggleShowHierarchy }
 					/>
+					<ToggleControl
+						label={ __( 'Show Post Counts' ) }
+						checked={ showPostCounts }
+						onChange={ this.toggleShowPostCounts }
+					/>
 				</PanelBody>
 			</InspectorControls>
 		);
diff --git a/packages/block-library/src/latest-comments/edit.js b/packages/block-library/src/latest-comments/edit.js
index 319fca06894fb..d895c9ff4c83c 100644
--- a/packages/block-library/src/latest-comments/edit.js
+++ b/packages/block-library/src/latest-comments/edit.js
@@ -81,22 +81,22 @@ class LatestComments extends Component {
 				<InspectorControls>
 					<PanelBody title={ __( 'Latest Comments Settings' ) }>
 						<ToggleControl
-							label={ __( 'Display avatar' ) }
+							label={ __( 'Display Avatar' ) }
 							checked={ displayAvatar }
 							onChange={ this.toggleDisplayAvatar }
 						/>
 						<ToggleControl
-							label={ __( 'Display date' ) }
+							label={ __( 'Display Date' ) }
 							checked={ displayDate }
 							onChange={ this.toggleDisplayDate }
 						/>
 						<ToggleControl
-							label={ __( 'Display excerpt' ) }
+							label={ __( 'Display Excerpt' ) }
 							checked={ displayExcerpt }
 							onChange={ this.toggleDisplayExcerpt }
 						/>
 						<RangeControl
-							label={ __( 'Number of comments' ) }
+							label={ __( 'Number of Comments' ) }
 							value={ commentsToShow }
 							onChange={ this.setCommentsToShow }
 							min={ MIN_COMMENTS }