Blocks: move localizable strings out of the metadata attributes field #36724

monsieur-z · 2024-04-03T15:48:42Z

Proposed changes:

Block attributes defined in the metadata block.json file are not localizable (see the WordPress.org documentation). This PR updates the following blocks to remove translatable strings from this file:

Paid Content
Jetpack AI Search
Donations
Subscriptions
Cookie Consent
Goodreads
Mailchimp

The approach is to remove default strings from the block.json files, define them in a JS file instead, and use them as a fallback when reading the attributes.

Other information:

Have you written new tests for your changes, if applicable?
Have you checked the E2E test CI results, and verified that your changes do not break them?
Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

Project thread: pf5801-Aw-p2

Does this pull request change what data or activity we track or use?

No.

Testing instructions:

For each block above, verify that it still works as expected in the editor and in the site (the Cookie Consent block may only be added in the site editor). Ideally, change the language to a language other than English and check that all UI elements are displayed in that language.

Note: if you can't see the text in the language you chose, make sure to update the latest translations in the Update page. You can also check if the translation exists with this tool.

github-actions · 2024-04-03T15:49:30Z

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

To test on WoA, go to the Plugins menu on a WordPress.com Simple site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin, and enable the fix/blocks-non-localized-strings branch.

To test on Simple, run the following command on your sandbox:

bin/jetpack-downloader test jetpack fix/blocks-non-localized-strings

Interested in more tips and information?

In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
Read more about our development workflow here: PCYsg-eg0-p2
Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

github-actions · 2024-04-03T15:50:11Z

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

✅ Include a description of your PR changes.
✅ Add a "[Status]" label (In Progress, Needs Team Review, ...).
✅ Add testing instructions.
✅ Specify whether this PR includes any changes to data or privacy.
✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖

The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.

Once your PR is ready for review, check one last time that all required checks appearing at the bottom of this PR are passing or skipped.
Then, add the "[Status] Needs Team Review" label and ask someone from your team review the code. Once reviewed, it can then be merged.
If you need an extra review from someone familiar with the codebase, you can update the labels from "[Status] Needs Team Review" to "[Status] Needs Review", and in that case Jetpack Approvers will do a final review of your PR.

Jetpack plugin:

The Jetpack plugin has different release cadences depending on the platform:

WordPress.com Simple releases happen daily.
WoA releases happen weekly.
Releases to self-hosted sites happen monthly. The next release is scheduled for May 7, 2024 (scheduled code freeze on April 29, 2024).

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

monsieur-z · 2024-04-03T17:47:42Z

projects/plugins/jetpack/extensions/blocks/premium-content/block.json

