From f051aafe64081c8cb86f8d10f894c532b9ee2a21 Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Fri, 27 Sep 2024 03:59:48 -0700 Subject: [PATCH 1/8] Bump version number --- config/Version.Public.xcconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/Version.Public.xcconfig b/config/Version.Public.xcconfig index 784ff13960a..09887d4cff5 100644 --- a/config/Version.Public.xcconfig +++ b/config/Version.Public.xcconfig @@ -1,4 +1,4 @@ CURRENT_PROJECT_VERSION = $VERSION_LONG MARKETING_VERSION = $VERSION_SHORT -VERSION_LONG = 20.5.0.2 -VERSION_SHORT = 20.5 +VERSION_LONG = 20.6.0.0 +VERSION_SHORT = 20.6 From 9b870ee1b68b42ec440a2148762a59f50039bd10 Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Fri, 27 Sep 2024 03:59:48 -0700 Subject: [PATCH 2/8] Update draft release notes for 20.6. --- WooCommerce/Resources/release_notes.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/WooCommerce/Resources/release_notes.txt b/WooCommerce/Resources/release_notes.txt index 9b84b650a95..49c1076ee7b 100644 --- a/WooCommerce/Resources/release_notes.txt +++ b/WooCommerce/Resources/release_notes.txt @@ -1,3 +1,10 @@ -In this update, we've added a handy reminder feature to help you continue abandoned campaign creation and improved how notifications open directly to campaign creation in Blaze. We’ve also fixed formatting issues for discount and cash payments when device and store currency settings differ. Enjoy a smoother experience managing your store on the go! - +- [*] Dashboard: Cards are now displayed in 2 columns on large screen sizes. [https://github.com/woocommerce/woocommerce-ios/pull/13983] +- [*] Jetpack setup: fixed issue checking site info after activating Jetpack for sites with Jetpack connection package. [https://github.com/woocommerce/woocommerce-ios/pull/13993] +- [*] Blaze: Campaign status is now updated immediately after being canceled. [https://github.com/woocommerce/woocommerce-ios/pull/13992] +- [*] Blaze: Show feedback banner and survey for user feedback after campaign creation. [https://github.com/woocommerce/woocommerce-ios/pull/14040] +- [*] Now the keyboard will be open automatically when creating a new Product Category. [https://github.com/woocommerce/woocommerce-ios/pull/14031] +- [internal] Logging for app storage size added in Core Data crash logs [https://github.com/woocommerce/woocommerce-ios/pull/14008] +- [*] Payments: Prevent phone from sleeping during card reader updates [https://github.com/woocommerce/woocommerce-ios/pull/14021] +- [internal] Fixed concurrency issue with Blaze local notification scheduler. [https://github.com/woocommerce/woocommerce-ios/pull/14012] +- [internal] We added ability to mark and filter favorite products. This feature isn't released yet. But please smoke test product filtering work as expected. [https://github.com/woocommerce/woocommerce-ios/pull/14001] From a553b48b27fe62f410bfed52354f0f85606db81c Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Fri, 27 Sep 2024 03:59:48 -0700 Subject: [PATCH 3/8] Release Notes: add new section for next version (20.7) --- RELEASE-NOTES.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 71a66c887a4..0e9601d259e 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,6 +1,10 @@ *** PLEASE FOLLOW THIS FORMAT: [] [] *** Use [*****] to indicate smoke tests of all critical flows should be run on the final IPA before release (e.g. major library or OS update). +20.7 +----- + + 20.6 ----- - [*] Dashboard: Cards are now displayed in 2 columns on large screen sizes. [https://github.com/woocommerce/woocommerce-ios/pull/13983] From 39eaefbe50608170404d174c1b96e968f9dc8fb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Boz=CC=8Cidar=20S=CC=8Cevo?= Date: Fri, 27 Sep 2024 13:09:28 +0200 Subject: [PATCH 4/8] Update release notes. --- CHANGELOG.md | 3 +++ WooCommerce/Resources/release_notes.txt | 11 +---------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22e02eda224..e6b36ca8920 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ +## 20.6 +In this update, we’ve improved the dashboard with a cleaner, 2-column layout on larger screens. Jetpack setup is now smoother, and campaigns cancel instantly with immediate feedback options. Creating product categories is faster with an auto-opening keyboard, and your phone stays active during card reader updates for seamless transactions. + ## 20.5 In this update, we've added a handy reminder feature to help you continue abandoned campaign creation and improved how notifications open directly to campaign creation in Blaze. We’ve also fixed formatting issues for discount and cash payments when device and store currency settings differ. Enjoy a smoother experience managing your store on the go! diff --git a/WooCommerce/Resources/release_notes.txt b/WooCommerce/Resources/release_notes.txt index 49c1076ee7b..2266a40c008 100644 --- a/WooCommerce/Resources/release_notes.txt +++ b/WooCommerce/Resources/release_notes.txt @@ -1,10 +1 @@ -- [*] Dashboard: Cards are now displayed in 2 columns on large screen sizes. [https://github.com/woocommerce/woocommerce-ios/pull/13983] -- [*] Jetpack setup: fixed issue checking site info after activating Jetpack for sites with Jetpack connection package. [https://github.com/woocommerce/woocommerce-ios/pull/13993] -- [*] Blaze: Campaign status is now updated immediately after being canceled. [https://github.com/woocommerce/woocommerce-ios/pull/13992] -- [*] Blaze: Show feedback banner and survey for user feedback after campaign creation. [https://github.com/woocommerce/woocommerce-ios/pull/14040] -- [*] Now the keyboard will be open automatically when creating a new Product Category. [https://github.com/woocommerce/woocommerce-ios/pull/14031] -- [internal] Logging for app storage size added in Core Data crash logs [https://github.com/woocommerce/woocommerce-ios/pull/14008] -- [*] Payments: Prevent phone from sleeping during card reader updates [https://github.com/woocommerce/woocommerce-ios/pull/14021] -- [internal] Fixed concurrency issue with Blaze local notification scheduler. [https://github.com/woocommerce/woocommerce-ios/pull/14012] -- [internal] We added ability to mark and filter favorite products. This feature isn't released yet. But please smoke test product filtering work as expected. [https://github.com/woocommerce/woocommerce-ios/pull/14001] - +In this update, we’ve improved the dashboard with a cleaner, 2-column layout on larger screens. Jetpack setup is now smoother, and campaigns cancel instantly with immediate feedback options. Creating product categories is faster with an auto-opening keyboard, and your phone stays active during card reader updates for seamless transactions. From 9966c64a444cfcf3ce792d24b283514d339b8c86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Boz=CC=8Cidar=20S=CC=8Cevo?= Date: Fri, 27 Sep 2024 13:10:41 +0200 Subject: [PATCH 5/8] Revert "Update release notes." This reverts commit 39eaefbe50608170404d174c1b96e968f9dc8fb2. --- CHANGELOG.md | 3 --- WooCommerce/Resources/release_notes.txt | 11 ++++++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6b36ca8920..22e02eda224 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,6 @@ -## 20.6 -In this update, we’ve improved the dashboard with a cleaner, 2-column layout on larger screens. Jetpack setup is now smoother, and campaigns cancel instantly with immediate feedback options. Creating product categories is faster with an auto-opening keyboard, and your phone stays active during card reader updates for seamless transactions. - ## 20.5 In this update, we've added a handy reminder feature to help you continue abandoned campaign creation and improved how notifications open directly to campaign creation in Blaze. We’ve also fixed formatting issues for discount and cash payments when device and store currency settings differ. Enjoy a smoother experience managing your store on the go! diff --git a/WooCommerce/Resources/release_notes.txt b/WooCommerce/Resources/release_notes.txt index 2266a40c008..49c1076ee7b 100644 --- a/WooCommerce/Resources/release_notes.txt +++ b/WooCommerce/Resources/release_notes.txt @@ -1 +1,10 @@ -In this update, we’ve improved the dashboard with a cleaner, 2-column layout on larger screens. Jetpack setup is now smoother, and campaigns cancel instantly with immediate feedback options. Creating product categories is faster with an auto-opening keyboard, and your phone stays active during card reader updates for seamless transactions. +- [*] Dashboard: Cards are now displayed in 2 columns on large screen sizes. [https://github.com/woocommerce/woocommerce-ios/pull/13983] +- [*] Jetpack setup: fixed issue checking site info after activating Jetpack for sites with Jetpack connection package. [https://github.com/woocommerce/woocommerce-ios/pull/13993] +- [*] Blaze: Campaign status is now updated immediately after being canceled. [https://github.com/woocommerce/woocommerce-ios/pull/13992] +- [*] Blaze: Show feedback banner and survey for user feedback after campaign creation. [https://github.com/woocommerce/woocommerce-ios/pull/14040] +- [*] Now the keyboard will be open automatically when creating a new Product Category. [https://github.com/woocommerce/woocommerce-ios/pull/14031] +- [internal] Logging for app storage size added in Core Data crash logs [https://github.com/woocommerce/woocommerce-ios/pull/14008] +- [*] Payments: Prevent phone from sleeping during card reader updates [https://github.com/woocommerce/woocommerce-ios/pull/14021] +- [internal] Fixed concurrency issue with Blaze local notification scheduler. [https://github.com/woocommerce/woocommerce-ios/pull/14012] +- [internal] We added ability to mark and filter favorite products. This feature isn't released yet. But please smoke test product filtering work as expected. [https://github.com/woocommerce/woocommerce-ios/pull/14001] + From cfd0fb150992393d917344da9f3b3cb9afd8a76b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Boz=CC=8Cidar=20S=CC=8Cevo?= Date: Fri, 27 Sep 2024 13:11:47 +0200 Subject: [PATCH 6/8] Update release notes. --- CHANGELOG.md | 3 +++ WooCommerce/Resources/release_notes.txt | 11 +---------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22e02eda224..e6b36ca8920 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ +## 20.6 +In this update, we’ve improved the dashboard with a cleaner, 2-column layout on larger screens. Jetpack setup is now smoother, and campaigns cancel instantly with immediate feedback options. Creating product categories is faster with an auto-opening keyboard, and your phone stays active during card reader updates for seamless transactions. + ## 20.5 In this update, we've added a handy reminder feature to help you continue abandoned campaign creation and improved how notifications open directly to campaign creation in Blaze. We’ve also fixed formatting issues for discount and cash payments when device and store currency settings differ. Enjoy a smoother experience managing your store on the go! diff --git a/WooCommerce/Resources/release_notes.txt b/WooCommerce/Resources/release_notes.txt index 49c1076ee7b..2266a40c008 100644 --- a/WooCommerce/Resources/release_notes.txt +++ b/WooCommerce/Resources/release_notes.txt @@ -1,10 +1 @@ -- [*] Dashboard: Cards are now displayed in 2 columns on large screen sizes. [https://github.com/woocommerce/woocommerce-ios/pull/13983] -- [*] Jetpack setup: fixed issue checking site info after activating Jetpack for sites with Jetpack connection package. [https://github.com/woocommerce/woocommerce-ios/pull/13993] -- [*] Blaze: Campaign status is now updated immediately after being canceled. [https://github.com/woocommerce/woocommerce-ios/pull/13992] -- [*] Blaze: Show feedback banner and survey for user feedback after campaign creation. [https://github.com/woocommerce/woocommerce-ios/pull/14040] -- [*] Now the keyboard will be open automatically when creating a new Product Category. [https://github.com/woocommerce/woocommerce-ios/pull/14031] -- [internal] Logging for app storage size added in Core Data crash logs [https://github.com/woocommerce/woocommerce-ios/pull/14008] -- [*] Payments: Prevent phone from sleeping during card reader updates [https://github.com/woocommerce/woocommerce-ios/pull/14021] -- [internal] Fixed concurrency issue with Blaze local notification scheduler. [https://github.com/woocommerce/woocommerce-ios/pull/14012] -- [internal] We added ability to mark and filter favorite products. This feature isn't released yet. But please smoke test product filtering work as expected. [https://github.com/woocommerce/woocommerce-ios/pull/14001] - +In this update, we’ve improved the dashboard with a cleaner, 2-column layout on larger screens. Jetpack setup is now smoother, and campaigns cancel instantly with immediate feedback options. Creating product categories is faster with an auto-opening keyboard, and your phone stays active during card reader updates for seamless transactions. From 293a8c261596eb7bc69f91aa368e7a328dd6756b Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Fri, 27 Sep 2024 05:11:25 -0700 Subject: [PATCH 7/8] Update metadata strings --- WooCommerce/Resources/AppStoreStrings.pot | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/WooCommerce/Resources/AppStoreStrings.pot b/WooCommerce/Resources/AppStoreStrings.pot index 05fa03ff0ed..5f06e578e60 100644 --- a/WooCommerce/Resources/AppStoreStrings.pot +++ b/WooCommerce/Resources/AppStoreStrings.pot @@ -61,11 +61,9 @@ msgctxt "app_store_promo_text" msgid "Run your store from anywhere" msgstr "" -msgctxt "v20.5-whats-new" +msgctxt "v20.6-whats-new" msgid "" -"In this update, we've added a handy reminder feature to help you continue abandoned campaign creation and improved how notifications open directly to campaign creation in Blaze. We’ve also fixed formatting issues for discount and cash payments when device and store currency settings differ. Enjoy a smoother experience managing your store on the go!\n" -"\n" -"\n" +"In this update, we’ve improved the dashboard with a cleaner, 2-column layout on larger screens. Jetpack setup is now smoother, and campaigns cancel instantly with immediate feedback options. Creating product categories is faster with an auto-opening keyboard, and your phone stays active during card reader updates for seamless transactions.\n" msgstr "" #. translators: This is a promo message that will be attached on top of a screenshot in the App Store. From 4e872bb70c3f95bf379009972ad5a9683b213341 Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Fri, 27 Sep 2024 05:12:58 -0700 Subject: [PATCH 8/8] Freeze strings for localization --- .../Resources/en.lproj/Localizable.strings | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/WooCommerce/Resources/en.lproj/Localizable.strings b/WooCommerce/Resources/en.lproj/Localizable.strings index 1533df59811..f27c60c0fa4 100644 --- a/WooCommerce/Resources/en.lproj/Localizable.strings +++ b/WooCommerce/Resources/en.lproj/Localizable.strings @@ -1414,6 +1414,9 @@ which should be translated separately and considered part of this sentence. */ /* The total amount for weekly spend on the Blaze budget setting screen. Reads like: $35 USD weekly spend */ "blazeBudgetSettingViewModel.weeklySpendAmount" = "%1$@ weekly spend"; +/* Question in the feedback banner after a Blaze campaign is successfully created */ +"blazeCampaignCreationCoordinator.feedbackQuestion" = "How was the experience with Blaze?"; + /* Button to dismiss the alert when attempting to start Blaze campaign creation flow without any product in the store */ "blazeCampaignCreationCoordinator.NoProductAlert.cancel" = "Cancel"; @@ -4470,6 +4473,9 @@ which should be translated separately and considered part of this sentence. */ /* Option to select the Fastmail app when logging in with magic links */ "Fastmail" = "Fastmail"; +/* Description of the filter used to show only favorite products. */ +"favoriteProductsFilter.favoriteProducts" = "Favorite Products"; + /* Featured Product switch in Product Catalog Visibility */ "Featured Product" = "Featured Product"; @@ -4528,6 +4534,9 @@ which should be translated separately and considered part of this sentence. */ /* Row title for filtering orders by Product. */ "filterOrderListViewModel.OrderListFilter.rowTitleProduct" = "Product"; +/* Row title for filtering products by favorite products. */ +"filterProductListViewModel.favoriteProduct" = "Favorite Products"; + /* Filters button text on header bar on top of order list Navigation bar title format for filtering a list of products without filters applied. */ "Filters" = "Filters"; @@ -7527,6 +7536,13 @@ which should be translated separately and considered part of this sentence. */ /* Title of the button used on a card payment error from the Point of Sale Checkout to go back and try another payment method. */ "pointOfSale.cardPresent.paymentErrorNonRetryable.tryAnotherPaymentMethod.button.title" = "Try another payment method"; +/* Button to come back to order editing when a card payment fails. Presented to users after payment intention creation fails on the Point of Sale Checkout + Button to try to collect a payment again. Presented to users after collecting a payment intention creation fails on the Point of Sale Checkout */ +"pointOfSale.cardPresent.paymentIntentCreationError.backToCheckout.button.title" = "Try payment again"; + +/* Error message. Presented to users after payment intent creation fails on the Point of Sale Checkout */ +"pointOfSale.cardPresent.paymentIntentCreationError.title" = "Payment preparation error"; + /* Indicates to wait while payment is processing. Presented to users when payment collection starts */ "pointOfSale.cardPresent.paymentProcessing.message" = "Please wait..."; @@ -7761,6 +7777,9 @@ which should be translated separately and considered part of this sentence. */ /* Title of the alert presented when payment capture may have failed. This draws extra attention to the issue. */ "pointOfSale.cardPresentPayment.paymentCaptureError.order.may.have.failed.title" = "This order may have failed"; +/* The title of the floating button to indicate that the reader is not ready for another connection, usually because a connection has just been cancelled */ +"pointOfSale.floatingButtons.cancellingConnection.pleaseWait.title" = "Please wait"; + /* The title of the menu button to disconnect a connected card reader, as confirmation. */ "pointOfSale.floatingButtons.disconnectCardReader.button.title" = "Disconnect Reader"; @@ -8312,6 +8331,12 @@ which should be translated separately and considered part of this sentence. */ /* Title message indicating that images are unavailable because the site is private. */ "productFormTableViewDataSource.wpComStoreNotPublicTitle" = "The images are unavailable because your site is marked Private. You can change this by switching to Coming Soon mode."; +/* Mark favorite button title in Edit Product More Options Action Sheet */ +"productFormViewController.markAsFavorite" = "Mark as favorite"; + +/* Remove favorite button title in Edit Product More Options Action Sheet */ +"productFormViewController.removeAsFavorite" = "Remove from favorite"; + /* Button to dismiss the product image picker screen */ "productImagePickerView.cancel" = "Cancel"; @@ -12146,9 +12171,51 @@ which should be translated separately and considered part of this sentence. */ Title of the webview for WCPay setup from onboarding. */ "WooPayments" = "WooPayments"; +/* Button to select a package to use for a shipment in the shipping label creation flow. */ +"wooShipping.createLabel.addPackage.button" = "Select a Package"; + /* Title of the button to dismiss the shipping label creation screen */ "wooShipping.createLabel.cancelButton" = "Cancel"; +/* Label for section in shipping label creation to declare when a package contains hazardous materials. */ +"wooShipping.createLabel.hazmatLabel" = "Are you shipping dangerous goods or hazardous materials?"; + +/* Message in the shipping rate section during shipping label creation, when there is no selected package. */ +"wooShipping.createLabel.shippingRate.placeholderMessage" = "Enter your package's dimensions or pick a carrier package option to see the available shipping rates."; + +/* Call to action in the shipping rate section during shipping label creation, when there is no selected package. */ +"wooShipping.createLabel.shippingRate.placeholderTitle" = "Select a package to get shipping rates"; + +/* Label for the toggle to mark the order as complete on the shipping label creation screen */ +"wooShipping.createLabels.bottomSheet.markComplete" = "Mark this order complete and notify the customer"; + +/* Header for order details section on the shipping label creation screen */ +"wooShipping.createLabels.bottomSheet.orderDetails" = "Order details"; + +/* Label for the menu to select a paper size on the shipping label creation screen */ +"wooShipping.createLabels.bottomSheet.paperSize" = "Choose label paper size"; + +/* Label for button to purchase the shipping label on the shipping label creation screen */ +"wooShipping.createLabels.bottomSheet.purchase" = "Purchase Label"; + +/* Label for address where the shipment is shipped from on the shipping label creation screen */ +"wooShipping.createLabels.bottomSheet.shipFrom" = "Ship from"; + +/* Header for shipment costs section on the shipping label creation screen */ +"wooShipping.createLabels.bottomSheet.shipmentCosts" = "Shipment costs"; + +/* Label for address where the shipment is shipped to on the shipping label creation screen */ +"wooShipping.createLabels.bottomSheet.shipTo" = "Ship to"; + +/* Label for row showing the subtotal for shipment costs on the shipping label creation screen */ +"wooShipping.createLabels.bottomSheet.subtotal" = "Subtotal"; + +/* Label on the bottom sheet that can be expanded to show shipment detailson the shipping label creation screen */ +"wooShipping.createLabels.bottomSheet.title" = "Shipment details"; + +/* Label for row showing the total for shipment costs on the shipping label creation screen */ +"wooShipping.createLabels.bottomSheet.total" = "Total"; + /* Total number of items to ship during shipping label creation. Reads like: '3 items' */ "wooShipping.createLabels.items.count" = "%1$@ items";