Merge editorialized release notes and 18.5.0.3 into `develop` by mokagio · Pull Request #17346 · wordpress-mobile/WordPress-iOS

mokagio · 2021-10-21T02:42:19Z

No description provided.

I say "editorialized" because we didn't go through editorial this time, but wrote them ourselves.

We plan to do some ASO experiments, and therefore will end up with manually curated keywords in multiple locales. Verbatim translation from English is therefore no longer necessary and would actually risk undoing some of the curation work because of how our automation works.

I was expecting it to be removed automatically, but wasn't the case.

peril-wordpress-mobile · 2021-10-21T02:42:24Z

You can trigger an installable build for these changes by visiting CircleCI here.

mokagio

LOL at the format of our release notes:

Something something easier...
Something something now...
Something something help...
<closing adverb>, we...

mokagio · 2021-10-21T02:44:54Z

WordPress/Resources/AppStoreStrings.po

-#. translators: Keywords used in the App Store search engine to find the app.
-#. Delimit with a comma between each keyword. Limit to 100 characters including spaces and commas.
-msgctxt "app_store_keywords"
-msgid "social,notes,jetpack,writing,geotagging,media,blog,website,blogging,journal"
-msgstr ""


We'll no longer translate keywords so that we can experiment with ASO using localized Fastlane files (keywords.txt) as the source of truth and not risk the GlotPress automation overriding them.

…elease_1.64.1 Integrate gutenberg-mobile release 1.64.1

peril-wordpress-mobile · 2021-10-21T08:19:48Z

	Messages
📖	This PR has the 'Releases' label: some checks will be skipped.

Generated by 🚫 dangerJS

AliSoftware

✅ release_notes.txt updated for WP and JP
✅ .po file updated for WP and JP
⚠️ Also contains changes from the new beta (Gutenberg bugfix) in Podfile, but not the related version bumps in xcconfig 🤔

LGTM overall, but:

Left a question to check if it was intentional that the Jetpack keywords were still translated (while the WordPress ones are not anymore). I think it's intentional, but just wanted to flag to be sure.
The fact that this PR contains the update in Podfile/Podfile.lock about gutenberg 1.64.1 but not the app version bumps in xcconfig makes me think you haven't done the related beta yet?

