From 0fa9376aef1a575169fffd25e7d395d91a1bbbe6 Mon Sep 17 00:00:00 2001 From: im3dabasia Date: Mon, 27 Jan 2025 15:03:56 +0530 Subject: [PATCH 1/9] add: Sidebar lint warning in eslintrc --- .eslintrc.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.eslintrc.js b/.eslintrc.js index 6626a55a762d1c..0c7b834ac0a8af 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -119,6 +119,11 @@ const restrictedSyntax = [ 'CallExpression[callee.name=/^(__|_x|_n|_nx)$/] > Literal[value=/^toggle\\b/i]', message: "Avoid using the verb 'Toggle' in translatable strings", }, + { + selector: + 'CallExpression[callee.name=/^(__|_x|_n|_nx)$/] > Literal[value=/^sidebar\\b/i]', + message: "Avoid using the word 'sidebar' in translatable strings", + }, ]; /** `no-restricted-syntax` rules for components. */ From ffd1d089994af2e5b367f84134f8fcb9541da398 Mon Sep 17 00:00:00 2001 From: im3dabasia Date: Mon, 27 Jan 2025 16:03:10 +0530 Subject: [PATCH 2/9] fix: Add eslint rule to ensure word is flagged at all positions --- .eslintrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 0c7b834ac0a8af..f968a4fdf9341e 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -121,7 +121,7 @@ const restrictedSyntax = [ }, { selector: - 'CallExpression[callee.name=/^(__|_x|_n|_nx)$/] > Literal[value=/^sidebar\\b/i]', + 'CallExpression[callee.name=/^(__|_x|_n|_nx)$/] > Literal[value=/sidebar/i]', message: "Avoid using the word 'sidebar' in translatable strings", }, ]; From 5a444e4824456181e9ffda36d1bf6acb90f7e1ee Mon Sep 17 00:00:00 2001 From: im3dabasia Date: Thu, 30 Jan 2025 17:13:08 +0530 Subject: [PATCH 3/9] fix: Update regex for better control --- .eslintrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index f968a4fdf9341e..68d885bf2b5756 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -121,7 +121,7 @@ const restrictedSyntax = [ }, { selector: - 'CallExpression[callee.name=/^(__|_x|_n|_nx)$/] > Literal[value=/sidebar/i]', + 'CallExpression[callee.name=/^(__|_x|_n|_nx)$/] > Literal[value=/sidebar\\b/i]', message: "Avoid using the word 'sidebar' in translatable strings", }, ]; From be0f32a4498a1cc6c4fab1a82fe06f5c6ecd6eae Mon Sep 17 00:00:00 2001 From: im3dabasia Date: Fri, 7 Feb 2025 17:41:24 +0530 Subject: [PATCH 4/9] fix: Update rule message to include alternate word suggestion --- .eslintrc.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 68d885bf2b5756..5d5158968c35c6 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -122,7 +122,8 @@ const restrictedSyntax = [ { selector: 'CallExpression[callee.name=/^(__|_x|_n|_nx)$/] > Literal[value=/sidebar\\b/i]', - message: "Avoid using the word 'sidebar' in translatable strings", + message: + "Avoid using the word 'sidebar' in translatable strings. Consider using 'panel' instead.", }, ]; From cce5eec8c1b7dfa1d79036a41893b94a752a3885 Mon Sep 17 00:00:00 2001 From: im3dabasia Date: Mon, 10 Feb 2025 16:26:32 +0530 Subject: [PATCH 5/9] fix: Updated strings to use panel --- .../add-custom-generic-template-modal-content.js | 2 +- packages/edit-site/src/components/welcome-guide/page.js | 2 +- .../src/components/post-template/create-new-template-modal.js | 2 +- packages/editor/src/components/preferences-modal/index.js | 2 +- packages/editor/src/components/sidebar/header.js | 2 +- packages/editor/src/components/sidebar/index.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/edit-site/src/components/add-new-template/add-custom-generic-template-modal-content.js b/packages/edit-site/src/components/add-new-template/add-custom-generic-template-modal-content.js index 746fd6c5314c31..33aa0e1db3f893 100644 --- a/packages/edit-site/src/components/add-new-template/add-custom-generic-template-modal-content.js +++ b/packages/edit-site/src/components/add-new-template/add-custom-generic-template-modal-content.js @@ -51,7 +51,7 @@ function AddCustomGenericTemplateModalContent( { onClose, createTemplate } ) { placeholder={ defaultTitle } disabled={ isBusy } help={ __( - 'Describe the template, e.g. "Post with sidebar". A custom template can be manually applied to any post or page.' + 'Describe the template, e.g. "Post with panel". A custom template can be manually applied to any post or page.' ) } />

{ __( - 'It’s now possible to edit page content in the site editor. To customise other parts of the page like the header and footer switch to editing the template using the settings sidebar.' + 'It’s now possible to edit page content in the site editor. To customise other parts of the page like the header and footer switch to editing the template using the settings panel.' ) }

diff --git a/packages/editor/src/components/post-template/create-new-template-modal.js b/packages/editor/src/components/post-template/create-new-template-modal.js index 69d31b7f8f714e..2710fa146d3d2e 100644 --- a/packages/editor/src/components/post-template/create-new-template-modal.js +++ b/packages/editor/src/components/post-template/create-new-template-modal.js @@ -126,7 +126,7 @@ export default function CreateNewTemplateModal( { onClose } ) { placeholder={ DEFAULT_TITLE } disabled={ isBusy } help={ __( - 'Describe the template, e.g. "Post with sidebar". A custom template can be manually applied to any post or page.' + 'Describe the template, e.g. "Post with panel". A custom template can be manually applied to any post or page.' ) } /> diff --git a/packages/editor/src/components/preferences-modal/index.js b/packages/editor/src/components/preferences-modal/index.js index fcca1b00e9bb2d..b8482885986989 100644 --- a/packages/editor/src/components/preferences-modal/index.js +++ b/packages/editor/src/components/preferences-modal/index.js @@ -88,7 +88,7 @@ function PreferencesModalContents( { extraSections = {} } ) { scope="core" featureName="showListViewByDefault" help={ __( - 'Opens the List View sidebar by default.' + 'Opens the List View panel by default.' ) } label={ __( 'Always open List View' ) } /> diff --git a/packages/editor/src/components/sidebar/header.js b/packages/editor/src/components/sidebar/header.js index ed2f7f89fe6e7a..b5d9aaa26707c1 100644 --- a/packages/editor/src/components/sidebar/header.js +++ b/packages/editor/src/components/sidebar/header.js @@ -22,7 +22,7 @@ const SidebarHeader = ( _, ref ) => { return { documentLabel: // translators: Default label for the Document sidebar tab, not selected. - getPostTypeLabel() || _x( 'Document', 'noun, sidebar' ), + getPostTypeLabel() || _x( 'Document', 'noun, panel' ), }; }, [] ); diff --git a/packages/editor/src/components/sidebar/index.js b/packages/editor/src/components/sidebar/index.js index 601bcd8f311bb8..6784aafeb57ff0 100644 --- a/packages/editor/src/components/sidebar/index.js +++ b/packages/editor/src/components/sidebar/index.js @@ -103,7 +103,7 @@ const SidebarContent = ( { headerClassName="editor-sidebar__panel-tabs" title={ /* translators: button label text should, if possible, be under 16 characters. */ - _x( 'Settings', 'sidebar button label' ) + _x( 'Settings', 'panel button label' ) } toggleShortcut={ keyboardShortcut } icon={ isRTL() ? drawerLeft : drawerRight } From 975f3ff0ee17618080c01bc328b469c242f98620 Mon Sep 17 00:00:00 2001 From: im3dabasia Date: Mon, 10 Feb 2025 17:28:21 +0530 Subject: [PATCH 6/9] fix: Update sidebar lint regex --- .eslintrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 5d5158968c35c6..d1ee2e1b347dfa 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -121,7 +121,7 @@ const restrictedSyntax = [ }, { selector: - 'CallExpression[callee.name=/^(__|_x|_n|_nx)$/] > Literal[value=/sidebar\\b/i]', + 'CallExpression[callee.name=/^(__|_x|_n|_nx)$/] > Literal[value=/(? Date: Mon, 10 Feb 2025 17:30:56 +0530 Subject: [PATCH 7/9] fix: Update string to use side bar in sidebar --- packages/edit-widgets/src/components/sidebar/widget-areas.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/edit-widgets/src/components/sidebar/widget-areas.js b/packages/edit-widgets/src/components/sidebar/widget-areas.js index c7b49c10b97464..838f5c35c97732 100644 --- a/packages/edit-widgets/src/components/sidebar/widget-areas.js +++ b/packages/edit-widgets/src/components/sidebar/widget-areas.js @@ -33,7 +33,7 @@ export default function WidgetAreas( { selectedWidgetAreaId } ) { let description; if ( ! selectedWidgetArea ) { description = __( - 'Widget Areas are global parts in your site’s layout that can accept blocks. These vary by theme, but are typically parts like your Sidebar or Footer.' + 'Widget Areas are global parts in your site’s layout that can accept blocks. These vary by theme, but are typically parts like your Side bar or Footer.' ); } else if ( selectedWidgetAreaId === 'wp_inactive_widgets' ) { description = __( From e00e7b05f8fa3757b8d0404e0697a2ab70100068 Mon Sep 17 00:00:00 2001 From: im3dabasia Date: Tue, 11 Feb 2025 13:39:46 +0530 Subject: [PATCH 8/9] revert: Panel changes in non editor packages --- .../add-custom-generic-template-modal-content.js | 3 ++- packages/edit-site/src/components/welcome-guide/page.js | 3 ++- packages/edit-widgets/src/components/sidebar/widget-areas.js | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/edit-site/src/components/add-new-template/add-custom-generic-template-modal-content.js b/packages/edit-site/src/components/add-new-template/add-custom-generic-template-modal-content.js index 33aa0e1db3f893..46f9ee1ecdc8c5 100644 --- a/packages/edit-site/src/components/add-new-template/add-custom-generic-template-modal-content.js +++ b/packages/edit-site/src/components/add-new-template/add-custom-generic-template-modal-content.js @@ -51,7 +51,8 @@ function AddCustomGenericTemplateModalContent( { onClose, createTemplate } ) { placeholder={ defaultTitle } disabled={ isBusy } help={ __( - 'Describe the template, e.g. "Post with panel". A custom template can be manually applied to any post or page.' + // eslint-disable-next-line no-restricted-syntax -- 'sidebar' is a common web design term for layouts + 'Describe the template, e.g. "Post with sidebar". A custom template can be manually applied to any post or page.' ) } />

{ __( - 'It’s now possible to edit page content in the site editor. To customise other parts of the page like the header and footer switch to editing the template using the settings panel.' + // eslint-disable-next-line no-restricted-syntax -- 'sidebar' is a common web design term for layouts + 'It’s now possible to edit page content in the site editor. To customise other parts of the page like the header and footer switch to editing the template using the settings sidebar.' ) }

diff --git a/packages/edit-widgets/src/components/sidebar/widget-areas.js b/packages/edit-widgets/src/components/sidebar/widget-areas.js index 838f5c35c97732..c34739fdd4db21 100644 --- a/packages/edit-widgets/src/components/sidebar/widget-areas.js +++ b/packages/edit-widgets/src/components/sidebar/widget-areas.js @@ -33,7 +33,8 @@ export default function WidgetAreas( { selectedWidgetAreaId } ) { let description; if ( ! selectedWidgetArea ) { description = __( - 'Widget Areas are global parts in your site’s layout that can accept blocks. These vary by theme, but are typically parts like your Side bar or Footer.' + // eslint-disable-next-line no-restricted-syntax -- 'sidebar' is a common web design term for layouts + 'Widget Areas are global parts in your site’s layout that can accept blocks. These vary by theme, but are typically parts like your Sidebar or Footer.' ); } else if ( selectedWidgetAreaId === 'wp_inactive_widgets' ) { description = __( From 85b5f8e3599d518962b3226db5c8f7e5c79fd2a3 Mon Sep 17 00:00:00 2001 From: im3dabasia Date: Wed, 12 Feb 2025 16:14:36 +0530 Subject: [PATCH 9/9] fix: Revert changes for post-template sidebar word --- .../src/components/post-template/create-new-template-modal.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/editor/src/components/post-template/create-new-template-modal.js b/packages/editor/src/components/post-template/create-new-template-modal.js index 2710fa146d3d2e..9a89cf385ebab4 100644 --- a/packages/editor/src/components/post-template/create-new-template-modal.js +++ b/packages/editor/src/components/post-template/create-new-template-modal.js @@ -126,7 +126,8 @@ export default function CreateNewTemplateModal( { onClose } ) { placeholder={ DEFAULT_TITLE } disabled={ isBusy } help={ __( - 'Describe the template, e.g. "Post with panel". A custom template can be manually applied to any post or page.' + // eslint-disable-next-line no-restricted-syntax -- 'sidebar' is a common web design term for layouts + 'Describe the template, e.g. "Post with sidebar". A custom template can be manually applied to any post or page.' ) } />