Merge changes from beta 19.7.0.1 + Release Notes #18411

mokagio · 2022-04-21T04:16:46Z

Includes:

[Site Name] Adjusts design picker buttons for treatment variation (they now say "Create Site" instead of "Choose") by @antonis and @twstokes

Nothing to test, if CI Shows green, we're good.

Regression Notes

Potential unintended areas of impact – N.A.
What I did to test those areas of impact (or what existing automated tests I relied on) – N.A.
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.

…eation step

…ion step

I had forgotten about this when approving then merging the PR.

…ign-buttons-tweaks [Site Creation] Pass a boolean to determine Site Design primary button titles

…screen button

mokagio

Updates to the localization files (.strings and Fastlane metadata) automatically pulled for the new translations that have already been approved in GlotPress
Version update in .xcconfig
Diffs from the PRs that made it into this beta

peril-wordpress-mobile · 2022-04-21T04:18:36Z

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

Generated by 🚫 dangerJS

wpmobilebot · 2022-04-21T04:40:07Z

You can test the changes in WordPress from this Pull Request by:

Clicking here or scanning the QR code below
Then installing the build number pr18411-d00b8ef from App Center on your iPhone

The .ipa file can also be downloaded directly here.
If you need access to App Center, please ask a maintainer to add you.

wpmobilebot · 2022-04-21T04:40:50Z

You can test the changes in Jetpack from this Pull Request by:

Clicking here or scanning the QR code below
Then installing the build number pr18411-d00b8ef from App Center on your iPhone

The .ipa file can also be downloaded directly here.
If you need access to App Center, please ask a maintainer to add you.

AliSoftware

Checklist for New Beta

Changes from bugfix PRs which landed in the release branch
Version bump in .xcconfig files
Latest app and metadata translations pulled from Glotpress

Checklist for Release Notes