Which means it would be odd to merge this PR as is with half the changes for the beta (G but not xcconfig) in it. I think it makes sense to wait for you to do the beta and have the version bump included in this PR before merging it all (hence why I'm just commenting not approving)

fastlane/Fastfile

…nt-error-messages Fix/17344 - Close account error messages

AliSoftware · 2021-10-21T19:10:57Z

The Buildkite failure on io-tests-ipad seems a bit odd:

📦 Restoring cache for wordpress-mobile/wordpress-ios/ from a8c-repo-mirrors | 0s
-- | --
  | Using Git Mirror Server at http://10.254.3.14:41362
  | % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
  | Dload  Upload   Total   Spent    Left  Speed
  | 0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  | 🚨 Error: The plugin git-s3-cache pre-checkout hook exited with status 1

I'm hoping this was just a glitch or network issue, so I just restarted it in Buildkite, let's hope and see…

mokagio · 2021-10-22T00:10:38Z

Looks like the Buildkite fail was just a network issue after all 😄

mokagio · 2021-10-22T00:15:58Z

Left a question to check if it was intentional that the Jetpack keywords were still translated (while the WordPress ones are not anymore). I think it's intentional, but just wanted to flag to be sure.

Confirming that was intentional. Since no work has been done on Jetpack and, as far as I know, no work is planned either, I left the Jetpack keywords setup through GlotPress.

The fact that this PR contains the update in Podfile/Podfile.lock about gutenberg 1.64.1 but not the app version bumps in xcconfig makes me think you haven't done the related beta yet?

That must be a byproduct of this PR being straight from the release/18.5 and #17341 having gone in after I opened this but before it was merged:

I try to use a merge branch only when necessary (i.e. when I know there would be conflicts trying to merge into develop) to keep the Git history a bit tidier. But that does come with this kind of issue when there's activity on the release branch ⚖️

I'm going to start a new beta for that and the localization fixes soon.

AliSoftware

New commits added:

✅ Version bump in xcconfig for new beta
✅ Update of .strings file with latest GlotPress translations

Gutenberg version didn't generate a conflict because at the time of this writing, develop is still pointing to 1.64.0 (and not a new 1.65.0-alpha* which would have been the case if a new feature or fix for Gutenberg had been necessary for a feature worked on in develop in the meantime), so should be all good to merge as is!

AliSoftware · 2021-10-22T11:35:15Z

Podfile

    ## =====================
    ##
-    gutenberg :tag => 'v1.64.0'
+    gutenberg :tag => 'v1.64.1'


I'm surprised that develop is not yet on an v1.65.0-alpha in WPiOS (like it was when I did my beta for WPAndroid) – which is why this hasn't triggered a merge conflict and why this bump can be merged as is in develop

Flagging @antonis @geriux just to check about the plan for the new 1.65.0-alpha* in WPiOS (ie either make it be cut from 1.64.1, or, more likely, include that fix from 1.64.1 in the new 1.65.0-alpha*, as you already did that for WPAndroid. Given the increase in Gutenberg versions in WPiOS's develop differed here from WPAndroid where we already had a new alpha in-between, just wanted to be sure.

I think it's all good because the upcoming 1.65.0-alpha2 you are working on, and likely plan to merge in WPiOS's develop (just like what you started in WPAndroid), is already supposed to include that same fix that was in 1.64.1 anyway (it's the same Gutenberg as WPAndroid after all)… but it doesn't hurt to ask confirmation and better safe than sorry 😄

I'm surprised that develop is not yet on an v1.65.0-alpha in WPiOS (like it was when I did my beta for WPAndroid) – which is why this hasn't triggered a merge conflict and why this bump can be merged as is in develop.

Usually, alpha versions are merged when there are native changes that affect Gutenberg mobile, sometimes is for both platforms but in this case, it was only for Android because of new changes to react-native-aztec and S3.

It's all good because next week we will cut 1.65.0 to be merged in develop before the next release cut.

Thanks for the confirmation. All good then 👍

Thanks folks!

Gerardo Pacheco and others added 8 commits October 20, 2021 15:23

Release script: Update gutenberg-mobile ref

8a8fb2c

Update Gutenberg ref

10407bd

Add "editorialized" release notes for version 18.5

ade05c6

I say "editorialized" because we didn't go through editorial this time, but wrote them ourselves.

Update metadata strings

e1587cd

Update metadata strings

8984205

Manually fix incorrect msgid

05cec5a

Manually remove keywords entry from WordPress AppStoreStrings.po

e5ef558

I was expecting it to be removed automatically, but wasn't the case.

mokagio added the Releases label Oct 21, 2021

mokagio requested a review from a team October 21, 2021 02:42

mokagio commented Oct 21, 2021

View reviewed changes

mokagio added this to the 18.5 ❄️ milestone Oct 21, 2021

mokagio marked this pull request as ready for review October 21, 2021 02:47

mokagio enabled auto-merge October 21, 2021 03:12

Gerardo Pacheco added 2 commits October 21, 2021 09:22

Update Gutenberg ref

c76c539

Merge pull request #17341 from wordpress-mobile/gutenberg/integrate_r…

0adbcb2

…elease_1.64.1 Integrate gutenberg-mobile release 1.64.1

AliSoftware reviewed Oct 21, 2021

View reviewed changes

fastlane/Fastfile Show resolved Hide resolved

Nikola Milicevic and others added 4 commits October 21, 2021 15:20

Generate localized message for specific error

a37984b

Display localized error message

c147a9a

Update strings for localization

3f667e0

Merge pull request #17350 from wordpress-mobile/fix/17344-close-accou…

fc2adb8

…nt-error-messages Fix/17344 - Close account error messages

mokagio added 2 commits October 22, 2021 11:36

Update translations

0b0c8ab

Bump version number

678a855

mokagio changed the title ~~Merge editorialized release notes for 18.5 into develop~~ Merge editorialized release notes and 18.5.0.3 into develop Oct 22, 2021

mokagio disabled auto-merge October 22, 2021 02:44

mokagio enabled auto-merge October 22, 2021 02:45

This was referenced Oct 22, 2021

Fix/17344 - Close account error messages #17350

Merged

Integrate gutenberg-mobile release 1.64.1 #17341

Merged

AliSoftware approved these changes Oct 22, 2021

View reviewed changes

mokagio merged commit 6fd0376 into develop Oct 22, 2021

Conversation

mokagio commented Oct 21, 2021

Uh oh!

peril-wordpress-mobile bot commented Oct 21, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mokagio left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mokagio Oct 21, 2021

Choose a reason for hiding this comment

Uh oh!

peril-wordpress-mobile bot commented Oct 21, 2021

Uh oh!

AliSoftware left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

AliSoftware commented Oct 21, 2021

Uh oh!

mokagio commented Oct 22, 2021

Uh oh!

mokagio commented Oct 22, 2021

Uh oh!

AliSoftware left a comment

Choose a reason for hiding this comment

Uh oh!

AliSoftware Oct 22, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

geriux Oct 22, 2021

Choose a reason for hiding this comment

Uh oh!

AliSoftware Oct 22, 2021

Choose a reason for hiding this comment

Uh oh!

mokagio Oct 25, 2021

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

peril-wordpress-mobile bot commented Oct 21, 2021 •

edited

Loading

mokagio left a comment •

edited

Loading

AliSoftware Oct 22, 2021 •

edited

Loading