Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MU WPCOM: Support localizeUrl #38318

Merged
merged 7 commits into from
Jul 16, 2024
Merged

MU WPCOM: Support localizeUrl #38318

merged 7 commits into from
Jul 16, 2024

Conversation

arthur791004
Copy link
Contributor

@arthur791004 arthur791004 commented Jul 12, 2024

Fixes https://github.com/Automattic/dotcom-forge/issues/8244

Proposed changes:

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

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

Testing instructions:

  • Apply changes to your site
  • Make sure the links related to https://github.com/Automattic/dotcom-forge/issues/8037 are localized
    • Block Description
      • Head to Site Editor.
      • Insert a block such as the Image Block or the List Block.
      • Open the Settings panel and select the Block tab.
      • Ensure that the Block Guide link is as shown in the screenshot above.
      • Ensure that clicking the link opens the Help Center.
      • Ensure it displays the correct locale.
    • Tags Education
      • Head to the Post Editor.
      • Open the Settings panel, and expand the Tags section.
      • Ensure that the link "Build your audience with tags↗" is available.
      • Ensure it displays the correct locale.
    • Documentation Links
      • Head to the Post Editor.
      • Open the Settings panel by clicking the Settings icon in the top bar.
      • Click the Link slug in the Post tab.
      • Ensure it displays the correct locale.
Copy link
Contributor

github-actions bot commented Jul 12, 2024

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.


Mu Wpcom plugin:

  • Next scheduled release: August 6, 2024.
  • Scheduled code freeze: July 29, 2024.

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


Wpcomsh plugin:

  • Next scheduled release: August 6, 2024.
  • Scheduled code freeze: July 29, 2024.

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

@github-actions github-actions bot added the [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! label Jul 12, 2024
Copy link
Contributor

github-actions bot commented Jul 12, 2024

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 mu-wpcom/localize-url branch.

    • For jetpack-mu-wpcom changes, also add define( 'JETPACK_MU_WPCOM_LOAD_VIA_BETA_PLUGIN', true ); to your wp-config.php file.
  • To test on Simple, run the following command on your sandbox:

    bin/jetpack-downloader test jetpack mu-wpcom/localize-url
    
    bin/jetpack-downloader test jetpack-mu-wpcom-plugin mu-wpcom/localize-url
    

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
@@ -62,6 +66,7 @@
"@wordpress/url": "4.2.0",
"@wordpress/icons": "10.2.0",
"clsx": "2.1.1",
"i18n-calypso": "7.0.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would there be a way around bringing the whole of i18n-calypso to the mu-wpcom package? It was nice that we were able to stick to @wordpress/i18n until now, it would be great if we could continue to do so.

I'm not familiar enough with i18n-calypso to know if we could work around that dependency though.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be better to get rid of the i18n-calypso dependency from the @automattic/i18n-utils package and use @wordpress/i18n instead.

It seems to be done by just removing the usage of the getLocaleSlug call from the @automattic/i18n-utils package.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've remove the i18n-calypso dependency from the @automattic/i18n-utils. See Automattic/wp-calypso#92631.

@arthur791004 arthur791004 requested a review from a team July 12, 2024 10:44
@arthur791004 arthur791004 added [Status] Needs Team Review and removed [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! labels Jul 12, 2024
@arthur791004 arthur791004 requested review from a team and alshakero and removed request for a team July 15, 2024 08:05
fushar
fushar previously approved these changes Jul 15, 2024
Copy link
Contributor

@fushar fushar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested on:

✅ Simple site
✅ Atomic site

tags-education

Before After
image image

wpcom-block-description-links

Before After
image image

wpcom-documentation-links

Before After
image image
@fushar
Copy link
Contributor

fushar commented Jul 15, 2024

@alshakero Could we request a review from you for Help-Center related changes on this PR? Thanks!

Copy link
Member

@alshakero alshakero left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and all works. But left some code comments.

projects/packages/jetpack-mu-wpcom/src/common/index.php Outdated Show resolved Hide resolved
@@ -49,6 +48,10 @@ module.exports = [
},
resolve: {
...jetpackWebpackConfig.resolve,
alias: {
...jetpackWebpackConfig.resolve.alias,
'@automattic/calypso-config': '@automattic/calypso-config/src/client.js',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just curious, why do we need that?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The default entry has server-side code (e.g.: path) and it causes the error during the build. As a result, we have to specify the client.js manually

@github-actions github-actions bot added the [Plugin] mu wpcom jetpack-mu-wpcom plugin label Jul 16, 2024
Copy link
Contributor

@fushar fushar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Retested and it still works.

@arthur791004 arthur791004 merged commit 376356a into trunk Jul 16, 2024
70 of 72 checks passed
@arthur791004 arthur791004 deleted the mu-wpcom/localize-url branch July 16, 2024 08:29
fushar added a commit that referenced this pull request Jul 23, 2024
fushar added a commit that referenced this pull request Jul 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment