Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release/24.8 with editorialized release notes #23140

Merged
merged 9 commits into from
May 2, 2024
Merged
Original file line number Diff line number Diff line change
@@ -168,7 +168,7 @@ private extension SubmitFeedbackViewController {
)

static let submitLoadingAnonymouslyMessage = NSLocalizedString(
"submit.feedback.submit.loading",
"submit.feedback.submitAnonymously.loading",
value: "Sending anonymously",
comment: "Notice informing user that their feedback is being submitted anonymously."
)
Original file line number Diff line number Diff line change
@@ -267,7 +267,7 @@ extension PeopleViewController {
case .viewers:
return NSLocalizedString("Viewers", comment: "Blog Viewers")
case .email:
return NSLocalizedString("users.list.title.subscribers", value: "Email Subscribers", comment: "Site Email Subscribers")
return NSLocalizedString("users.list.title.emailSubscribers", value: "Email Subscribers", comment: "Site Email Subscribers")
}
}

Original file line number Diff line number Diff line change
@@ -157,7 +157,7 @@ extension ReaderSiteTopic {
}

let emptyTitle = NSLocalizedString(
"reader.no.tags.title",
"reader.no.blog.title",
value: "Add a blog",
comment: "No Tags View Button Label"
)
5 changes: 2 additions & 3 deletions WordPress/Jetpack/Resources/AppStoreStrings.po
Original file line number Diff line number Diff line change
@@ -81,10 +81,9 @@ msgctxt "app_store_keywords"
msgid "social,notes,jetpack,writing,geotagging,media,blog,website,blogging,journal"
msgstr ""

msgctxt "v24.7-whats-new"
msgctxt "v24.8-whats-new"
msgid ""
"We’ve added reading preferences so you can customize your Reader screen. Pick the color, font, and size you like the most for a reading experience that fits your vibe.\n"
"We also updated the Insights tab to load and scroll better. No flickering, no breaking, no problem.\n"
"We made some updates to the Pages menu. You’ll now find Settings in its own section, right underneath Stats (which we also moved). It’s available for both published and unpublished posts. Groovy.\n"
msgstr ""

#. translators: This is a promo message that will be attached on top of the first screenshot in the App Store.
5 changes: 1 addition & 4 deletions WordPress/Jetpack/Resources/release_notes.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
* [*] [internal] Update Reachability. [#23030]
* [*] Move "Settings" context menu action in "Pages" from the submenu to a separate section to make it easily discoverable and make it available for unpublished posts [#23065]
* [*] Add "Stats" context menu action to "Pages" [#23065]

We made some updates to the Pages menu. You’ll now find Settings in its own section, right underneath Stats (which we also moved). It’s available for both published and unpublished posts. Groovy.
7 changes: 2 additions & 5 deletions WordPress/Resources/AppStoreStrings.po
Original file line number Diff line number Diff line change
@@ -45,12 +45,9 @@ msgctxt "app_store_keywords"
msgid "blogger,writing,blogging,web,maker,online,store,business,make,create,write,blogs"
msgstr ""

msgctxt "v24.7-whats-new"
msgctxt "v24.8-whats-new"
msgid ""
"Release notes loading…\n"
"Release notes loading…\n"
"Release notes loading…\n"
"(Just kidding, no new updates. See you in two weeks!)\n"
"We made some updates to the Pages menu. You’ll now find Settings in its own section, and it’s available for both published and unpublished posts. Groovy.\n"
msgstr ""

#. translators: This is a standard chunk of text used to tell a user what's new with a release when nothing major has changed.
17 changes: 12 additions & 5 deletions WordPress/Resources/en.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -7608,6 +7608,9 @@ with the filter chip button. */
/* Reader settings button accessibility label. */
"reader.navigation.settings.button.label" = "Reader Settings";

/* No Tags View Button Label */
"reader.no.blog.title" = "Add a blog";

/* Title for button on the no followed blogs result screen */
"reader.no.blogs.button" = "Discover Blogs";

@@ -7633,7 +7636,7 @@ with the filter chip button. */
"reader.no.results.subscriptions.button" = "Go to Subscriptions";

/* No Tags View Button Label */
"reader.no.tags.title" = "Add a blog";
"reader.no.tags.title" = "Add a tag";

/* Notice title when blocking a blog fails. */
"reader.notice.blog.blocked.failure" = "Unable to block blog";
@@ -9573,10 +9576,12 @@ Refer to: `reader.preferences.preview.body.feedback.format` */
/* The button title for the Submit button in the In-App Feedback screen */
"submit.feedback.submit.button" = "Submit";

/* Notice informing user that their feedback is being submitted anonymously.
Notice informing user that their feedback is being submitted. */
/* Notice informing user that their feedback is being submitted. */
"submit.feedback.submit.loading" = "Sending";

/* Notice informing user that their feedback is being submitted anonymously. */
"submit.feedback.submitAnonymously.loading" = "Sending anonymously";

/* The title for the the In-App Feedback screen */
"submit.feedback.title" = "Feedback";

@@ -10962,8 +10967,10 @@ Refer to: `reader.preferences.preview.body.feedback.format` */
/* Blog Users */
"Users" = "Users";

/* Site Email Subscribers
Site Subscribers */
/* Site Email Subscribers */
"users.list.title.emailSubscribers" = "Email Subscribers";

/* Site Subscribers */
"users.list.title.subscribers" = "Subscribers";

/* Menus label for describing which menu the location uses in the header. */
4 changes: 1 addition & 3 deletions WordPress/Resources/release_notes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
* [*] [internal] Update Reachability. [#23030]
* [*] Move "Settings" context menu action in "Pages" from the submenu to a separate section to make it easily discoverable and make it available for unpublished posts [#23065]

We made some updates to the Pages menu. You’ll now find Settings in its own section, and it’s available for both published and unpublished posts. Groovy.
8 changes: 6 additions & 2 deletions fastlane/lanes/build.rb
Original file line number Diff line number Diff line change
@@ -434,8 +434,12 @@ def upload_build_to_testflight(whats_new_path:, distribution_groups:)
changelog: File.read(whats_new_path),
distribute_external: true,
groups: distribution_groups,
# If there is a build waiting for beta review, we want to reject that so the new build can be submitted instead
reject_build_waiting_for_review: true
# If there is a build waiting for beta review, we ~~want~~ would like to to reject that so the new build can be submitted instead.
# Unfortunately, this is not (no longer?) possible via the ASC API.
# See https://github.com/fastlane/fastlane/issues/18408
#
# As a quick workaround to avoid CI failures, let's explicitly disable rejecting builds waiting for review.
reject_build_waiting_for_review: false
)
end