Merge branch 'trunk' into add/boost/e2e-tests-image-cdn

Automattic · Apr 3, 2024 · 446cafc · 446cafc
2 parents 8f732f3 + de395b0
commit 446cafc
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 7 deletions.
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/fix-mu-wpcom-test-for-wp-6.5 b/projects/packages/jetpack-mu-wpcom/changelog/fix-mu-wpcom-test-for-wp-6.5
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Fix a unit test for changed output in WordPress 6.5. No change to functionality.
+
+
diff --git a/...ges/jetpack-mu-wpcom/tests/php/features/verbum-comments/class-verbum-block-utils-test.php b/...ges/jetpack-mu-wpcom/tests/php/features/verbum-comments/class-verbum-block-utils-test.php
@@ -45,7 +45,7 @@ public function test_comment_text_block_sanitization_sanity_check() {
 		$comment_content  = '<!-- wp:paragraph --><p>test</p><!-- /wp:paragraph --><!-- wp:list --><ul><!-- wp:list-item --><li>1</li><!-- /wp:list-item --><!-- wp:list-item --><li>2</li><!-- /wp:list-item --><!-- wp:list-item --><li>3</li><!-- /wp:list-item --></ul><!-- /wp:list --><!-- wp:quote --><blockquote class="wp-block-quote"><!-- wp:paragraph --><p>something</p><!-- /wp:paragraph --><cite>someone</cite></blockquote><!-- /wp:quote -->';
 		$filtered_content = preg_replace( '/\R+/', '', Verbum_Block_Utils::render_verbum_blocks( $comment_content ) );
 
-		$expected_content = '<p>test</p><ul><li>1</li><li>2</li><li>3</li></ul><blockquote class="wp-block-quote"><p>something</p><cite>someone</cite></blockquote>';
+		$expected_content = '<p>test</p><ul><li>1</li><li>2</li><li>3</li></ul><blockquote class="wp-block-quote is-layout-flow wp-block-quote-is-layout-flow"><p>something</p><cite>someone</cite></blockquote>';
 		$this->assertEquals( $expected_content, $filtered_content );
 	}
 

diff --git a/projects/plugins/jetpack/changelog/fix-sharing-blocks-not-translatable-text b/projects/plugins/jetpack/changelog/fix-sharing-blocks-not-translatable-text
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+Sharing block: make sharing options translatable
diff --git a/projects/plugins/jetpack/extensions/blocks/sharing-button/variations.js b/projects/plugins/jetpack/extensions/blocks/sharing-button/variations.js
@@ -10,8 +10,13 @@ export const variations = [
 	},
 	{
 		name: 'print',
-		attributes: { service: 'print', label: 'Print' },
-		title: 'Print',
+		attributes: {
+			service: 'print',
+			// translators: option to print the content - a verb.
+			label: __( 'Print', 'jetpack' ),
+		},
+		// translators: option to print the content - a verb labelling a button.
+		title: __( 'Print', 'jetpack' ),
 		icon: <SocialIcon icon={ 'print' } size={ 24 } />,
 	},
 	{
@@ -29,8 +34,13 @@ export const variations = [
 	},
 	{
 		name: 'mail',
-		attributes: { service: 'mail', label: 'Mail' },
-		title: 'Mail',
+		attributes: {
+			service: 'mail',
+			// translators: option to share the content by email - a verb.
+			label: __( 'Mail', 'jetpack' ),
+		},
+		// translators: option to share the content by email - a verb labelling a button.
+		title: __( 'Mail', 'jetpack' ),
 		keywords: [ 'email', 'e-mail' ],
 		icon: <SocialIcon icon={ 'mail' } size={ 24 } />,
 	},
@@ -104,8 +114,12 @@ export const variations = [
 	},
 	{
 		name: 'native-share',
-		attributes: { service: 'share', label: 'Share' },
-		/* translators: Sharing Button title */
+		attributes: {
+			service: 'share',
+			// translators: option to share the content - a verb.
+			label: __( 'Share', 'jetpack' ),
+		},
+		// translators: option to share the content - a verb labelling a button.
 		title: __( 'Native Share', 'jetpack' ),
 		icon: <SocialIcon icon={ 'share' } size={ 24 } />,
 		//TODO: we can add link in the future to proper documentation