From a485f3728f9471cd3ebca27fc332d29687bd5e89 Mon Sep 17 00:00:00 2001 From: Spencer Transier Date: Fri, 16 Dec 2022 10:02:59 -0700 Subject: [PATCH 1/6] Bump version number --- config/Version.internal.xcconfig | 4 ++-- config/Version.public.xcconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/Version.internal.xcconfig b/config/Version.internal.xcconfig index 199e9a545bcb..c3b908f5a010 100644 --- a/config/Version.internal.xcconfig +++ b/config/Version.internal.xcconfig @@ -1,4 +1,4 @@ -VERSION_SHORT=21.3 +VERSION_SHORT=21.4 // Internal long version example: VERSION_LONG=9.9.0.20180423 -VERSION_LONG=21.3.0.20221207 +VERSION_LONG=21.4.0.20221216 diff --git a/config/Version.public.xcconfig b/config/Version.public.xcconfig index e8614b2a6ffa..7447bd866d24 100644 --- a/config/Version.public.xcconfig +++ b/config/Version.public.xcconfig @@ -1,4 +1,4 @@ -VERSION_SHORT=21.3 +VERSION_SHORT=21.4 // Public long version example: VERSION_LONG=9.9.0.0 -VERSION_LONG=21.3.0.3 +VERSION_LONG=21.4.0.0 From 62179648214160e343499f03b7e766aef125b236 Mon Sep 17 00:00:00 2001 From: Spencer Transier Date: Fri, 16 Dec 2022 10:03:01 -0700 Subject: [PATCH 2/6] Update draft release notes for 21.4. --- WordPress/Resources/release_notes.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/WordPress/Resources/release_notes.txt b/WordPress/Resources/release_notes.txt index 1f2d9254a2e6..9516573d7faa 100644 --- a/WordPress/Resources/release_notes.txt +++ b/WordPress/Resources/release_notes.txt @@ -1,3 +1,8 @@ -We fixed a small visual issue with the Home and Menu control in the My Site dashboard. +* [*] Fixed an issue where publishing Posts and Pages could fail under certain conditions. [#19717] +* [*] Share extension navigation bar is no longer transparent [#19700] +* [***] [Jetpack-only] Adds a smooth, opt-in transition to the Jetpack app for users migrating from the WordPress app. [#19759] +* [***] You can now migrate your site content to the Jetpack app without a hitch. [#19759] +* [**] [internal] Upgrade React Native from 0.66.2 to 0.69.4 [https://github.com/wordpress-mobile/gutenberg-mobile/pull/5193] +* [*] [internal] When a user migrates to the Jetpack app and allows notifications, WordPress app notifications are disabled. [#19616, #19611, #19590] +* [*] Reader now scrolls to the top if the tab bar button is tapped. [#19769] -We also squashed a bug in My Site. The "Disconnect from WordPress.com” button now disconnects when tapped and will refresh the app. From 980d9975db1b2f5c2302211bc285bcf4472e0ac9 Mon Sep 17 00:00:00 2001 From: Spencer Transier Date: Fri, 16 Dec 2022 10:03:01 -0700 Subject: [PATCH 3/6] Update draft release notes for 21.4. --- WordPress/Jetpack/Resources/release_notes.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/WordPress/Jetpack/Resources/release_notes.txt b/WordPress/Jetpack/Resources/release_notes.txt index 1f2d9254a2e6..9516573d7faa 100644 --- a/WordPress/Jetpack/Resources/release_notes.txt +++ b/WordPress/Jetpack/Resources/release_notes.txt @@ -1,3 +1,8 @@ -We fixed a small visual issue with the Home and Menu control in the My Site dashboard. +* [*] Fixed an issue where publishing Posts and Pages could fail under certain conditions. [#19717] +* [*] Share extension navigation bar is no longer transparent [#19700] +* [***] [Jetpack-only] Adds a smooth, opt-in transition to the Jetpack app for users migrating from the WordPress app. [#19759] +* [***] You can now migrate your site content to the Jetpack app without a hitch. [#19759] +* [**] [internal] Upgrade React Native from 0.66.2 to 0.69.4 [https://github.com/wordpress-mobile/gutenberg-mobile/pull/5193] +* [*] [internal] When a user migrates to the Jetpack app and allows notifications, WordPress app notifications are disabled. [#19616, #19611, #19590] +* [*] Reader now scrolls to the top if the tab bar button is tapped. [#19769] -We also squashed a bug in My Site. The "Disconnect from WordPress.com” button now disconnects when tapped and will refresh the app. From 7382e0447b501c9425f19ff24cab31ae632200fc Mon Sep 17 00:00:00 2001 From: Spencer Transier Date: Fri, 16 Dec 2022 10:03:01 -0700 Subject: [PATCH 4/6] Release Notes: add new section for next version (21.5) --- RELEASE-NOTES.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index ae0fe15a630c..edca824e1538 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,3 +1,7 @@ +21.5 +----- + + 21.4 ----- * [*] Fixed an issue where publishing Posts and Pages could fail under certain conditions. [#19717] From 31a7d694f7432852972f36467cc00f3541db3b44 Mon Sep 17 00:00:00 2001 From: Spencer Transier Date: Fri, 16 Dec 2022 12:37:37 -0700 Subject: [PATCH 5/6] Update strings for localization --- .../Resources/en.lproj/Localizable.strings | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/WordPress/Resources/en.lproj/Localizable.strings b/WordPress/Resources/en.lproj/Localizable.strings index e89491816756..2c4bab0ccaaa 100644 --- a/WordPress/Resources/en.lproj/Localizable.strings +++ b/WordPress/Resources/en.lproj/Localizable.strings @@ -230,6 +230,9 @@ /* translators: accessibility text for blocks with invalid content. %d: localized block title */ "%s block. This block has invalid content" = "%s block. This block has invalid content"; +/* translators: %s: name of the reusable block */ +"%s converted to regular block" = "%s converted to regular block"; + /* translators: %s: name of the reusable block */ "%s converted to regular blocks" = "%s converted to regular blocks"; @@ -764,6 +767,9 @@ /* No comment provided by engineer. */ "Alternatively, you can detach and edit these blocks separately by tapping “Convert to regular blocks”." = "Alternatively, you can detach and edit these blocks separately by tapping “Convert to regular blocks”."; +/* No comment provided by engineer. */ +"Alternatively, you can detach and edit this block separately by tapping “Convert to regular block”." = "Alternatively, you can detach and edit this block separately by tapping “Convert to regular block”."; + /* Instruction text to explain to help users type their password instead of using magic link login option. */ "Alternatively, you may enter the password for this account." = "Alternatively, you may enter the password for this account."; @@ -4221,6 +4227,9 @@ /* Title of a button that navigates the user to the Jetpack app if installed, or to the app store. */ "jetpack.fullscreen.overlay.early.switch.title" = "Switch to the new Jetpack app"; +/* Title of a button that navigates the user to the Jetpack app if installed, or to the app store. */ +"jetpack.fullscreen.overlay.late.switch.title" = "Switch to the Jetpack app"; + /* Title of a button that displays a blog post in a web view. */ "jetpack.fullscreen.overlay.learnMore" = "Learn more at jetpack.com"; @@ -4248,9 +4257,27 @@ /* Title of a screen displayed when the user accesses the Stats screen from the WordPress app. The screen showcases the Jetpack app. */ "jetpack.fullscreen.overlay.phaseOne.stats.title" = "Get your stats using the new Jetpack app"; +/* A footnote in a screen displayed when the user accesses a Jetpack powered feature from the WordPress app. The screen showcases the Jetpack app. */ +"jetpack.fullscreen.overlay.phaseThree.footnote" = "Switching is free and only takes a minute."; + /* Subtitle of a screen displayed when the user trys creating a new site from the WordPress app. The screen showcases the Jetpack app. */ "jetpack.fullscreen.overlay.phaseTwo.siteCreation.subtitle" = "Jetpack provides stats, notifications and more to help you build and grow the WordPress site of your dreams.\n\nThe WordPress app no longer supports creating a new site."; +/* Subtitle of a screen displayed when the user accesses a Jetpack-powered feature from the WordPress app. */ +"jetpack.fullscreen.overlay.phaseTwoAndThree.fallbackSubtitle" = "Stats, Reader, Notifications and other Jetpack powered features will be removed from the WordPress app soon."; + +/* Title of a screen displayed when the user accesses the Notifications screen from the WordPress app. The screen showcases the Jetpack app. */ +"jetpack.fullscreen.overlay.phaseTwoAndThree.notifications.title" = "Notifications are moving to Jetpack"; + +/* Title of a screen displayed when the user accesses the Reader screen from the WordPress app. The screen showcases the Jetpack app. */ +"jetpack.fullscreen.overlay.phaseTwoAndThree.reader.title" = "Reader is moving to the Jetpack app"; + +/* Title of a screen displayed when the user accesses the Stats screen from the WordPress app. The screen showcases the Jetpack app. */ +"jetpack.fullscreen.overlay.phaseTwoAndThree.stats.title" = "Stats are moving to the Jetpack app"; + +/* Subtitle of a screen displayed when the user accesses a Jetpack-powered feature from the WordPress app. The '%@' characters are a placeholder for the date the features will be removed. */ +"jetpack.fullscreen.overlay.phaseTwoAndThree.subtitle" = "Stats, Reader, Notifications and other Jetpack powered features will be removed from the WordPress app on %@."; + /* Title of a button that dismisses an overlay and displays the Reader screen. */ "jetpack.fullscreen.overlay.reader.continue.title" = "Continue to Reader"; @@ -4889,6 +4916,19 @@ /* Title of the migration done screen. */ "migration.done.title" = "Thanks for switching to Jetpack!"; +/* The description in the Load WordPress screen + The secondary description in the Load WordPress screen */ +"migration.loadWordpress.description" = "It looks like you have the WordPress app installed."; + +/* The primary button title in the Load WordPress screen */ +"migration.loadWordpress.primaryButton" = "Open WordPress"; + +/* The secondary button title in the Load WordPress screen */ +"migration.loadWordpress.secondaryButton" = "No thanks"; + +/* The title in the Load WordPress screen */ +"migration.loadWordpress.title" = "Welcome to Jetpack!"; + /* Secondary button title in the migration notifications screen. */ "migration.notifications.actions.secondary.title" = "Decide later"; From 5d89914a31628dfae6e61c207f344ecb59716e76 Mon Sep 17 00:00:00 2001 From: Spencer Transier Date: Mon, 19 Dec 2022 17:03:31 -0700 Subject: [PATCH 6/6] Remove Jetpack-only item from release notes --- WordPress/Resources/release_notes.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/WordPress/Resources/release_notes.txt b/WordPress/Resources/release_notes.txt index 9516573d7faa..56d361c9873e 100644 --- a/WordPress/Resources/release_notes.txt +++ b/WordPress/Resources/release_notes.txt @@ -1,6 +1,5 @@ * [*] Fixed an issue where publishing Posts and Pages could fail under certain conditions. [#19717] * [*] Share extension navigation bar is no longer transparent [#19700] -* [***] [Jetpack-only] Adds a smooth, opt-in transition to the Jetpack app for users migrating from the WordPress app. [#19759] * [***] You can now migrate your site content to the Jetpack app without a hitch. [#19759] * [**] [internal] Upgrade React Native from 0.66.2 to 0.69.4 [https://github.com/wordpress-mobile/gutenberg-mobile/pull/5193] * [*] [internal] When a user migrates to the Jetpack app and allows notifications, WordPress app notifications are disabled. [#19616, #19611, #19590]