Editorialized Release Notes updated
⚠️ entries from RELEASE-NOTES.txt changed in the release/* branch 🤔 quite suspicious, and not sure if this was intentional or not, nor if it would require us to revisit the Editorizalized Release Notes accordingly to take that change into account…
⚠️ New strings were introduced post-code-freeze in the release/* branch (and thus post-strings-freeze too)
- Which means those new strings won't be included in the translation pipeline (nor sent to our Translation Vendor nor imported in GlotPress), and thus not translated in time for 19.7.
- @mokagio As a mitigation for this, you might want to consider updating the frozen strings (i.e. run the generate_strings_file_for_glotpress again on release/19.7 branch) similar to what I decided to do for WPAndroid, so that the new strings from the release/19.7 branch will be imported into GlotPress. While the WeeklyKit has already been sent and it would be too late for those to get to our translation vendor, this would still give a chance to the polyglots community to help translate those new strings in time for 19.7 submission.
- (cc @antonis FYI, as author of those new strings)

AliSoftware · 2022-04-21T11:14:28Z

RELEASE-NOTES.txt

-* [*] Reader: Fixed a bug that caused cut off content in reader web view [#16106]
+* [*] Web previews now abide by safe areas when a toolbar is shown [#18127]


❓ Is that change expected (especially since that does not seem like just a wording update of a single item, but instead removal of an item related to one PR #16106 while adding a different item related to a different PR #18127)?
(cc @twstokes as author of the commit making that change)

And also, do we need to inform our freelance writer (Grace) about that change and new entry, so that she update her Editorialized Release Notes copy (included in this PR) accordingly?

👋 @AliSoftware - this PR contains the backstory of this change.

Summary:

The work started out as a fix for Reader: In-app browser preview hides/cuts important elements #16106 by an external contributor

During the review process we made them aware that the fix had broader scope than just reader

At the tail end (a little too late) I updated their contributed release note and revised their PR title to better reflect the changes. It was pointed to the issue rather than the PR, so I fixed that as well. I then created [19.7] Update release note for #18127 #18401 to hopefully prevent any surprises on the release side.

Should I have included the Owl Team on that PR to loop everyone in? Any tips welcome! 🙇

Thanks for the helpful extra context @twstokes !

I think it's always a good idea to ping your Release Manager especially when you change either release notes (like here) or strings (like for the case of the other review comment I left) in a PR that lands in release/* branch after the code-freeze.

Both release notes and strings are frozen during code freeze and we then use those frozen versions to kick off the rest of the process (ask our freelance writer to write nice notes from this frozen draft, send frozen strings to our translation vendor, …), which is why any change to those after code freeze is important to signal to your RM so they can adjust for those last-minute tweaks appropriately 🙂.

That being said, given the additional context you shared here, I think the wording that ended up being used in the Editorialized version of the Release Notes here below is probably OK and matches what ultimately landed?

Thanks @AliSoftware, that makes sense!

I think the wording that ended up being used in the Editorialized version of the Release Notes here below is probably OK and matches what ultimately landed?

I agree!

AliSoftware · 2022-04-21T11:16:18Z

...ses/ViewRelated/Site Creation/Design Selection/Preview/SiteDesignPreviewViewController.swift

+        static let createSiteButton = NSLocalizedString("Create Site", comment: "Title for the button to progress with creating the site with the selected design.")
+        static let chooseButton = NSLocalizedString("Choose", comment: "Title for the button to progress with the selected site homepage design.")


⚠️ Note that since those 2 new strings were not present at the time you did the code freeze and got added in release/* later, those new strings sadly won't be sent for translation and won't be translated in time for 19.7 😞

👋 @AliSoftware thanks for all your information recently about translations. Could I get one bit clarified?

If I understand correctly, "Create Site" and "Choose" are keys* for the translated strings. These keys existed prior to this change in WPiOS and had the same meaning [one] [two].

Does this still mean the translations won't work for this view? I ran it locally and set it to a random language (German) and saw it was translated. Thanks!

*I realize we may be getting away from the English string being the key soon.

Ah! I might have missed something when looking at the diff then, as I was convinced that those were newly introduced strings — as opposed to already existing ones that we just moved around or reused in a different context.

If they were already part of the strings that got extracted in the generated Localizable.strings back when Gio did the code freeze (maybe because they were already used / present in another part of the code) then we should be all good for those then!

Cool!

"Create Site" is a "new" string to that view, but it was used (in the same context) in WPiOS prior to this change, so my hope is that the translation for that key is just reused.

"Choose" already existed on this view, it was only moved. 👍

AliSoftware · 2022-04-21T11:20:42Z

WordPress/Jetpack/Resources/AppStoreStrings.po

+"\n"
+"What’s in a name? Well, if your site has one, you’ll see it in the My Site navigation title.\n"
+"\n"
+"When you swipe left on a comment in your Notifications, you won’t see the “Trash” option anymore. Instead you’ll see “Unapprove Comment” and “Approve Comment.” We approve.\n"


👍 I too feel this wording is safer than the more spicy 🌶️ one Grace propose 😅 (While it was funny, the alternative spicier copy might have been a lost reference that not everybody would have got, and could also have been negatively interpreted)

AliSoftware · 2022-04-21T11:21:47Z

WordPress/WordPress.xcodeproj/project.pbxproj

@@ -2169,6 +2169,7 @@
 		C373D6EA280452F6008F8C26 /* SiteIntentDataTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C373D6E9280452F6008F8C26 /* SiteIntentDataTests.swift */; };
 		C387B7A22638D66F00BDEF86 /* PostAuthorSelectorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3E2462826277B7700B99EA6 /* PostAuthorSelectorViewController.swift */; };
 		C38C5D8127F61D2C002F517E /* MenuItemTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38C5D8027F61D2C002F517E /* MenuItemTests.swift */; };
+		C396C80B280F2401006FE7AC /* SiteDesignTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C396C80A280F2401006FE7AC /* SiteDesignTests.swift */; };


Woohoo, more tests! 🎉 ❤️

AliSoftware · 2022-04-21T11:22:53Z

fastlane/metadata/tr/subtitle.txt

@@ -1 +1 @@
-Bir web sitesi/blog oluşturun
+Siteni tasarla, blog oluştur


Still <30, all good 👍 😌

AliSoftware

Approving now that my two previous ⚠️ / questions were answered by @twstokes in the associated comments 👍🙇‍♂️

antonis and others added 18 commits April 19, 2022 16:56

Changes design selection action buttons when this is the last site cr…

d9fbe30

…eation step

Changes design preview action button when this is the last site creat…

4c0a984

…ion step

Removes trailing spaces

082306a

Reverts change for the skip button

7a4701d

Pass a boolean to determine if the Site Design step is the last one.

9ecd2b8

Add tests.

e2f575c

Update release notes to point to the PR and describe the scope.

62018c4

Update 19.7 release notes to include #18127 (#18401)

ed4a7a1

Update release_notes.txt files for 19.7 with change from #18401

c153e61

I had forgotten about this when approving then merging the PR.

