From 063a7b0fae38caad6c2abd7f3a1d1754fb803963 Mon Sep 17 00:00:00 2001 From: AhmarZaidi Date: Tue, 22 Oct 2024 17:57:59 +0530 Subject: [PATCH 1/5] Update percentage strings to be translatable --- .../src/components/image-size-control/index.js | 8 ++++++-- packages/block-library/src/button/edit.js | 8 ++++++-- packages/block-library/src/search/edit.js | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/packages/block-editor/src/components/image-size-control/index.js b/packages/block-editor/src/components/image-size-control/index.js index 7a333e98f795a1..7746aec6ade95b 100644 --- a/packages/block-editor/src/components/image-size-control/index.js +++ b/packages/block-editor/src/components/image-size-control/index.js @@ -8,7 +8,7 @@ import { __experimentalNumberControl as NumberControl, __experimentalHStack as HStack, } from '@wordpress/components'; -import { __ } from '@wordpress/i18n'; +import { __, sprintf } from '@wordpress/i18n'; /** * Internal dependencies @@ -99,7 +99,11 @@ export default function ImageSizeControl( { ) } > - { scale }% + { sprintf( + /* translators: Percentage value. */ + __( '%1$s%%' ), + scale + ) } ); } ) } diff --git a/packages/block-library/src/button/edit.js b/packages/block-library/src/button/edit.js index 3539fd54f4eece..b7368ee10bb1d4 100644 --- a/packages/block-library/src/button/edit.js +++ b/packages/block-library/src/button/edit.js @@ -13,7 +13,7 @@ import removeAnchorTag from '../utils/remove-anchor-tag'; /** * WordPress dependencies */ -import { __ } from '@wordpress/i18n'; +import { __, sprintf } from '@wordpress/i18n'; import { useEffect, useState, useRef, useMemo } from '@wordpress/element'; import { Button, @@ -137,7 +137,11 @@ function WidthPanel( { selectedWidth, setAttributes } ) { } onClick={ () => handleChange( widthValue ) } > - { widthValue }% + { sprintf( + /* translators: Percentage value. */ + __( '%1$s%%' ), + widthValue + ) } ); } ) } diff --git a/packages/block-library/src/search/edit.js b/packages/block-library/src/search/edit.js index d4ed5b7e3a4055..fbb5f8c429a618 100644 --- a/packages/block-library/src/search/edit.js +++ b/packages/block-library/src/search/edit.js @@ -34,7 +34,7 @@ import { } from '@wordpress/components'; import { useInstanceId } from '@wordpress/compose'; import { Icon, search } from '@wordpress/icons'; -import { __ } from '@wordpress/i18n'; +import { __, sprintf } from '@wordpress/i18n'; import { __unstableStripHTML as stripHTML } from '@wordpress/dom'; /** @@ -467,7 +467,11 @@ export default function SearchEdit( { } ) } > - { widthValue }% + { sprintf( + /* translators: Percentage value. */ + __( '%1$s%%' ), + widthValue + ) } ); } ) } From e81b2a2316ae21d16c66377bbbe34ebeaefb704a Mon Sep 17 00:00:00 2001 From: AhmarZaidi Date: Tue, 12 Nov 2024 18:13:56 +0530 Subject: [PATCH 2/5] Fix js lint errors --- .../src/components/image-size-control/index.js | 8 ++++++-- packages/block-library/src/search/edit.js | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/block-editor/src/components/image-size-control/index.js b/packages/block-editor/src/components/image-size-control/index.js index b5bb705ab101c1..b67c2d59a4c1f2 100644 --- a/packages/block-editor/src/components/image-size-control/index.js +++ b/packages/block-editor/src/components/image-size-control/index.js @@ -8,7 +8,7 @@ import { __experimentalToggleGroupControl as ToggleGroupControl, __experimentalToggleGroupControlOption as ToggleGroupControlOption, } from '@wordpress/components'; -import { __ } from '@wordpress/i18n'; +import { __, sprintf } from '@wordpress/i18n'; /** * Internal dependencies @@ -137,7 +137,11 @@ export default function ImageSizeControl( { ); } ) } diff --git a/packages/block-library/src/search/edit.js b/packages/block-library/src/search/edit.js index f193c04e2493aa..2d16f309f701aa 100644 --- a/packages/block-library/src/search/edit.js +++ b/packages/block-library/src/search/edit.js @@ -34,7 +34,7 @@ import { } from '@wordpress/components'; import { useInstanceId } from '@wordpress/compose'; import { Icon, search } from '@wordpress/icons'; -import { __ } from '@wordpress/i18n'; +import { __, sprintf } from '@wordpress/i18n'; import { __unstableStripHTML as stripHTML } from '@wordpress/dom'; /** @@ -470,7 +470,11 @@ export default function SearchEdit( { ); } ) } From 1b4e2fad990ec400529cfff670bfafdb4c0f3ac8 Mon Sep 17 00:00:00 2001 From: AhmarZaidi Date: Wed, 13 Nov 2024 18:34:41 +0530 Subject: [PATCH 3/5] Revert unexpected changes --- packages/block-library/src/image/block.json | 9 +-------- packages/block-library/src/post-content/block.json | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/packages/block-library/src/image/block.json b/packages/block-library/src/image/block.json index 26835df9e856cd..16e31217476026 100644 --- a/packages/block-library/src/image/block.json +++ b/packages/block-library/src/image/block.json @@ -4,14 +4,7 @@ "name": "core/image", "title": "Image", "category": "media", - "usesContext": [ - "allowResize", - "imageCrop", - "fixedHeight", - "postId", - "postType", - "queryId" - ], + "usesContext": [ "allowResize", "imageCrop", "fixedHeight", "postId", "postType", "queryId" ], "description": "Insert an image to make a visual statement.", "keywords": [ "img", "photo", "picture" ], "textdomain": "default", diff --git a/packages/block-library/src/post-content/block.json b/packages/block-library/src/post-content/block.json index e5d455b97a8a3d..ed9c47154b2f8e 100644 --- a/packages/block-library/src/post-content/block.json +++ b/packages/block-library/src/post-content/block.json @@ -69,4 +69,4 @@ }, "style": "wp-block-post-content", "editorStyle": "wp-block-post-content-editor" -} +} \ No newline at end of file From f0aa3071844f2712ca97761ca9d289bd1948ff6f Mon Sep 17 00:00:00 2001 From: AhmarZaidi Date: Tue, 31 Dec 2024 17:14:58 +0530 Subject: [PATCH 4/5] Add translation for button block --- packages/block-library/src/button/edit.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/block-library/src/button/edit.js b/packages/block-library/src/button/edit.js index 9c0f5d36bedea0..30530f65c263e6 100644 --- a/packages/block-library/src/button/edit.js +++ b/packages/block-library/src/button/edit.js @@ -148,7 +148,11 @@ function WidthPanel( { selectedWidth, setAttributes } ) { ); } ) } From ae9fe80367662faa4926175e4a2b67ec8ce006b1 Mon Sep 17 00:00:00 2001 From: AhmarZaidi Date: Thu, 2 Jan 2025 13:37:15 +0530 Subject: [PATCH 5/5] Use integer instead of string placeholders --- .../block-editor/src/components/image-size-control/index.js | 2 +- packages/block-library/src/button/edit.js | 2 +- packages/block-library/src/search/edit.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/block-editor/src/components/image-size-control/index.js b/packages/block-editor/src/components/image-size-control/index.js index b67c2d59a4c1f2..3432e85728fd38 100644 --- a/packages/block-editor/src/components/image-size-control/index.js +++ b/packages/block-editor/src/components/image-size-control/index.js @@ -139,7 +139,7 @@ export default function ImageSizeControl( { value={ scale } label={ sprintf( /* translators: Percentage value. */ - __( '%1$s%%' ), + __( '%1$d%%' ), scale ) } /> diff --git a/packages/block-library/src/button/edit.js b/packages/block-library/src/button/edit.js index 30530f65c263e6..06e10f604650eb 100644 --- a/packages/block-library/src/button/edit.js +++ b/packages/block-library/src/button/edit.js @@ -150,7 +150,7 @@ function WidthPanel( { selectedWidth, setAttributes } ) { value={ widthValue } label={ sprintf( /* translators: Percentage value. */ - __( '%1$s%%' ), + __( '%1$d%%' ), widthValue ) } /> diff --git a/packages/block-library/src/search/edit.js b/packages/block-library/src/search/edit.js index 2d16f309f701aa..b4ac37220c816c 100644 --- a/packages/block-library/src/search/edit.js +++ b/packages/block-library/src/search/edit.js @@ -472,7 +472,7 @@ export default function SearchEdit( { value={ widthValue } label={ sprintf( /* translators: Percentage value. */ - __( '%1$s%%' ), + __( '%1$d%%' ), widthValue ) } />