Merge 18.1.0.2 beta (includes beta 1 and 2) plus release notes into develop #17080

mokagio · 2021-08-24T07:01:43Z

Includes:

18.1.0.1

Enabled the "Recommend app" feature via feature flag by @dvdchr (#17065)

18.1.0.2

Improve account closure error messaging by @nikola-milicevic (#17075

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.

…end-app Recommend App: Enable feature flag to public

@AliSoftware

There's clearly a bug in my rough implementation of the logic to decide whether to commit the Jetpack metadata. Likely due to manually checking the Git commands text output instead of a more appropriate usage of Git machine readable output like @AliSoftware suggested here: #17047 (comment) These would get deleted anyway or updated with the localizations once ready upon a new beta creation or release finalization, but I thought it best to track it here from a workflow consistency point of view.

peril-wordpress-mobile · 2021-08-24T07:01:48Z

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

peril-wordpress-mobile · 2021-08-24T07:01:49Z

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

mokagio

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

Notice that all the release_notes.txt were deleted because we don't have translations yet—It's only the first day after the GlotPress upload run.

mokagio · 2021-08-24T07:22:20Z

I enabled auto-merge before seeing if the tests passed because it's dinner time for me and I don't want to forget 🍝

AliSoftware

I notice that you didn't regenerate the strings via ios_localize_project as discussed/suggested in p1629722771248800/1629715763.241600-slack-CC7L49W13 after the need for one of the original string copy to be updated – see also https://wordpress.slack.com/archives/C02RQC4LY/p1629710931010500 ; which means this new string, if it was ready, wouldn't be imported in GlotPress.

Is this intentional (i.e. the discussion wasn't settled and the new string not ready yet) or an oversight?

AliSoftware · 2021-08-24T09:15:36Z

fastlane/metadata/de-DE/subtitle.txt

@@ -1 +1 @@
-Erstelle deine neue Website
+Erstelle eine Website oder ein Blog


Just a heads up that this will exceed the 30 char limit. (I remember you fixing it manually last time and asking translators for a fix at the source in some P2 or Slack, but apparently they didn't tackle it yet)

Yep. This keeps happening. Your prompt was the push I needed to suggest these 30-characters-compliant translations into GlotPress myself. 🤞

Cool. Let's merge it as is for now and hope the fixed copy gets accepted in GlotPress by the time you'll do the final release then 👍

AliSoftware · 2021-08-24T09:15:46Z

fastlane/metadata/fr-FR/subtitle.txt

@@ -1 +1 @@
-Construisez un site web
+Construisez un site web ou un blog


AliSoftware · 2021-08-24T09:15:55Z

fastlane/metadata/tr/subtitle.txt

@@ -1 +1 @@
-Bir web sitesi oluşturun
+Bir web sitesi veya blog oluşturun


peril-wordpress-mobile · 2021-08-25T00:58:42Z

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

Generated by 🚫 dangerJS

Note that we're working on a fix for this: wordpress-mobile/release-toolkit#297

mokagio · 2021-08-25T04:34:18Z

Thanks @AliSoftware. The localizations not being updated was intentional, as I was waiting fro input on the PR that changed one.

Since your comment, I got that info, merged the PR and shipped a new beta. The diff does reflect that.

Can I ask for another review? 😄 🙏 Thanks!

mokagio

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

mokagio · 2021-08-25T04:38:54Z

WordPress/Resources/ar.lproj/Localizable.strings

+/* Error message displayed when unable to close user account due to having active atomic site. */
+"This user account cannot be closed while it has active atomic sites." = "This user account cannot be closed while it has active atomic sites.";


Notice that this and all the other non-English US localization of this string, match the original version not the new one updated from the change in WordPress/Classes/ViewRelated/Me/Account Settings/AccountSettingsViewController.swift.

That's expected because these files were downloaded GlotPress during the download_localized_strings_and_metadata step of the new_beta_release. Because the change to this string hasn't been merged into develop yet, GlotPress still has the original version.

mokagio · 2021-08-25T04:44:07Z

fastlane/metadata/de-DE/subtitle.txt

@@ -1 +1 @@
-Erstelle deine neue Website
+Erstelle eine Website oder ein Blog


Yep. This keeps happening. Your prompt was the push I needed to suggest these 30-characters-compliant translations into GlotPress myself. 🤞

AliSoftware

✅ Version bump
✅ strings updated, including the last minute post-code-freeze change
✅ release notes being different for WP and JP and matching the copies suggested by editorial

AliSoftware · 2021-08-25T06:39:01Z

WordPress/Classes/ViewRelated/Me/Account Settings/AccountSettingsViewController.swift

@@ -288,7 +288,7 @@ private class AccountSettingsController: SettingsController {
            return NSLocalizedString("You're not authorized to close the account.",
                                     comment: "Error message displayed when unable to close user account due to being unauthorized.")
        case "atomic-site":
-            return NSLocalizedString("This user account cannot be closed while it has active atomic sites.",
+            return NSLocalizedString("This user account could not be closed. Please contact us by going to Me > Help & Support screen.",


Personal note: I'd have said "can't be closed automatically" or something like this, to avoid making the user think that "it won't be possible to close it at all" but instead tell them "you need to contact us so we can do some stuff in our end to close it", which would be less worrying than "can't be closed [at all]" imho 🤷‍♂️

AliSoftware · 2021-08-25T06:39:49Z

WordPress/Resources/ar.lproj/Localizable.strings

+/* Error message displayed when unable to close user account due to having active atomic site. */
+"This user account cannot be closed while it has active atomic sites." = "This user account cannot be closed while it has active atomic sites.";


AliSoftware · 2021-08-25T06:45:51Z

fastlane/metadata/de-DE/subtitle.txt

@@ -1 +1 @@
-Erstelle deine neue Website
+Erstelle eine Website oder ein Blog


Cool. Let's merge it as is for now and hope the fixed copy gets accepted in GlotPress by the time you'll do the final release then 👍

AliSoftware · 2021-08-25T06:47:12Z

fastlane/metadata/tr/subtitle.txt

@@ -1 +1 @@
-Bir web sitesi oluşturun
+Bir web sitesi veya blog oluşturun


dvdchr and others added 8 commits August 23, 2021 17:23

Enable feature flag for recommend app feature

262755e

Update release notes

7337aa0

Merge pull request #17065 from wordpress-mobile/feature/enable-recomm…

28db015

…end-app Recommend App: Enable feature flag to public

Fix displayed localizable string in case of atomic-site error

b8b47ec

Update translations

cba7cbb

Update metadata translations

6bc3a0d

Bump version number

dba84bf

mokagio added the Releases label Aug 24, 2021

mokagio commented Aug 24, 2021

View reviewed changes

mokagio marked this pull request as ready for review August 24, 2021 07:04

mokagio requested a review from a team August 24, 2021 07:21

mokagio added this to the 18.1 ❄️ milestone Aug 24, 2021

mokagio enabled auto-merge August 24, 2021 07:21

AliSoftware reviewed Aug 24, 2021

View reviewed changes

mokagio added 5 commits August 25, 2021 10:42

Remove atomic site mention from close account messaging (#17075)

60b9912

Update strings for localization

1dbde79

Add editorialized release notes for version 18.1

7a4e745

Update metadata strings

c0a7d83

Update metadata strings

8fe87e1

mokagio added 3 commits August 25, 2021 10:59

Manually fix syntax error in generated AppStoreStrings.po files

69a97ef

Note that we're working on a fix for this: wordpress-mobile/release-toolkit#297

Update translations

1e9b97b

Bump version number

7e025b7

mokagio changed the title ~~Merge 18.1.0.1 beta into develop~~ Merge 18.1.0.2 beta (includes beta 1 and 2) plus release notes into develop Aug 25, 2021

mokagio mentioned this pull request Aug 25, 2021

Fix/16941 - Close account displayed localizable string #17075

Merged

4 tasks

mokagio disabled auto-merge August 25, 2021 04:34

mokagio enabled auto-merge August 25, 2021 04:34

mokagio commented Aug 25, 2021

View reviewed changes

mokagio merged commit 71bb1a7 into develop Aug 25, 2021

AliSoftware approved these changes Aug 25, 2021

View reviewed changes

mokagio mentioned this pull request Aug 30, 2021

Merge beta 18.1.0.3 #17094

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge 18.1.0.2 beta (includes beta 1 and 2) plus release notes into develop #17080

Merge 18.1.0.2 beta (includes beta 1 and 2) plus release notes into develop #17080

mokagio commented Aug 24, 2021 •

edited

Loading

peril-wordpress-mobile bot commented Aug 24, 2021 •

edited

Loading

peril-wordpress-mobile bot commented Aug 24, 2021 •

edited

Loading

mokagio left a comment

mokagio commented Aug 24, 2021

AliSoftware left a comment

AliSoftware Aug 24, 2021

mokagio Aug 25, 2021

AliSoftware Aug 25, 2021

AliSoftware Aug 24, 2021

AliSoftware Aug 24, 2021

AliSoftware Aug 25, 2021

peril-wordpress-mobile bot commented Aug 25, 2021

mokagio commented Aug 25, 2021 •

edited

Loading

mokagio left a comment

mokagio Aug 25, 2021

AliSoftware Aug 25, 2021

mokagio Aug 25, 2021

AliSoftware left a comment

AliSoftware Aug 25, 2021 •

edited

Loading

AliSoftware Aug 25, 2021

AliSoftware Aug 25, 2021

AliSoftware Aug 25, 2021

		@@ -1 +1 @@
		Erstelle deine neue Website
		Erstelle eine Website oder ein Blog

		@@ -1 +1 @@
		Construisez un site web
		Construisez un site web ou un blog

		@@ -1 +1 @@
		Bir web sitesi oluşturun
		Bir web sitesi veya blog oluşturun

		/* Error message displayed when unable to close user account due to having active atomic site. */
		"This user account cannot be closed while it has active atomic sites." = "This user account cannot be closed while it has active atomic sites.";

Merge 18.1.0.2 beta (includes beta 1 and 2) plus release notes into develop #17080

Merge 18.1.0.2 beta (includes beta 1 and 2) plus release notes into develop #17080

Conversation

mokagio commented Aug 24, 2021 • edited Loading

Regression Notes

peril-wordpress-mobile bot commented Aug 24, 2021 • edited Loading

peril-wordpress-mobile bot commented Aug 24, 2021 • edited Loading

mokagio left a comment

Choose a reason for hiding this comment

mokagio commented Aug 24, 2021

AliSoftware left a 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

Choose a reason for hiding this comment

peril-wordpress-mobile bot commented Aug 25, 2021

mokagio commented Aug 25, 2021 • edited Loading

mokagio left a 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

AliSoftware Aug 25, 2021 • 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

mokagio commented Aug 24, 2021 •

edited

Loading

peril-wordpress-mobile bot commented Aug 24, 2021 •

edited

Loading

peril-wordpress-mobile bot commented Aug 24, 2021 •

edited

Loading

mokagio commented Aug 25, 2021 •

edited

Loading

AliSoftware Aug 25, 2021 •

edited

Loading