Skip to content

Merge finalized release 17.6 into develop#16749

Merged
mokagio merged 15 commits into
developfrom
merge/release-17.6-final-into-develop
Jun 28, 2021
Merged

Merge finalized release 17.6 into develop#16749
mokagio merged 15 commits into
developfrom
merge/release-17.6-final-into-develop

Conversation

@mokagio
Copy link
Copy Markdown
Contributor

@mokagio mokagio commented Jun 25, 2021

Merges the final version of 17.6 into develop. No feature changes since #16732 🎉 . I didn't notice #16744 when starting the release process because it had milestone 17.7 instead of 17.6. I decided to kill the release build on CI, merge that PR, and start again because it fixes and issue that "goes at least as far back as 17.2."

You can see:

  • The changes from Fixes a memory issue in our share extension. #16744
  • Localized .strings updates
  • Localized .txt metadata updates, including new files in jetpack_metadata. I generated those using the automation from Add localization download and upload automation for Jetpack #16733 and cherry picked the commits. I did that instead of merging the PR because there are a few open questions in it that need to be addressed before moving forward.
    • 71b6294, a64ce2c, 08fbe5a, and 8e1f063 update subtitles longer than 30 characters for the WordPress iOS app locally in order to pass the App Store Connect validation.

Looking at the commit history you'll see a couple of Update translations that don't make sense because of the cherry pick I described above. They don't make sense because there have been any changes to the translation files in the time between the cherry picked commit were generated. My explanation for this is that the diff is due to the file type being binary (you can see only binary changes in 746c7b7 and 026e7cf): our automation always downloads the files from GlotPress, for the .strings that are text, Git understands there have been no changes, but for those that are binaries, Git sees them as touched files. At least, that's my interpretation.

Regression Notes

  1. Potential unintended areas of impact
    N.A.

  2. What I did to test those areas of impact (or what existing automated tests I relied on)
    N.A.

  3. What automated tests I added (or what prevented me from doing so)
    N.A.


  • I have completed the Regression Notes.
  • I have considered adding unit tests for my changes. N.A.
  • I have considered adding accessibility improvements for my changes. N.A.
  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary. N.A.

@peril-wordpress-mobile
Copy link
Copy Markdown

peril-wordpress-mobile Bot commented Jun 25, 2021

You can trigger optional UI/connected tests for these changes by visiting CircleCI here.

@peril-wordpress-mobile
Copy link
Copy Markdown

peril-wordpress-mobile Bot commented Jun 25, 2021

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

@mokagio mokagio self-assigned this Jun 25, 2021
@mokagio mokagio added this to the 17.6 milestone Jun 25, 2021
@mokagio mokagio force-pushed the merge/release-17.6-final-into-develop branch from 55a46eb to 6b2df57 Compare June 25, 2021 01:34

// Public long version example: VERSION_LONG=9.9.0.0
VERSION_LONG=17.6.0.3
VERSION_LONG=17.6.0.5
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Bumps from 3 to 5 because of what #16744 as I mentioned in the description

mokagio added 5 commits June 25, 2021 15:05
According to Google Translate, this new value translates to "Create a
Website".
The original translation was "Build a website or blog." It now says
"Create your new website" which reads less terse than my original
approach of dropping "or blog".

Hat tip @akirk.
The translation went from "Build a website or blog" to just "Build a
website".
The translation (which I did aided by Google Translate) now says "Build
a website" instead of "Build a website or blog".
@mokagio mokagio force-pushed the merge/release-17.6-final-into-develop branch from 6b2df57 to bb7d0a4 Compare June 25, 2021 05:05
@peril-wordpress-mobile
Copy link
Copy Markdown

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

Generated by 🚫 dangerJS

@mokagio mokagio requested a review from a team June 25, 2021 05:09
@mokagio mokagio marked this pull request as ready for review June 25, 2021 06:32
@@ -0,0 +1 @@
Site WP plus sûr, plus rapide. No newline at end of file
Copy link
Copy Markdown
Contributor

@AliSoftware AliSoftware Jun 25, 2021

Choose a reason for hiding this comment

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

Totally opinionated, but this translation seems a bit rushed / too casual / familiar.

  • The original is: Make your WordPress site faster and safer.
  • This French translation could roughly be translated back to English as: WP site safer, faster.

Note the WP abbreviation, the inversion of faster and safer adjective order, the lack of verb… quite familiar talk.

Worth pining #i18n to make it fuzzy and ask for a more "professional"-sounding translation?
My personal take: Rendez votre site WordPress plus rapide et plus sûr. (52 chars)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@AliSoftware I think you should make the suggestion and ping #i18n so they can take a look and approve. I believe all a12s are encouraged to do this.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the comment @AliSoftware and @oguzkocer

FYI: the subtitle metadata was not submitted to App Store Connect because most of the localization (including the original English) were over the 30 characters limit. This has been reported in the Jetpack P2.

Copy link
Copy Markdown
Contributor

@AliSoftware AliSoftware Jun 28, 2021

Choose a reason for hiding this comment

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

Ah which means my suggestion above would be too long too 😓
Let's wait to see what the new, shorter original English subtitle metadata ends up being after we come up with a <30 description in the P2, then I'll see if I can suggest a nicer 🇫🇷 translation in GP for it.

@mokagio mokagio merged commit 1c84696 into develop Jun 28, 2021
@mokagio mokagio deleted the merge/release-17.6-final-into-develop branch June 28, 2021 00:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants