Merge pull request #20806 from wordpress-mobile/merge/24.9-code-freez…

…e-into-trunk Merge 24.9 code freeze into trunk
wordpress-mobile · May 13, 2024 · 6c352ca · 6c352ca
2 parents 09194c1 + ce04048
commit 6c352ca
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 32 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,5 +1,9 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+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]

diff --git 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]
 
diff --git a/WordPress/metadata/release_notes.txt b/WordPress/metadata/release_notes.txt
@@ -1 +1,2 @@
-April showers bring May flowers, but they unfortunately don’t bring release notes. Stay Juned for the next update.
+* [*] Site picker: Fixed the UI alignment issue in RTL [https://github.com/wordpress-mobile/WordPress-Android/pull/20804]
+
diff --git 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'

diff --git a/fastlane/resources/values/strings.xml b/fastlane/resources/values/strings.xml
@@ -993,8 +993,8 @@
     <string name="stats_manage_insights">Manage Insights</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
     <string name="stats_followers_email">Email</string>
-    <string name="stats_followers_count_message">Total %1$s Followers: %2$s</string>
-    <string name="stats_follower_label">Follower</string>
+    <string name="stats_subscribers_count_message">Total %1$s Subscribers: %2$s</string>
+    <string name="stats_subscriber_label">Subscriber</string>
     <string name="stats_follower_since_label">Since</string>
     <string name="stats_comments_authors">Authors</string>
     <string name="stats_comments_posts_and_pages">Posts and pages</string>
@@ -1007,7 +1007,7 @@
     <string name="stats_tags_and_categories_views_label">Views</string>
     <string name="stats_category_folded_name">%1$s | %2$s</string>
     <string name="stats_publicize_service_label">Service</string>
-    <string name="stats_publicize_followers_label">Followers</string>
+    <string name="stats_publicize_subscribers_label">Subscribers</string>
     <string name="stats_from_to_dates_in_week_label">%1$s - %2$s</string>
     <string name="stats_item_settings">Stats item settings</string>
     <string name="stats_cannot_be_started">We cannot open the statistics at the moment. Please try again later</string>
@@ -1025,6 +1025,11 @@
     <string name="stats_site_positive_utc">Site timezone (UTC + %s)</string>
     <string name="stats_site_negative_utc">Site timezone (UTC - %s)</string>
     <string name="stats_data_not_recorded_for_period">File download stats were not recorded before June 28th 2019.</string>
+    <string name="stats_name_label">Name</string>
+    <string name="stats_subscriber_since_label">Subscriber since</string>
+    <string name="stats_emails_latest_emails_label">Latest emails</string>
+    <string name="stats_emails_opens_label">Opens</string>
+    <string name="stats_emails_clicks_label">Clicks</string>
 
     <!-- Number suffixes -->
     <string name="negative_prefix">-%s</string>
@@ -1038,13 +1043,14 @@
     <!-- Stats accessibility strings -->
     <string name="stats_loading_card">Loading selected card data</string>
     <string name="stats_overview_content_description">%1$s %2$s for period: %3$s, change from previous period - %4$s</string>
-    <string name="stats_total_followers_content_description">%1$s, %2$s%% of total followers</string>
+    <string name="stats_total_subscribers_content_description">%1$s, %2$s%% of total subscribers</string>
     <string name="stats_graph_updated">Graph updated.</string>
     <string name="stats_expand_content_description">Expand</string>
     <string name="stats_collapse_content_description">Collapse</string>
     <string name="stats_item_expanded">Item expanded</string>
     <string name="stats_item_collapsed">Item collapsed</string>
     <string name="stats_list_item_description">%1$s: %2$s, %3$s: %4$s</string>
+    <string name="stats_list_item_with_two_values_description">%1$s: %2$s, %3$s: %4$s, %5$s: %6$s</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
     <string name="stats_bar_chart_accessibility_overlapping_entry">  &amp; %1$d %2$s</string>
 
@@ -1317,14 +1323,15 @@
     <string name="stats_view_comments" translatable="false">@string/comments</string>
     <string name="stats_view_search_terms">Search Terms</string>
     <string name="stats_view_publicize">Jetpack Social Connections</string>
-    <string name="stats_view_followers">Followers</string>
-    <string name="stats_view_follower_totals">Follower Totals</string>
+    <string name="stats_view_subscriber_totals">Subscriber Totals</string>
     <string name="stats_view_total_likes">Total Likes</string>
     <string name="stats_view_total_comments">Total Comments</string>
-    <string name="stats_view_total_followers">Total Followers</string>
+    <string name="stats_view_total_subscribers">Total Subscribers</string>
+    <string name="stats_view_subscribers_chart">Subscribers</string>
+    <string name="stats_view_subscribers">Subscribers</string>
+    <string name="stats_view_emails">Emails</string>
 
     <!-- stats: followers -->
-    <string name="stats_subscribers_subscribers">Subscribers</string>
     <string name="stats_followers_seconds_ago">seconds ago</string>
     <string name="stats_followers_a_minute_ago">a minute ago</string>
     <string name="stats_followers_minutes">%1$d minutes</string>
@@ -1400,7 +1407,6 @@
     <string name="stats_insights_tumblr">Tumblr</string>
     <string name="stats_insights_google_plus">Google+</string>
     <string name="stats_insights_linkedin">LinkedIn</string>
-    <string name="stats_insights_social">Social</string>
     <string name="stats_insights_path">Path</string>
     <string name="stats_most_popular_percent_views">%1$s of views</string>
     <string name="stats_most_popular_percent_views_empty">Not enough activity. Check back later when your site\'s had more visitors!</string>
@@ -1414,7 +1420,7 @@
     <string name="stats_insights_like_guide_card">⭐️ Your latest post %1$s has received %2$s like.</string>
     <string name="stats_insights_likes_guide_card">⭐️ Your latest post %1$s has received %2$s likes.</string>
     <string name="stats_insights_comments_guide_card">💡Tap \'VIEW MORE\' to see your top commenters.</string>
-    <string name="stats_insights_followers_guide_card">💡Commenting on other blogs is a great way to build attention and followers for your new site.</string>
+    <string name="stats_insights_subscribers_guide_card">💡Commenting on other blogs is a great way to build attention and subscribers for your new site.</string>
 
     <!-- Stats refreshed widgets -->
     <string name="stats_widget_log_in_message">Please log in to the WordPress app to add a widget.</string>
@@ -1501,7 +1507,7 @@
     <string name="notifications_empty_all">No notifications…yet.</string>
     <string name="notifications_empty_unread">You\'re all up to date!</string>
     <string name="notifications_empty_comments">No comments yet</string>
-    <string name="notifications_empty_followers">No followers yet</string>
+    <string name="notifications_empty_subscribers">No subscribers yet</string>
     <string name="notifications_empty_likes">No likes yet</string>
     <string name="notifications_empty_action_all">Get active! Comment on posts from blogs you follow.</string>
     <string name="notifications_empty_action_unread">Reignite the conversation: write a new post</string>
@@ -1516,13 +1522,13 @@
     <string name="error_notification_open">Could not open notification</string>
     <string name="ignore">Ignore</string>
     <string name="push_auth_expired">The request has expired. Log in to WordPress.com to try again.</string>
-    <string name="follows">Follows</string>
+    <string name="subscribers">Subscribers</string>
     <string name="notifications_label_new_notifications">New notifications</string>
     <string name="notifications_label_new_notifications_subtitle">Tap to show them</string>
     <string name="notifications_tab_title_all">All</string>
     <string name="notifications_tab_title_unread_notifications">Unread</string>
     <string name="notifications_tab_title_comments">Comments</string>
-    <string name="notifications_tab_title_follows">Follows</string>
+    <string name="notifications_tab_title_subscribers">Subscribers</string>
     <string name="notifications_tab_title_likes">Likes</string>
     <string name="notifications_unread_content_description">Unread</string>
 
@@ -1599,14 +1605,14 @@
     <string name="comments_on_my_site">Comments on my site</string>
     <string name="likes_on_my_comments">Likes on my comments</string>
     <string name="likes_on_my_posts">Likes on my posts</string>
-    <string name="site_follows">Site follows</string>
+    <string name="site_subscriptions">Site subscriptions</string>
     <string name="site_achievements">Site achievements</string>
     <string name="username_mentions">Username mentions</string>
     <string-array name="notifications_blog_settings" translatable="false">
         <item>@string/comments_on_my_site</item>
         <item>@string/likes_on_my_comments</item>
         <item>@string/likes_on_my_posts</item>
-        <item>@string/site_follows</item>
+        <item>@string/site_subscriptions</item>
         <item>@string/site_achievements</item>
         <item>@string/username_mentions</item>
     </string-array>
@@ -1788,6 +1794,8 @@
     <string name="post_settings_time_and_date">Date and Time</string>
     <string name="post_settings_notification">Notification</string>
     <string name="post_settings_add_to_calendar">Add to calendar</string>
+    <string name="post_settings_no_calendar_app_exists">No app found to handle the request to add to calendar</string>
+    <string name="post_settings_add_to_calendar_error">Unable to add to calendar</string>
     <string name="post_settings_jetpack_social_header">Social Sharing</string>
     <string name="post_settings_jetpack_social_connect_social_profiles_message">Increase your traffic by auto-sharing your posts with your friends on social media.</string>
     <string name="post_settings_jetpack_social_connect_social_profiles_button">Connect accounts</string>
@@ -2064,12 +2072,12 @@
     <string name="error_post_remote_site_settings">Couldn\'t save site info</string>
     <string name="error_fetch_users_list">Couldn\'t retrieve site users</string>
     <string name="error_fetch_authors_list">Couldn\'t retrieve authors</string>
-    <string name="error_fetch_followers_list">Couldn\'t retrieve site followers</string>
-    <string name="error_fetch_email_followers_list">Couldn\'t retrieve site email followers</string>
+    <string name="error_fetch_subscribers_list">Couldn\'t retrieve site subscribers</string>
+    <string name="error_fetch_email_subscribers_list">Couldn\'t retrieve site email subscribers</string>
     <string name="error_fetch_viewers_list">Couldn\'t retrieve site viewers</string>
     <string name="error_update_role">Couldn\'t update user role</string>
     <string name="error_remove_user">Couldn\'t remove user</string>
-    <string name="error_remove_follower">Couldn\'t remove follower</string>
+    <string name="error_remove_subscriber">Couldn\'t remove subscriber</string>
     <string name="error_remove_viewer">Couldn\'t remove viewer</string>
     <string name="error_notif_q_action_like">Could not like comment. Please try again later.</string>
     <string name="error_notif_q_action_approve">Could not approve comment. Please try again later.</string>
@@ -2079,6 +2087,7 @@
     <string name="error_browser_no_network">Unable to load this page right now.</string>
     <string name="error_network_connection">Check your network connection and try again.</string>
     <string name="error_update_site_title_network">Couldn\'t update site title. Check your network connection and try again.</string>
+    <string name="error_no_camera_available">No camera app available.</string>
 
     <!-- Post Error -->
     <string name="error_unknown_post">Could not find the post on the server</string>
@@ -2638,7 +2647,7 @@
     <string name="follower_subscribed_since">Since %1$s</string>
     <string name="person_remove_confirmation_title">Remove %1$s</string>
     <string name="user_remove_confirmation_message">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?</string>
-    <string name="follower_remove_confirmation_message">If removed, this follower will stop receiving notifications about this site, unless they re-follow.\n\nWould you still like to remove this follower?</string>
+    <string name="subscriber_remove_confirmation_message">If removed, this subscriber will stop receiving notifications about this site, unless they re-subscribe.\n\nWould you still like to remove this subscriber?</string>
     <string name="viewer_remove_confirmation_message">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?</string>
     <string name="person_removed">Successfully removed %1$s</string>
     <string name="invite_people">Invite People</string>
@@ -2647,7 +2656,7 @@
     <string name="button_invite" translatable="false">@string/invite</string>
     <string name="invite_username_not_found">%s: User not found</string>
     <string name="invite_already_a_member">%s: Already a member</string>
-    <string name="invite_already_following">%s: Already following</string>
+    <string name="invite_already_subscribed">%s: Already subscribed</string>
     <string name="invite_user_blocked_invites">%s: User blocked invites</string>
     <string name="invite_invalid_email">%s: Invalid email</string>
     <string name="invite_message_title">Custom message</string>
@@ -2664,18 +2673,18 @@
     <string name="people_optional_custom_message_helper_text">Optional: enter a custom message to be sent with your invitation.</string>
 
     <string name="people_dropdown_item_team">Team</string>
-    <string name="people_dropdown_item_followers">Followers</string>
-    <string name="people_dropdown_item_email_followers">Email Followers</string>
+    <string name="people_dropdown_item_subscribers">Subscribers</string>
+    <string name="people_dropdown_item_email_subscribers">Email Subscribers</string>
     <string name="people_dropdown_item_viewers">Viewers</string>
     <string name="people_empty_list_filtered_users">No users yet</string>
-    <string name="people_empty_list_filtered_followers">No followers yet</string>
-    <string name="people_empty_list_filtered_email_followers">No email followers yet</string>
+    <string name="people_empty_list_filtered_subscribers">No subscribers yet</string>
+    <string name="people_empty_list_filtered_email_subscribers">No email subscribers yet</string>
     <string name="people_empty_list_filtered_viewers">No viewers yet</string>
     <string name="people_fetching">Fetching users…</string>
-    <string name="title_follower">Follower</string>
-    <string name="title_email_follower">Email Follower</string>
+    <string name="title_subscriber">Subscriber</string>
+    <string name="title_email_subscriber">Email Subscriber</string>
 
-    <string name="role_follower">Follower</string>
+    <string name="role_subscriber">Subscriber</string>
     <string name="role_viewer">Viewer</string>
 
     <string name="invite_links_section_title">Invite Link</string>

diff --git a/version.properties b/version.properties
@@ -1,2 +1,2 @@
-versionName=24.8
-versionCode=1430
+versionName=24.9-rc-1
+versionCode=1431
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		April showers bring May flowers, but they unfortunately don’t bring release notes. Stay Juned for the next update.
		* [*] Site picker: Fixed the UI alignment issue in RTL [https://github.com/wordpress-mobile/WordPress-Android/pull/20804]