Merge 22.1 code freeze (#20462)

Podfile.lock

@@ -503,7 +503,7 @@ PODS:
   - WordPress-Aztec-iOS (1.19.8)
   - WordPress-Editor-iOS (1.19.8):
     - WordPress-Aztec-iOS (= 1.19.8)
-  - WordPressAuthenticator (5.6.0):
+  - WordPressAuthenticator (5.7.0):
     - GoogleSignIn (~> 6.0.1)
     - Gridicons (~> 1.0)
     - "NSURL+IDN (= 0.4)"
@@ -623,7 +623,6 @@ DEPENDENCIES:
 SPEC REPOS:
   https://github.com/wordpress-mobile/cocoapods-specs.git:
     - WordPressAuthenticator
-    - WordPressShared
   trunk:
     - Alamofire
     - AlamofireImage
@@ -662,6 +661,7 @@ SPEC REPOS:
     - WordPress-Aztec-iOS
     - WordPress-Editor-iOS
     - WordPressKit
+    - WordPressShared
     - WordPressUI
     - WPMediaPicker
     - wpxmlrpc
@@ -880,9 +880,9 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: e6a801d25f4f178de5bdf475ffe29050d0148176
   WordPress-Aztec-iOS: 7d11d598f14c82c727c08b56bd35fbeb7dafb504
   WordPress-Editor-iOS: 9eb9f12f21a5209cb837908d81ffe1e31cb27345
-  WordPressAuthenticator: 0a2a3699c6ddaabf4a5615f43729170f2bb3031a
+  WordPressAuthenticator: fc22569ef113e728823418120014725a7fdee8df
   WordPressKit: a161c49306369cfa22c648866cee5aba16d7cbac
-  WordPressShared: 8e59bc8cec256f54a7c4cc6c94911adc2a9a65d2
+  WordPressShared: 0aa459e5257a77184db87805a998f447443c9706
   WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
   WPMediaPicker: 0d45dfd7b3c5651c5236ffd48c1b0b2f60a2d5d2
   wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd

RELEASE-NOTES.txt

@@ -1,3 +1,7 @@
+22.2
+-----
+
+
 22.1
 -----
 * [**] [internal] Refactor updating account related Core Data operations, which ususally happens during log in and out of the app. [#20394]

WordPress/Jetpack/Resources/release_notes.txt

@@ -1,5 +1,3 @@
-We don’t know about you, but we’re feeling 22. In honor of the occasion (and because you’ve been asking for it), you can now transform most types of blocks into other block types, like quotes, columns, and groups. Nice.
-
-We made some design adjustments to the Reader, updating the “followed topics/sites” icon, recoloring the navigation bar background to match other screens in the app, and resizing the too-large title in the Reader tab. (We did that last one in the Notifications tab, too.)
-
-You’ll also see a few small visual changes to the My Site tab bar icon and the in-app survey. And if you have an extra-sharp eye, you might notice the dark background color of toolbars and top tabs is now consistent across the app.
+* [**] [internal] Refactor updating account related Core Data operations, which ususally happens during log in and out of the app. [#20394]
+* [***] [internal] Refactor uploading photos (from the device photo, the Free Photo library, and other sources) to the WordPress Media Library. Affected areas are where you can choose a photo and upload, including the "Media" screen, adding images to a post, updating site icon, etc. [#20322]
+* [**] Add a "Personalize Home Tab" button to the bottom of the Home tab that allows changing cards visibility. [#20369]

WordPress/Resources/en.lproj/Localizable.strings

@@ -2366,6 +2366,15 @@
 /* Title for the app appearance setting for dark mode */
 "Dark" = "Dark";
 
+/* Title for an empty state view when no cards are displayed */
+"dasboard.emptyView.subtitle" = "Add cards that fit your needs to see information about your site.";
+
+/* Title for an empty state view when no cards are displayed */
+"dasboard.emptyView.title" = "No cards to display";
+
+/* Personialize home tab button title */
+"dasboard.personalizeHomeButtonTitle" = "Personalize your home tab";
+
 /* Action title. Noun. Opens the user's WordPress.com dashboard in an external browser. */
 "Dashboard" = "Dashboard";
 
@@ -2398,6 +2407,24 @@
 /* Debug settings title */
 "Debug Settings" = "Debug Settings";
 
+/* Remote config params debug menu footer explaining the meaning of a cell with a checkmark. */
+"debugMenu.remoteConfig.footer" = "Overridden parameters are denoted by a checkmark.";
+
+/* Hint for overriding remote config params */
+"debugMenu.remoteConfig.hint" = "Override the chosen param by defining a new value here.";
+
+/* Placeholder for overriding remote config params */
+"debugMenu.remoteConfig.placeholder" = "No remote or default value";
+
+/* Remote Config debug menu title */
+"debugMenu.remoteConfig.title" = "Remote Config";
+
+/* Title of the Local Feature Flags screen used in debug builds of the app */
+"debugMenu.section.localFeatureFlags" = "Local Feature Flags";
+
+/* Title of the Remote Feature Flags screen used in debug builds of the app */
+"debugMenu.section.remoteFeatureFlags" = "Remote Feature Flags";
+
 /* Only December needs to be translated */
 "December 17, 2017" = "December 17, 2017";
 
@@ -2594,6 +2621,15 @@
 /* Register Domain - Privacy Protection section header description */
 "Domain owners have to share contact information in a public database of all domains. With Privacy Protection, we publish our own information instead of yours and privately forward any communication to you." = "Domain owners have to share contact information in a public database of all domains. With Privacy Protection, we publish our own information instead of yours and privately forward any communication to you.";
 
+/* Description for the Domains dashboard card. */
+"domain.dashboard.card.description" = "Stake your claim on your corner of the web with a site address that’s easy to find, share and follow.";
+
+/* Title for a menu action in the context menu on the Jetpack install card. */
+"domain.dashboard.card.menu.hide" = "Hide this";
+
+/* Title for the Domains dashboard card. */
+"domain.dashboard.card.title" = "Own your online identity with a custom domain";
+
 /* Noun. Title. Links to the Domains screen. */
 "Domains" = "Domains";
 
@@ -3272,9 +3308,6 @@
 /* Option to select the Fastmail app when logging in with magic links */
 "Fastmail" = "Fastmail";
 
-/* Title of the Feature Flags screen used in debug builds of the app */
-"Feature flags" = "Feature flags";
-
 /* Name of a feature that allows the user to promote their posts. */
 "feature.blaze.title" = "Blaze";
 
@@ -3624,9 +3657,6 @@
 /* User-facing string, presented to reflect that site assembly is underway. */
 "Grabbing site URL" = "Grabbing site URL";
 
-/* No comment provided by engineer. */
-"Gradient" = "Gradient";
-
 /* No comment provided by engineer. */
 "Gradient Type" = "Gradient Type";
 
@@ -4392,6 +4422,15 @@
 /* Title of the primary button shown after the Jetpack plugin has been installed. Tapping on the button dismisses the installation screen. */
 "jetpack.install-flow.success.primaryButtonText" = "Done";
 
+/* Title of a button for connecting user account to Jetpack. */
+"jetpack.install.connectUser.button.title" = "Connect your user account";
+
+/* Message asking the user if they want to set up Jetpack from notifications */
+"jetpack.install.connectUser.notifications.description" = "To get helpful notifications on your phone from your WordPress site, you'll need to connect to your user account.";
+
+/* Message asking the user if they want to set up Jetpack from stats by connecting their user account */
+"jetpack.install.connectUser.stats.description" = "To use stats on your site, you'll need to connect the Jetpack plugin to your user account.";
+
 /* Description inside a menu card communicating that features are moving to the Jetpack app. */
 "jetpack.menuCard.description" = "Stats, Reader, Notifications and other features will move to the Jetpack mobile app soon.";
 
@@ -6076,6 +6115,30 @@ Please install the %3$@ to use the app with this site.";
 /* Section title for the personalize table section in the blog details screen. */
 "Personalize" = "Personalize";
 
+/* Section footer displayed below the list of toggles */
+"personalizeHome.cardsSectionFooter" = "Cards may show different content depending on what's happening on your site. We're working on more cards and controls.";
+
+/* Section header */
+"personalizeHome.cardsSectionHeader" = "Add or hide cards";
+
+/* Card title for the pesonalization menu */
+"personalizeHome.dashboardCard.blaze" = "Blaze";
+
+/* Card title for the pesonalization menu */
+"personalizeHome.dashboardCard.draftPosts" = "Draft posts";
+
+/* Card title for the pesonalization menu */
+"personalizeHome.dashboardCard.prompts" = "Blogging prompts";
+
+/* Card title for the pesonalization menu */
+"personalizeHome.dashboardCard.scheduledPosts" = "Scheduled posts";
+
+/* Card title for the pesonalization menu */
+"personalizeHome.dashboardCard.todaysStats" = "Today's stats";
+
+/* Page title */
+"personalizeHome.title" = "Personalize Home Tab";
+
 /* Register Domain - Phone number section header title */
 "PHONE" = "PHONE";
 
@@ -6519,6 +6582,9 @@ Please install the %3$@ to use the app with this site.";
    View title for Blogging Prompts list. */
 "Prompts" = "Prompts";
 
+/* Title for a tappable string that opens the reader with a prompts tag */
+"prompts.card.viewprompts.title" = "View all responses";
+
 /* Subtitle of the notification when prompts are hidden from the dashboard card */
 "prompts.notification.removed.subtitle" = "Visit Site Settings to turn back on";
 
@@ -7169,6 +7235,9 @@ Please install the %3$@ to use the app with this site.";
 /* title of the button that searches the first domain. */
 "Search for a domain" = "Search for a domain";
 
+/* Select domain name. Subtitle */
+"Search for a short and memorable keyword to help people find and visit your website." = "Search for a short and memorable keyword to help people find and visit your website.";
+
 /* No comment provided by engineer. */
 "Search input field." = "Search input field.";
 
@@ -7699,6 +7768,15 @@ Please install the %3$@ to use the app with this site.";
    The item to select during a guided tour. */
 "Site URL" = "Site URL";
 
+/* Template site address for the search bar. */
+"site.cration.domain.site.address" = "https://yoursitename.com";
+
+/* Site name description that sits in the template website view. */
+"site.creation.domain.tooltip.description" = "Like the example above, a domain allows people to find and visit your site from their web browser.";
+
+/* Site name that is placed in the tooltip view. */
+"site.creation.domain.tooltip.site.name" = "YourSiteName.com";
+
 /* Sites Filter Tab Title
    Title of a Reader tab showing Sites matching a user's search query */
 "Sites" = "Sites";
@@ -8360,6 +8438,9 @@ Please install the %3$@ to use the app with this site.";
 /* Menu item label for linking a testimonial post. */
 "Testimonials" = "Testimonials";
 
+/* No comment provided by engineer. */
+"Text color" = "Text color";
+
 /* No comment provided by engineer. */
 "Text formatting controls are located within the toolbar positioned above the keyboard while editing a text block" = "Text formatting controls are located within the toolbar positioned above the keyboard while editing a text block";
 
@@ -8710,9 +8791,6 @@ Please install the %3$@ to use the app with this site.";
 /* Informational text for the privacy policy link */
 "This information helps us improve our products, make marketing to you more relevant, personalize your WordPress.com experience, and more as detailed in our privacy policy." = "This information helps us improve our products, make marketing to you more relevant, personalize your WordPress.com experience, and more as detailed in our privacy policy.";
 
-/* Select domain name. Subtitle */
-"This is where people will find you on the internet." = "This is where people will find you on the internet.";
-
 /* The body of a notification displayed to the user prompting them to create a new blog post. The emoji should ideally remain, as part of the text. */
 "This is your reminder to blog today ✍️" = "This is your reminder to blog today ✍️";
 
@@ -10225,6 +10303,24 @@ Please install the %3$@ to use the app with this site.";
 /* WordPress.com Notification Settings Title */
 "WordPress.com Updates" = "WordPress.com Updates";
 
+/* Jetpack Plugin Modal on WordPress primary button title */
+"wordpress.jetpack.plugin.modal.primary.button.title" = "Switch to the Jetpack app";
+
+/* Jetpack Plugin Modal on WordPress secondary button title */
+"wordpress.jetpack.plugin.modal.secondary.button.title" = "Continue without Jetpack";
+
+/* Jetpack Plugin Modal (multiple plugins) on WordPress subtitle with formatted texts. %1$@ is for the site name. */
+"wordpress.jetpack.plugin.modal.subtitle.plural" = "%1$@ is using individual Jetpack plugins, which isn't supported by the WordPress App.";
+
+/* Jetpack Plugin Modal on WordPress (single plugin) subtitle with formatted texts. %1$@ is for the site name and %2$@ is for the specific plugin name. */
+"wordpress.jetpack.plugin.modal.subtitle.singular" = "%1$@ is using the %2$@ plugin, which isn't supported by the WordPress App.";
+
+/* Second paragraph of the Jetpack Plugin Modal on WordPress asking the user to switch to Jetpack. */
+"wordpress.jetpack.plugin.modal.subtitle.switch" = "Please switch to the Jetpack app where we'll guide you through connecting the full Jetpack plugin so that you can use all the apps features for this site.";
+
+/* Jetpack Plugin Modal title in WordPress */
+"wordpress.jetpack.plugin.modal.title" = "Sorry, this site isn't supported by the WordPress app";
+
 /* Link to a WordPress.org page for the plugin */
 "WordPress.org Plugin Page" = "WordPress.org Plugin Page";
 

WordPress/Resources/release_notes.txt

@@ -1,3 +1,3 @@
-We don’t know about you, but we’re feeling 22. In honor of the occasion (and because you’ve been asking for it), you can now transform most types of blocks into other block types, like quotes, columns, and groups. Nice.
-
-You’ll also see a few small visual changes to the My Site dashboard and the in-app survey.
+* [**] [internal] Refactor updating account related Core Data operations, which ususally happens during log in and out of the app. [#20394]
+* [***] [internal] Refactor uploading photos (from the device photo, the Free Photo library, and other sources) to the WordPress Media Library. Affected areas are where you can choose a photo and upload, including the "Media" screen, adding images to a post, updating site icon, etc. [#20322]
+* [**] Warns user about sites with only individual plugins not supporting core app features and offers the option to switch to the Jetpack app. [#20408]

config/Version.internal.xcconfig

@@ -1,4 +1,4 @@
-VERSION_SHORT=22.0
+VERSION_SHORT=22.1
 
 // Internal long version example: VERSION_LONG=9.9.0.20180423
-VERSION_LONG=22.0.0.20230331
+VERSION_LONG=22.1.0.20230403

config/Version.public.xcconfig

@@ -1,4 +1,4 @@
-VERSION_SHORT=22.0
+VERSION_SHORT=22.1
 
 // Public long version example: VERSION_LONG=9.9.0.0
-VERSION_LONG=22.0.0.3
+VERSION_LONG=22.1.0.0