@@ -50,22 +50,6 @@
 		"isPremiumContentChild": "isPremiumContentChild"
 	},
 	"attributes": {
-		"newPlanName": {


These attributes are not used anywhere any more. Removing them doesn't break backward compatibility.

monsieur-z · 2024-04-03T17:54:35Z

projects/plugins/jetpack/extensions/blocks/subscriptions/subscriptions.php

@@ -60,88 +60,6 @@ function register_block() {
 					),
 					'align'   => array( 'wide', 'full' ),
 				),
-				'attributes'      => array(


Attributes were added back to server-side registration as a temporary workaround (#36695).

monsieur-z · 2024-04-03T18:52:09Z

...ions/blocks/subscriptions/test/fixtures/jetpack__subscriptions__deprecated-1.serialized.html

@@ -1 +1 @@
-<!-- wp:jetpack/subscriptions /-->
+<!-- wp:jetpack/subscriptions {"submitButtonText":"Subscribe"} /-->


I've followed how failing tests were fixed in previous similar situations: #27443.

monsieur-z · 2024-04-03T19:00:40Z

...k/extensions/blocks/mailchimp/test/fixtures/jetpack__mailchimp__deprecated-1.serialized.html

@@ -1,3 +1,3 @@
-<!-- wp:jetpack/mailchimp -->


I've followed how failing tests were fixed in previous similar situations: #27443.

jeherve

When adding a block, the default seems to still be the English version on my end, e.g.:

monsieur-z · 2024-04-04T13:14:43Z

@jeherve, updating the translations should fix this.

jeherve · 2024-04-04T13:43:30Z

updating the translations should fix this.

Thanks! For some reason I had updated the translations, but needed to do once again. ¯_(ツ)_/¯

It works well now.

…#36724) * Blocks: move localizable strings out of the metadata attributes field * Fix Goodreads block tests * Update Subscriptions block test fixtures * Update Mailchimp block test fixtures

Blocks: move localizable strings out of the metadata attributes field

6a287f0

monsieur-z added the [Status] In Progress label Apr 3, 2024

monsieur-z self-assigned this Apr 3, 2024

github-actions bot added [Block] AI Chat [Block] Cookie Consent [Block] Donations [Block] Goodreads [Block] Mailchimp [Block] Paid Content aka Premium Content [Block] Subscriptions [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ labels Apr 3, 2024

Fix Goodreads block tests

a203e68

github-actions bot added the [Tests] Includes Tests label Apr 3, 2024

monsieur-z commented Apr 3, 2024

View reviewed changes

Update Subscriptions block test fixtures

258b57c

monsieur-z commented Apr 3, 2024

View reviewed changes

Update Mailchimp block test fixtures

222b010

monsieur-z commented Apr 3, 2024

View reviewed changes

monsieur-z requested a review from a team April 3, 2024 19:23

monsieur-z added [Status] Needs Team Review and removed [Status] In Progress labels Apr 3, 2024

jeherve reviewed Apr 4, 2024

View reviewed changes

jeherve approved these changes Apr 4, 2024

View reviewed changes

jeherve added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] Needs Team Review labels Apr 4, 2024

Merge branch 'trunk' into fix/blocks-non-localized-strings

6305046

monsieur-z merged commit 15b62d0 into trunk Apr 4, 2024
56 checks passed

monsieur-z deleted the fix/blocks-non-localized-strings branch April 4, 2024 19:01

github-actions bot added this to the jetpack/13.3.1 milestone Apr 4, 2024

github-actions bot removed the [Status] Ready to Merge Go ahead, you can push that green button! label Apr 4, 2024

simison added the [Type] Bug When a feature is broken and / or not performing as intended label Apr 5, 2024

zinigor modified the milestones: jetpack/13.3.1, jetpack/13.4 Apr 10, 2024

monsieur-z mentioned this pull request Apr 17, 2024

Donations block: fix non lolcalized strings #36951

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Blocks: move localizable strings out of the metadata attributes field #36724

Blocks: move localizable strings out of the metadata attributes field #36724

monsieur-z commented Apr 3, 2024 •

edited

Loading

github-actions bot commented Apr 3, 2024 •

edited

Loading

github-actions bot commented Apr 3, 2024

monsieur-z Apr 3, 2024

monsieur-z Apr 3, 2024

monsieur-z Apr 3, 2024

monsieur-z Apr 3, 2024

jeherve left a comment

monsieur-z commented Apr 4, 2024

jeherve commented Apr 4, 2024

		@@ -1 +1 @@
		<!-- wp:jetpack/subscriptions /-->
		<!-- wp:jetpack/subscriptions {"submitButtonText":"Subscribe"} /-->

Blocks: move localizable strings out of the metadata attributes field #36724

Blocks: move localizable strings out of the metadata attributes field #36724

Conversation

monsieur-z commented Apr 3, 2024 • edited Loading

Proposed changes:

Other information:

Jetpack product discussion

Does this pull request change what data or activity we track or use?

Testing instructions:

github-actions bot commented Apr 3, 2024 • edited Loading

github-actions bot commented Apr 3, 2024

monsieur-z Apr 3, 2024

Choose a reason for hiding this comment

monsieur-z Apr 3, 2024

Choose a reason for hiding this comment

monsieur-z Apr 3, 2024

Choose a reason for hiding this comment

monsieur-z Apr 3, 2024

Choose a reason for hiding this comment

jeherve left a comment

Choose a reason for hiding this comment

monsieur-z commented Apr 4, 2024

jeherve commented Apr 4, 2024

monsieur-z commented Apr 3, 2024 •

edited

Loading

github-actions bot commented Apr 3, 2024 •

edited

Loading