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

#62424 Populate the rest of the duplicated keys before populating the one that requires a translation #7843

Open
wants to merge 2 commits into
base: trunk
Choose a base branch
from

Conversation

johnbillion
Copy link
Member

Copy link

github-actions bot commented Nov 19, 2024

The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the props-bot label.

Core Committers: Use this line as a base for the props when committing in SVN:

Props johnbillion, joemcgill, desrosj.

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.

Copy link

Test using WordPress Playground

The changes in this pull request can previewed and tested using a WordPress Playground instance.

WordPress Playground is an experimental project that creates a full WordPress instance entirely within the browser.

Some things to be aware of

  • The Plugin and Theme Directories cannot be accessed within Playground.
  • All changes will be lost when closing a tab with a Playground instance.
  • All changes will be lost when refreshing the page.
  • A fresh instance is created each time the link below is clicked.
  • Every time this pull request is updated, a new ZIP file containing all changes is created. If changes are not reflected in the Playground instance,
    it's possible that the most recent build failed, or has not completed. Check the list of workflow runs to be sure.

For more details about these limitations and more, check out the Limitations page in the WordPress Playground documentation.

Test this pull request with WordPress Playground.

Copy link
Member

@joemcgill joemcgill left a comment

Choose a reason for hiding this comment

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

This seems to fix the reason I was seeing this behavior. I'm not sure whether anything would be expecting the $duplicated_keys order to be specific, but I didn't see any.

For readability, we may want to move both instances of 'put your unique phrase here' next to each other rather than splitting them by the foreach loop.

Copy link
Contributor

@desrosj desrosj left a comment

Choose a reason for hiding this comment

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

Thanks for this. I think this is the best approach for 6.7.1 to fix this edge case.

I did some testing while using non-default locales, and the localized version of the string was also included in $duplicated_keys as expected.

@desrosj
Copy link
Contributor

desrosj commented Nov 20, 2024

One other thing that I tested. I was wondering if the first recursive call of wp_salt() that occurred would not contain the localized version of the string. With a site localized into Japanese, this would be ここに独自のフレーズを入力します. In my testing, I was unable to confirm this to be the case. It seems like the localized version of the string will be in the array as expected with this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants