From ea2fcacf838f4761ff6eef60801281c26a2d688f Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Mon, 13 May 2024 14:59:29 +0000 Subject: [PATCH 1/7] Bump version number --- version.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.properties b/version.properties index 108894b1216e..e5fe7660ff37 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -versionName=24.8 -versionCode=1430 \ No newline at end of file +versionName=24.9-rc-1 +versionCode=1431 \ No newline at end of file From bc1ada1512651765cbbc1d588827f0a66f4cf8bb Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Mon, 13 May 2024 14:59:29 +0000 Subject: [PATCH 2/7] Update draft release notes for 24.9. --- WordPress/metadata/release_notes.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/WordPress/metadata/release_notes.txt b/WordPress/metadata/release_notes.txt index 68ef433035e3..82043e3386d7 100644 --- a/WordPress/metadata/release_notes.txt +++ b/WordPress/metadata/release_notes.txt @@ -1 +1,4 @@ -April showers bring May flowers, but they unfortunately don’t bring release notes. Stay Juned for the next update. +* [*] [Jetpack-only] Removed Social section from the detail screen of Total Followers card [https://github.com/wordpress-mobile/WordPress-Android/pull/20763] +* [***] [Jetpack-only] Reorganized Stats to include updated Traffic and Insights tabs, along with a newly added Subscribers tab to improve subscriber metrics analysis [https://github.com/wordpress-mobile/WordPress-Android/pull/20756] +* [*] Site picker: Fixed the UI alignment issue in RTL [https://github.com/wordpress-mobile/WordPress-Android/pull/20804] + From f9bb6ff4f9e0da9fe3e96baebe804ac6830fb969 Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Mon, 13 May 2024 14:59:30 +0000 Subject: [PATCH 3/7] Update draft release notes for Jetpack 24.9. --- WordPress/jetpack_metadata/release_notes.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/WordPress/jetpack_metadata/release_notes.txt b/WordPress/jetpack_metadata/release_notes.txt index 9f2bf4ba3ae2..82043e3386d7 100644 --- a/WordPress/jetpack_metadata/release_notes.txt +++ b/WordPress/jetpack_metadata/release_notes.txt @@ -1,2 +1,4 @@ -On the Stats screen, percentages now appear in their correct position for right-to-left language users. Right on. +* [*] [Jetpack-only] Removed Social section from the detail screen of Total Followers card [https://github.com/wordpress-mobile/WordPress-Android/pull/20763] +* [***] [Jetpack-only] Reorganized Stats to include updated Traffic and Insights tabs, along with a newly added Subscribers tab to improve subscriber metrics analysis [https://github.com/wordpress-mobile/WordPress-Android/pull/20756] +* [*] Site picker: Fixed the UI alignment issue in RTL [https://github.com/wordpress-mobile/WordPress-Android/pull/20804] From 4a211577d6828ca5f9b9e82ec4fbe696a2b0e95f Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Mon, 13 May 2024 14:59:30 +0000 Subject: [PATCH 4/7] Release Notes: add new section for next version (25.0) --- RELEASE-NOTES.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 289204dcbee8..2f150f031f95 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,5 +1,9 @@ *** PLEASE FOLLOW THIS FORMAT: [] [] +25.0 +----- + + 24.9 ----- * [*] [Jetpack-only] Removed Social section from the detail screen of Total Followers card [https://github.com/wordpress-mobile/WordPress-Android/pull/20763] From e51338eee01c58f5cc08639e3ee8612be8c738e8 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Mon, 13 May 2024 11:22:27 -0400 Subject: [PATCH 5/7] Update FluxC version to 2.79.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 28f68a270b12..9b774d3f6deb 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ ext { automatticTracksVersion = '5.0.0' gutenbergMobileVersion = 'v1.118.0' wordPressAztecVersion = 'v2.1.3' - wordPressFluxCVersion = 'trunk-935a54775a4086640c7ac1c9fcd2d494d8acdf65' + wordPressFluxCVersion = '2.79.0' wordPressLoginVersion = '1.15.0' wordPressPersistentEditTextVersion = '1.0.2' wordPressUtilsVersion = '3.14.0' From ab901360e5b09f1816352d80dcdf7eb721d3c538 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Mon, 13 May 2024 11:22:56 -0400 Subject: [PATCH 6/7] Remove Jetpack only release notes from WordPress 24.9 release notes --- WordPress/metadata/release_notes.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/WordPress/metadata/release_notes.txt b/WordPress/metadata/release_notes.txt index 82043e3386d7..2dc1f8f4640e 100644 --- a/WordPress/metadata/release_notes.txt +++ b/WordPress/metadata/release_notes.txt @@ -1,4 +1,2 @@ -* [*] [Jetpack-only] Removed Social section from the detail screen of Total Followers card [https://github.com/wordpress-mobile/WordPress-Android/pull/20763] -* [***] [Jetpack-only] Reorganized Stats to include updated Traffic and Insights tabs, along with a newly added Subscribers tab to improve subscriber metrics analysis [https://github.com/wordpress-mobile/WordPress-Android/pull/20756] * [*] Site picker: Fixed the UI alignment issue in RTL [https://github.com/wordpress-mobile/WordPress-Android/pull/20804] From ce04048f5c26f0c6df8119be88f0916aba830e6f Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Mon, 13 May 2024 15:50:00 +0000 Subject: [PATCH 7/7] Freeze strings for translation --- fastlane/resources/values/strings.xml | 63 +++++++++++++++------------ 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/fastlane/resources/values/strings.xml b/fastlane/resources/values/strings.xml index 5deeefd7a248..60f8764c813a 100644 --- a/fastlane/resources/values/strings.xml +++ b/fastlane/resources/values/strings.xml @@ -993,8 +993,8 @@ Manage Insights WordPress.com Email - Total %1$s Followers: %2$s - Follower + Total %1$s Subscribers: %2$s + Subscriber Since Authors Posts and pages @@ -1007,7 +1007,7 @@ Views %1$s | %2$s Service - Followers + Subscribers %1$s - %2$s Stats item settings We cannot open the statistics at the moment. Please try again later @@ -1025,6 +1025,11 @@ Site timezone (UTC + %s) Site timezone (UTC - %s) File download stats were not recorded before June 28th 2019. + Name + Subscriber since + Latest emails + Opens + Clicks -%s @@ -1038,13 +1043,14 @@ Loading selected card data %1$s %2$s for period: %3$s, change from previous period - %4$s - %1$s, %2$s%% of total followers + %1$s, %2$s%% of total subscribers Graph updated. Expand Collapse Item expanded Item collapsed %1$s: %2$s, %3$s: %4$s + %1$s: %2$s, %3$s: %4$s, %5$s: %6$s %1$s, %2$d %3$s   & %1$d %2$s @@ -1317,14 +1323,15 @@ @string/comments Search Terms Jetpack Social Connections - Followers - Follower Totals + Subscriber Totals Total Likes Total Comments - Total Followers + Total Subscribers + Subscribers + Subscribers + Emails - Subscribers seconds ago a minute ago %1$d minutes @@ -1400,7 +1407,6 @@ Tumblr Google+ LinkedIn - Social Path %1$s of views Not enough activity. Check back later when your site\'s had more visitors! @@ -1414,7 +1420,7 @@ ⭐️ Your latest post %1$s has received %2$s like. ⭐️ Your latest post %1$s has received %2$s likes. 💡Tap \'VIEW MORE\' to see your top commenters. - 💡Commenting on other blogs is a great way to build attention and followers for your new site. + 💡Commenting on other blogs is a great way to build attention and subscribers for your new site. Please log in to the WordPress app to add a widget. @@ -1501,7 +1507,7 @@ No notifications…yet. You\'re all up to date! No comments yet - No followers yet + No subscribers yet No likes yet Get active! Comment on posts from blogs you follow. Reignite the conversation: write a new post @@ -1516,13 +1522,13 @@ Could not open notification Ignore The request has expired. Log in to WordPress.com to try again. - Follows + Subscribers New notifications Tap to show them All Unread Comments - Follows + Subscribers Likes Unread @@ -1599,14 +1605,14 @@ Comments on my site Likes on my comments Likes on my posts - Site follows + Site subscriptions Site achievements Username mentions @string/comments_on_my_site @string/likes_on_my_comments @string/likes_on_my_posts - @string/site_follows + @string/site_subscriptions @string/site_achievements @string/username_mentions @@ -1788,6 +1794,8 @@ Date and Time Notification Add to calendar + No app found to handle the request to add to calendar + Unable to add to calendar Social Sharing Increase your traffic by auto-sharing your posts with your friends on social media. Connect accounts @@ -2064,12 +2072,12 @@ Couldn\'t save site info Couldn\'t retrieve site users Couldn\'t retrieve authors - Couldn\'t retrieve site followers - Couldn\'t retrieve site email followers + Couldn\'t retrieve site subscribers + Couldn\'t retrieve site email subscribers Couldn\'t retrieve site viewers Couldn\'t update user role Couldn\'t remove user - Couldn\'t remove follower + Couldn\'t remove subscriber Couldn\'t remove viewer Could not like comment. Please try again later. Could not approve comment. Please try again later. @@ -2079,6 +2087,7 @@ Unable to load this page right now. Check your network connection and try again. Couldn\'t update site title. Check your network connection and try again. + No camera app available. Could not find the post on the server @@ -2638,7 +2647,7 @@ Since %1$s Remove %1$s If you remove %1$s, that user will no longer be able to access this site, but any content that was created by %1$s will remain on the site.\n\nWould you still like to remove this user? - If removed, this follower will stop receiving notifications about this site, unless they re-follow.\n\nWould you still like to remove this follower? + If removed, this subscriber will stop receiving notifications about this site, unless they re-subscribe.\n\nWould you still like to remove this subscriber? If you remove this viewer, he or she will not be able to visit this site.\n\nWould you still like to remove this viewer? Successfully removed %1$s Invite People @@ -2647,7 +2656,7 @@ @string/invite %s: User not found %s: Already a member - %s: Already following + %s: Already subscribed %s: User blocked invites %s: Invalid email Custom message @@ -2664,18 +2673,18 @@ Optional: enter a custom message to be sent with your invitation. Team - Followers - Email Followers + Subscribers + Email Subscribers Viewers No users yet - No followers yet - No email followers yet + No subscribers yet + No email subscribers yet No viewers yet Fetching users… - Follower - Email Follower + Subscriber + Email Subscriber - Follower + Subscriber Viewer Invite Link