From c1dc1c63b584da432c07cf3aa3e966ca05c11a15 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Tue, 30 Apr 2024 12:01:59 +1000 Subject: [PATCH 1/6] Do not reject builds waiting for TestFlight review to avoid CI failure See https://github.com/fastlane/fastlane/issues/18408 --- fastlane/lanes/build.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb index faea2d8173e5..3b12af907921 100644 --- a/fastlane/lanes/build.rb +++ b/fastlane/lanes/build.rb @@ -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 From 4b2fa248fbffcc7adc1132444a20adc4bbb4de60 Mon Sep 17 00:00:00 2001 From: Povilas Staskus Date: Tue, 30 Apr 2024 14:48:23 +0300 Subject: [PATCH 2/6] Fix duplicate localization identifiers --- .../Utility/In-App Feedback/SubmitFeedbackViewController.swift | 2 +- WordPress/Classes/ViewRelated/People/PeopleViewController.swift | 2 +- .../Classes/ViewRelated/Reader/Filter/FilterProvider.swift | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/Classes/Utility/In-App Feedback/SubmitFeedbackViewController.swift b/WordPress/Classes/Utility/In-App Feedback/SubmitFeedbackViewController.swift index 685a6cab4860..b40db99602fb 100644 --- a/WordPress/Classes/Utility/In-App Feedback/SubmitFeedbackViewController.swift +++ b/WordPress/Classes/Utility/In-App Feedback/SubmitFeedbackViewController.swift @@ -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." ) diff --git a/WordPress/Classes/ViewRelated/People/PeopleViewController.swift b/WordPress/Classes/ViewRelated/People/PeopleViewController.swift index 52cb9b0e885c..59116a5e0b61 100644 --- a/WordPress/Classes/ViewRelated/People/PeopleViewController.swift +++ b/WordPress/Classes/ViewRelated/People/PeopleViewController.swift @@ -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") } } diff --git a/WordPress/Classes/ViewRelated/Reader/Filter/FilterProvider.swift b/WordPress/Classes/ViewRelated/Reader/Filter/FilterProvider.swift index 0e6807c16cb5..014ad73aec3d 100644 --- a/WordPress/Classes/ViewRelated/Reader/Filter/FilterProvider.swift +++ b/WordPress/Classes/ViewRelated/Reader/Filter/FilterProvider.swift @@ -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" ) From b1bfff4032f6cf9864db943a0a331f2c899c92d3 Mon Sep 17 00:00:00 2001 From: Povilas Staskus Date: Tue, 30 Apr 2024 14:53:25 +0300 Subject: [PATCH 3/6] Update strings for localization --- .../Resources/en.lproj/Localizable.strings | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/WordPress/Resources/en.lproj/Localizable.strings b/WordPress/Resources/en.lproj/Localizable.strings index 8823e1118379..92dfbd9fc017 100644 --- a/WordPress/Resources/en.lproj/Localizable.strings +++ b/WordPress/Resources/en.lproj/Localizable.strings @@ -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. */ From 7a07ef5b71b25c79a94abf38181563abc630713a Mon Sep 17 00:00:00 2001 From: David Christiandy <1299411+dvdchr@users.noreply.github.com> Date: Thu, 2 May 2024 13:24:29 +0700 Subject: [PATCH 4/6] Add editorialized release notes for version 24.8 --- WordPress/Jetpack/Resources/release_notes.txt | 5 +---- WordPress/Resources/release_notes.txt | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/WordPress/Jetpack/Resources/release_notes.txt b/WordPress/Jetpack/Resources/release_notes.txt index a051f43082d3..33f1301d9f19 100644 --- a/WordPress/Jetpack/Resources/release_notes.txt +++ b/WordPress/Jetpack/Resources/release_notes.txt @@ -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. \ No newline at end of file diff --git a/WordPress/Resources/release_notes.txt b/WordPress/Resources/release_notes.txt index b947e8874d39..cbd493a03aa1 100644 --- a/WordPress/Resources/release_notes.txt +++ b/WordPress/Resources/release_notes.txt @@ -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. \ No newline at end of file From dff6a62b05336df66ff16f095d5e0d5147999d5a Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Thu, 2 May 2024 06:28:37 +0000 Subject: [PATCH 5/6] Update metadata strings --- WordPress/Resources/AppStoreStrings.po | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/WordPress/Resources/AppStoreStrings.po b/WordPress/Resources/AppStoreStrings.po index c71d46967a1b..4c8f388908b7 100644 --- a/WordPress/Resources/AppStoreStrings.po +++ b/WordPress/Resources/AppStoreStrings.po @@ -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. From 7db30a1e0235c39f51e85071619eae6a80abff28 Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Thu, 2 May 2024 06:28:37 +0000 Subject: [PATCH 6/6] Update metadata strings --- WordPress/Jetpack/Resources/AppStoreStrings.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/WordPress/Jetpack/Resources/AppStoreStrings.po b/WordPress/Jetpack/Resources/AppStoreStrings.po index 50f335c37fcc..df6caa9fd6a1 100644 --- a/WordPress/Jetpack/Resources/AppStoreStrings.po +++ b/WordPress/Jetpack/Resources/AppStoreStrings.po @@ -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.