Groups string resources

babc542

Merge pull request #18400 from wordpress-mobile/feature/site-name-des…

7ad2a9d

…ign-buttons-tweaks [Site Creation] Pass a boolean to determine Site Design primary button titles

Adds all the controller resources in the group

00accc5

Changed create site button title capitalisation to match the domains …

fc7ddd3

…screen button

[Site Name] Adjusts design picker for treatment variation (#18397)

a7c675f

Update app translations – Localizable.strings

158c78d

Update WordPress metadata translations

e5c7c8d

Update Jetpack metadata translations

3389ee5

Bump version number

7675c47

mokagio commented Apr 21, 2022

View reviewed changes

mokagio added the Releases label Apr 21, 2022

mokagio added this to the 19.7 ❄️ milestone Apr 21, 2022

mokagio requested a review from a team April 21, 2022 04:18

mokagio mentioned this pull request Apr 21, 2022

[Site Name] Adjusts design picker buttons for treatment variation #18397

Merged

4 tasks

mokagio added 3 commits April 21, 2022 20:14

Add editorialized release notes for version 19.7 – Same for both apps

1b92121

Update metadata strings

a32f73d

Update metadata strings

d00b8ef

mokagio changed the title ~~Merge changes from beta 19.7.0.1~~ Merge changes from beta 19.7.0.1 + Release Notes Apr 21, 2022

AliSoftware reviewed Apr 21, 2022

View reviewed changes

AliSoftware approved these changes Apr 21, 2022

View reviewed changes

mokagio merged commit b033106 into trunk Apr 21, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge changes from beta 19.7.0.1 + Release Notes #18411

Merge changes from beta 19.7.0.1 + Release Notes #18411

mokagio commented Apr 21, 2022 •

edited

Loading

mokagio left a comment

peril-wordpress-mobile bot commented Apr 21, 2022 •

edited

Loading

wpmobilebot commented Apr 21, 2022 •

edited

Loading

wpmobilebot commented Apr 21, 2022 •

edited

Loading

AliSoftware left a comment •

edited

Loading

AliSoftware Apr 21, 2022 •

edited

Loading

twstokes Apr 21, 2022 •

edited

Loading

AliSoftware Apr 21, 2022

twstokes Apr 21, 2022

AliSoftware Apr 21, 2022 •

edited

Loading

twstokes Apr 21, 2022

AliSoftware Apr 21, 2022

twstokes Apr 21, 2022

AliSoftware Apr 21, 2022

AliSoftware Apr 21, 2022

AliSoftware Apr 21, 2022

AliSoftware left a comment

		* [*] Reader: Fixed a bug that caused cut off content in reader web view [#16106]
		* [*] Web previews now abide by safe areas when a toolbar is shown [#18127]

		static let createSiteButton = NSLocalizedString("Create Site", comment: "Title for the button to progress with creating the site with the selected design.")
		static let chooseButton = NSLocalizedString("Choose", comment: "Title for the button to progress with the selected site homepage design.")

		@@ -1 +1 @@
		Bir web sitesi/blog oluşturun
		Siteni tasarla, blog oluştur

Merge changes from beta 19.7.0.1 + Release Notes #18411

Merge changes from beta 19.7.0.1 + Release Notes #18411

Conversation

mokagio commented Apr 21, 2022 • edited Loading

Regression Notes

mokagio left a comment

Choose a reason for hiding this comment

peril-wordpress-mobile bot commented Apr 21, 2022 • edited Loading

wpmobilebot commented Apr 21, 2022 • edited Loading

wpmobilebot commented Apr 21, 2022 • edited Loading

AliSoftware left a comment • edited Loading

Choose a reason for hiding this comment

Checklist for New Beta

Checklist for Release Notes

AliSoftware Apr 21, 2022 • edited Loading

Choose a reason for hiding this comment

twstokes Apr 21, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AliSoftware Apr 21, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AliSoftware left a comment

Choose a reason for hiding this comment

mokagio commented Apr 21, 2022 •

edited

Loading

peril-wordpress-mobile bot commented Apr 21, 2022 •

edited

Loading

wpmobilebot commented Apr 21, 2022 •

edited

Loading

wpmobilebot commented Apr 21, 2022 •

edited

Loading

AliSoftware left a comment •

edited

Loading

AliSoftware Apr 21, 2022 •

edited

Loading

twstokes Apr 21, 2022 •

edited

Loading

AliSoftware Apr 21, 2022 •

edited

Loading