Merge 20.0.0.1 beta with conflicts resolution#18825
Conversation
It's my understanding that the `domains_dashboard_select_domain_tapped` Tracks event should be fired when a domain is added to the cart from the "Search domains" screen. It looks like there was a typo and `domains_dashboard_add_domain_tapped` was being fired instead. From what I can tell, this fix brings iOS in-line with Android, see code here: https://github.com/wordpress-mobile/WordPress-Android/blob/a045c883a39f8228b1aeaa8392dd64f90517eeec/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainSuggestionsViewModel.kt#L217-L225
…s-landscape Quick Start: Fix orientation-related issues with quick start notices
…tracks-event Fix Tracks event for adding domain to cart
…elease_1.77.1 Integrate gutenberg-mobile release 1.77.1
…elease_1.76.3 Integrate gutenberg-mobile release 1.76.3
As expected when merging the current release branch into an hotfix branch from the previous version, we got conflicts on the `Version.*.xcconfig` files. As usual, I resolved them with `git checkout --theirs`, keeping the value from the release branch. Additionally, there were conflicts on the `Podfile` and `Podfile.lock`. There reason for those is that the 19.9.1 hotfix was via a new Gutenberg version, 1.76.3. Meanwhile, on 20.0, Gutenberg was bumped to 1.77.1—itself a hotfix on Gutenberg latest stable with the same fix that went into 1.76.3 I resolved those conflicts, too, by keeping the version from `release/20.0` as that was the most up-to-date.
…oll-rtl Quick Start: Fix quick actions auto scrolling in RTL
Got conflict on `Podfile` and `Podfile.lock` because both branches changed the Gutenberg version since their common ancestor. I solved them by keeping the changes from `trunk` with `git checkout --theirs -- Podfile*`, under the assumption that the release on `trunk` is the appropriate one to have on that branch and that the Gutenberg team will integrate the changes for the version in the release branch into it, if they haven't done already.
| @@ -1 +0,0 @@ | |||
| Design a site, build a blog | |||
There was a problem hiding this comment.
This and all the en-CA files above were deleted because of a 429 from GlotPress:
[13:48:03]: No translation available for en-CA
I'm curious why it seems to be always en-CA that gets it. Same for the .strings, I've got it on da quite a few times.
There was a problem hiding this comment.
🤔
One thing they have in common is that they are both the sixth file requested:
[13:46:18]: Downloading translations for 'ar' from GlotPress (ar) [{:status=>"current"}]...
[13:46:20]: Downloading translations for 'bg' from GlotPress (bg) [{:status=>"current"}]...
[13:46:22]: Downloading translations for 'cs' from GlotPress (cs) [{:status=>"current"}]...
[13:46:24]: Downloading translations for 'cy' from GlotPress (cy) [{:status=>"current"}]...
[13:46:26]: Downloading translations for 'da' from GlotPress (da) [{:status=>"current"}]...
[13:46:27]: Error downloading locale `da` — 429 Too Many Requests (https://translate.wordpress.org/projects/apps/ios/dev/da/default/export-translations/?filters%5Bstatus%5D=current&format=strings)
Downloading language: ar-SA
Downloading language: da
Downloading language: de-DE
Downloading language: en-AU
Downloading language: en-CA
[13:48:03]: No translation available for en-CA
You can test the changes in Jetpack from this Pull Request by:
|
You can test the changes in WordPress from this Pull Request by:
|
Thanks @mokagio for the ping 🙇 ! Your assumption is right, the GB-mobile version on |
There was a problem hiding this comment.
Git graph looks as expected, and conflict resolution makes sense to me.
I'm not entirely sure that Gutenberg 1.78.0-alpha1 (which is what's currently used in trunk at the time of writing those lines) already includes the fix from 1.77.1 yet, but if not, I trust the Gutenberg team to ultimately include that fix in a future 1.78.0-alpha* or the final 1.78.0 before the next code freeze. cc @fluiddot @geriux
[EDIT] Nevermind the above ☝️: I had this PR open in a tab for more than 3h when I finally did the review, and thus missed @fluiddot's comment above that happened in the meantime, and which already confirms they're aware and already on it, so all good there 👍
Heads up that the Gutenberg Mobile reference will be updated with a new alpha tag in this PR. |
.stringsand Fastlane metadata) automatically pulled for the new translations that have already been approved in GlotPress.xcconfigGot conflict on
PodfileandPodfile.lockbecause both branches changed the Gutenberg version since their common ancestor.I solved them by keeping the changes from
trunkwithgit checkout --theirs -- Podfile*, under the assumption that the release ontrunkis the appropriate one to have on that branch and that the Gutenberg team will integrate the changes for the version in the release branch into it, if they haven't done already. cc @fluiddot @geriuxIncludes:
Testing
Nothing to test, if CI is green, we're good to merge.
Regression Notes
RELEASE-NOTES.txtif necessary. N.A.