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

Forms: Fix translation issue with % #41345

Merged
merged 2 commits into from
Jan 28, 2025
Merged

Conversation

edanzer
Copy link
Contributor

@edanzer edanzer commented Jan 28, 2025

Fixes #19940

Proposed changes:

Fixes translation issue with __( 'Emptying Spam (%1$s%)', 'jetpack' ). The last % is a literal % that should render, but causes an error during translation because its perceived as an escaping character.

  • Fix PHP issue: This if fixed by adding an extra % before the %. This fixes the PHP error.
  • Fix JS issue (see related comment): the PHP fix causes a secondary issue. The string is later passed to JS. We replace the %1$s with a value, but leave %% in place and render it. To fix this new issue, in the same place, we also replace %% to %.

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

None.

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

No.

Testing instructions:

  • Go to a site with a form block, and generate a few form submissions from the front end.
  • Go to the 'Feedback' page in the backend, and mark the submissions as spam.
  • Go to the 'Feedback' > 'Spam' tab, and click the Empty Spam button at the end. Confirm the button text renders correctly as Emptying Spam (0%) (percentage may vary).
  • Update your site to a foreign language, and re-run the test above to confirm the text string still renders correctly and spam is deleted.

Copy link
Contributor

github-actions bot commented Jan 28, 2025

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 a "[Type]" label (Bug, Enhancement, Janitorial, Task).
  • ✅ 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.


Follow this PR Review Process:

  1. Ensure all required checks appearing at the bottom of this PR are passing.
  2. Choose a review path based on your changes:
    • A. Team Review: add the "[Status] Needs Team Review" label
      • For most changes, including minor cross-team impacts.
      • Example: Updating a team-specific component or a small change to a shared library.
    • B. Crew Review: add the "[Status] Needs Review" label
      • For significant changes to core functionality.
      • Example: Major updates to a shared library or complex features.
    • C. Both: Start with Team, then request Crew
      • For complex changes or when you need extra confidence.
      • Example: Refactor affecting multiple systems.
  3. Get at least one approval before merging.

Still unsure? Reach out in #jetpack-developers for guidance!

@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 Jan 28, 2025
Copy link
Contributor

github-actions bot commented Jan 28, 2025

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/spam-percent-translation branch.

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

    bin/jetpack-downloader test jetpack fix/spam-percent-translation
    

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

@jeherve jeherve added [Type] Bug When a feature is broken and / or not performing as intended [Status] Ready to Merge Go ahead, you can push that green button! [Focus] i18n Internationalization / i18n, adaptation to different languages and removed [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! [Status] Needs Team Review labels Jan 28, 2025
@lezama lezama merged commit 51dd460 into trunk Jan 28, 2025
66 checks passed
@lezama lezama deleted the fix/spam-percent-translation branch January 28, 2025 12:45
@github-actions github-actions bot removed the [Status] Ready to Merge Go ahead, you can push that green button! label Jan 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Feature] Contact Form [Focus] i18n Internationalization / i18n, adaptation to different languages [Package] Forms [Type] Bug When a feature is broken and / or not performing as intended
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Forms: Translation string problem - Emptying spam
3 participants