Merge hotfix 21.4.1 into relese 21.5 #19906
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The fix was in the previous commit, 0fdcefc Interesting to note that the modified string was not the only one to change once the automate process run.
As usual when merging a hotfix, we got conflicts in the version `xcconfig` files: - `config/Version.internal.xcconfig` - `config/Version.public.xcconfig` I resolved them by keeping the version from the 21.5 branch, as that is the newest version and the one we want to keep in that branch.
mokagio
commented
Jan 13, 2023
| "migration.notifications.footer" = "When the alert apears tap Allow to continue receiving all your WordPress notifications."; | ||
| "migration.notifications.footer" = "When the alert appears tap Allow to continue receiving all your WordPress notifications."; |
There was a problem hiding this comment.
After this PR lands in release/21.5, we'll followup with one that lands release/21.5 into trunk. Once that happens, this change will be sent to GlotPress.
I'm not sure how GlotPress will react to it, but my guess is that it will mark all the translations for migration.notifications.footer as fuzzy because it should recognize the new value as similar (short Levenshtein distance?) as the previous one. In that case, it will be straightforward to approve those strings on our end, without having to wait for community translators to do so.
You can test the changes in Jetpack from this Pull Request by:
|
You can test the changes in WordPress from this Pull Request by:
|
This was referenced Jan 16, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As usual when merging a hotfix, we got conflicts in the version
xcconfigfiles:config/Version.internal.xcconfigconfig/Version.public.xcconfigI resolved them by keeping the version from the 21.5 branch, as that is the newest version and the one we want to keep in that branch.
The reason we made the hotfix 21.4.1 was to have complete localization of the new, critical Jetpack migration flow and include a minor typo fix, #19878. As such, 21.4.1 updates all the
.stringsfiles, which is also why we have all those files changed in the diff.For reference, you can check the 21.4.1 localization changes against 21.4 via #19905.