Merge 23.1 code freeze and 23.1.0.1 beta with conflicts resolution #21395
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
This issue was revealed by a strings generation _warning_: [12:54:11]: ▸ Key "mySite.domain.focus.card.title" used with multiple values. Value "News" kept. Value "Reclaim your Google Domains" ignored. Unfortunately, we don't have the tooling at the moment to translate this warning into an error. See wordpress-mobile/release-toolkit#446
…al-on-private-posts Jetpack Social: Hide Jetpack Social for private posts
…-unshared-connections Jetpack Social: Exclude unshared private connections from other users
This is a replay of 8b45111. Evidently, the entry in GlotPress has yet to be approved despite it being there for almost two weeks... Comment from 8b45111 below: I suggested a fix in GlotPress and tried to approve it using the admin account, but got an error. I'll follow up this internally, but in the meantime I fixed the translation manually to complete the beta deployment. https://translate.wordpress.org/projects/apps/ios/dev/ro/default/?filters%5Boriginal_id%5D=16177110&filters%5Bstatus%5D=either&filters%5Btranslation_id%5D=107327707
This was done to address release notes conflicts picked up by GitHub in #21374
5 tasks
|
| App Name |  WordPress Alpha |
|
| Configuration | Release-Alpha | |
| Build Number | pr21395-913d528 | |
| Version | 23.1 | |
| Bundle ID | org.wordpress.alpha | |
| Commit | 913d528 | |
| App Center Build | WPiOS - One-Offs #6811 |
|
| App Name |  Jetpack Alpha |
|
| Configuration | Release-Alpha | |
| Build Number | pr21395-913d528 | |
| Version | 23.1 | |
| Bundle ID | com.jetpack.alpha | |
| Commit | 913d528 | |
| App Center Build | jetpack-installable-builds #5851 |
|
I'm going to jump the gun and admin merge this so that we can get all the translations started. |
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.
The conflicts were on the
RELEASE-NOTES.txtfile and were solved by keeping all the entries fromtrunkand discarding the empty line from the release branchRelease checks
RELEASE-NOTE.txtLocalizable.stringsupdatedrelease_notes.txtupdated with notes fromRELEASE-NOTE.txtfor current version.xcconfigNotice the double "Update strings for localization" commit because of 418252c.
I noticed the warning in the logs only after triggering the beta builds in CI. As such, I cancelled the existing job and started a new one. This way, the first beta build won't reuse "News" in place of "Reclaim your Google Domains."
As mentioned in the commit, the fact that CI doesn't fail upon reused localization keys is a known limitation of our i18n validation tooling, wordpress-mobile/release-toolkit#446
Also notice 4cc4b83 that, again, addresses the one
rotranslation with incorrect placeholders.23.1.0.1 includes