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 19.3 code freeze to trunk #13202

Merged
merged 9 commits into from
Jun 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<!--
Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
-->
## 19.3
Discover the latest updates to WooCommerce mobile app! We’ve enhanced Blaze Campaigns with date range checks to prevent validation errors, improved UX for a more intuitive interface, and fixed multiple issues with card reader connections. Plus, we’ve refined error handling during payment collection for a smoother experience. Update now for a better WooCommerce experience!

## 19.2
Enhance your WooCommerce experience with our latest update! Now you can pick videos from your local library for downloadable files and view private tags on the product list tab. We've fixed the customer list loading issue in order creation and improved dashboard stability. Plus, bookable products are now disabled in order forms. Enjoy smoother payments with added log insights. Update today!

Expand Down
4 changes: 4 additions & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
*** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]

19.4
-----


19.3
-----
- [*] Blaze Campaigns: Added date range checks to ensure campaign start dates are within 60 days from today to avoid validation errors. [https://github.com/woocommerce/woocommerce-ios/pull/13124]
Expand Down
4 changes: 2 additions & 2 deletions WooCommerce/Resources/AppStoreStrings.pot
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ msgctxt "app_store_promo_text"
msgid "Run your store from anywhere"
msgstr ""

msgctxt "v19.2-whats-new"
msgctxt "v19.3-whats-new"
msgid ""
"Enhance your WooCommerce experience with our latest update! Now you can pick videos from your local library for downloadable files and view private tags on the product list tab. We've fixed the customer list loading issue in order creation and improved dashboard stability. Plus, bookable products are now disabled in order forms. Enjoy smoother payments with added log insights. Update today!\n"
"Discover the latest updates to WooCommerce mobile app! We’ve enhanced Blaze Campaigns with date range checks to prevent validation errors, improved UX for a more intuitive interface, and fixed multiple issues with card reader connections. Plus, we’ve refined error handling during payment collection for a smoother experience. Update now for a better WooCommerce experience!\n"
msgstr ""

#. translators: This is a promo message that will be attached on top of a screenshot in the App Store.
Expand Down
89 changes: 64 additions & 25 deletions WooCommerce/Resources/en.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,6 @@ which should be translated separately and considered part of this sentence. */

/* Application's Active State
Display label for the subscription status type
Status name of an approved Blaze campaign
Status of coupons that are active */
"Active" = "Active";

Expand Down Expand Up @@ -656,16 +655,16 @@ which should be translated separately and considered part of this sentence. */
"addCustomAmountView.chargeTaxesToggle.title" = "Charge Taxes";

/* Description of the option to add new product with AI assistance */
"addProductWithAIActionSheet.aiDescription" = "Quickly generate details for you";
"addProductWithAIActionSheet.createProductWithAI.aiDescription" = "Let us generate product details for you";

/* Title of the option to add new product with AI assistance */
"addProductWithAIActionSheet.aiTitle" = "Create a product with AI";
"addProductWithAIActionSheet.createProductWithAI.aiTitle" = "Create a product with AI";

/* Markdown content learn more link on the product creation action sheet. Please translate the words while keeping the markdown format and URL. */
"addProductWithAIActionSheet.learnMore" = "[Learn more.](https://automattic.com/ai-guidelines/)";
"addProductWithAIActionSheet.createProductWithAI.learnMore" = "[Learn more.](https://automattic.com/ai-guidelines/)";

/* Label to indicate AI-generated content on the product creation action sheet. */
"addProductWithAIActionSheet.legalText" = "Powered by AI.";
"addProductWithAIActionSheet.createProductWithAI.legalText" = "Powered by AI.";

/* Description of the option to add new product manually */
"addProductWithAIActionSheet.manualDescription" = "Add a product and the details manually";
Expand Down Expand Up @@ -1503,6 +1502,9 @@ which should be translated separately and considered part of this sentence. */
/* Button on the error alert displayed on the Blaze campaign creation screen */
"blazeCampaignCreationForm.aiSuggestionsErrorAlert.retry" = "Retry";

/* Section title on the Blaze campaign creation screen */
"blazeCampaignCreationForm.audience" = "Audience";

/* Title of the Budget field on the Blaze campaign creation screen */
"blazeCampaignCreationForm.budget" = "Budget";

Expand Down Expand Up @@ -1545,6 +1547,9 @@ which should be translated separately and considered part of this sentence. */
/* Button to shop on the Blaze ad preview */
"blazeCampaignCreationForm.shopNow" = "Shop Now";

/* Suggested by AI title in the Blaze Campaign Creation Form. */
"blazeCampaignCreationForm.suggestedByAI" = "Suggested by AI";

/* Title of the Blaze campaign creation screen */
"blazeCampaignCreationForm.title" = "Preview";

Expand Down Expand Up @@ -1584,6 +1589,27 @@ which should be translated separately and considered part of this sentence. */
/* Subtitle of the Blaze campaign view. */
"blazeCampaignDashboardView.subtitle" = "Increase visibility and get your products sold quickly.";

/* Status name of an approved Blaze campaign */
"blazeCampaignListItem.status.active" = "Active";

/* Status name of a canceled Blaze campaign */
"blazeCampaignListItem.status.canceled" = "Canceled";

/* Status name of a completed Blaze campaign */
"blazeCampaignListItem.status.completed" = "Completed";

/* Status name of a pending Blaze campaign */
"blazeCampaignListItem.status.inModeration" = "In Moderation";

/* Status name of a rejected Blaze campaign */
"blazeCampaignListItem.status.rejected" = "Rejected";

/* Status name of a scheduled Blaze campaign */
"blazeCampaignListItem.status.scheduled" = "Scheduled";

/* Status name of a Blaze campaign without specified state */
"blazeCampaignListItem.status.unknown" = "Unknown";

/* Button for adding a payment method on the Payment screen in the Blaze campaign creation flow */
"blazeConfirmPaymentView.addPaymentMethod" = "Add a payment method";

Expand Down Expand Up @@ -1651,7 +1677,7 @@ which should be translated separately and considered part of this sentence. */
"blazeCreateCampaignIntroView.learnHowBlazeWorks" = "Learn how Blaze works";

/* Subtitle for the quick start big impact feature */
"blazeCreateCampaignIntroView.quickStart.subtitle" = "Launch ads in minutes – no experience or big budget needed, starting at just $5 USD.";
"blazeCreateCampaignIntroView.quickStart.subtitle" = "Launch ads in minutes – no experience or big budget needed, starting at just $5 USD daily.";

/* Title for the quick start big impact feature */
"blazeCreateCampaignIntroView.quickStart.title" = "Quick start, big impact";
Expand Down Expand Up @@ -2172,9 +2198,6 @@ which should be translated separately and considered part of this sentence. */
Title of the secondary button displayed when purchasing a plan fails, so the merchant can exit the flow. */
"Cancel Upgrade" = "Cancel Upgrade";

/* Status name of a canceled Blaze campaign */
"Canceled" = "Canceled";

/* Display label for cancelled order status.
Display label for the subscription status type */
"Cancelled" = "Cancelled";
Expand Down Expand Up @@ -2594,6 +2617,9 @@ which should be translated separately and considered part of this sentence. */
/* Description of the 'Payments' screen - used for spotlight indexing on iOS. */
"Collect payments, setup Tap to Pay, order card readers and more." = "Collect payments, setup Tap to Pay, order card readers and more.";

/* Error message when collecting an In-Person Payment and the order total has changed remotely. */
"collectOrderPaymentUseCase.error.message.orderTotalChanged" = "Order total has changed since the beginning of payment. Please go back and check the order is correct, then try the payment again.";

/* Country option for a site address. */
"Colombia" = "Colombia";

Expand Down Expand Up @@ -4535,9 +4561,6 @@ which should be translated separately and considered part of this sentence. */
/* Button to set up an in-person payments plugin after activating it */
"Finish Setup in Store Admin" = "Finish Setup in Store Admin";

/* Status name of a completed Blaze campaign */
"Finished" = "Finished";

/* Country option for a site address. */
"Finland" = "Finland";

Expand Down Expand Up @@ -7117,8 +7140,7 @@ which should be translated separately and considered part of this sentence. */

/* Display label for pending order status.
Display label for the review's pending status
Display label for the subscription status type
Status name of an active Blaze campaign */
Display label for the subscription status type */
"Pending" = "Pending";

/* Display label for the subscription status type */
Expand Down Expand Up @@ -7524,6 +7546,18 @@ which should be translated separately and considered part of this sentence. */
/* Title label for modal dialog that appears when connecting to a card reader */
"pointOfSale.cardPresentPayment.alert.connectingToReader.title" = "Connecting to reader";

/* Button to allow the user to close the modal without connecting. */
"pointOfSale.cardPresentPayment.alert.foundMultipleReaders.cancel.button.title" = "Cancel";

/* Button in a cell to allow the user to connect to that reader for that cell */
"pointOfSale.cardPresentPayment.alert.foundMultipleReaders.connect.button.title" = "Connect";

/* Title of a modal presenting a list of readers to choose from. */
"pointOfSale.cardPresentPayment.alert.foundMultipleReaders.headline" = "Several readers found";

/* Label for a cell informing the user that reader scanning is ongoing. */
"pointOfSale.cardPresentPayment.alert.foundMultipleReaders.scanning.label" = "Scanning for readers";

/* Label for a button that when tapped, cancels the process of connecting to a card reader */
"pointOfSale.cardPresentPayment.alert.foundReader.cancel.button.title" = "Cancel";

Expand Down Expand Up @@ -7849,6 +7883,21 @@ which should be translated separately and considered part of this sentence. */
/* Error message when the scanner cannot find a matching product. %@ is the SKU code. */
"Product with SKU \"%@\" not found." = "Product with SKU \"%@\" not found.";

/* Continue button on the starting info screen. */
"productCreationAIStartingInfoView.continueText" = "Continue";

/* Placeholder text on the product features field */
"productCreationAIStartingInfoView.placeholder" = "For example: Black cotton t-shirt, soft fabric, durable stitching, unique design";

/* Upload package photo button on the text field */
"productCreationAIStartingInfoView.readTextFromPhoto" = "Read text from product photo";

/* Subtitle on the starting info screen. */
"productCreationAIStartingInfoView.subtitle" = "Tell us about your product, what it is and what makes it unique, then let the AI work its magic.";

/* Title on the starting info screen. */
"productCreationAIStartingInfoView.title" = "Starting information";

/* Description in Product Creation AI survey confirmation view. */
"productCreationAISurveyConfirmationView.description" = "Got a minute? Help us improve our AI-assisted features with your quick feedback.";

Expand Down Expand Up @@ -8313,9 +8362,6 @@ which should be translated separately and considered part of this sentence. */
/* Format of the regular price on the Price Settings row */
"Regular price: %@" = "Regular price: %@";

/* Status name of a rejected Blaze campaign */
"Rejected" = "Rejected";

/* Alert button text on a feature announcement which gives the user the chance to be reminded of the new feature after a short time
Title of the button shown when the In-Person Payments feedback banner is dismissed. */
"Remind me later" = "Remind me later";
Expand Down Expand Up @@ -8677,9 +8723,6 @@ which should be translated separately and considered part of this sentence. */
/* Title of the cell in Product Price Settings > Schedule sale */
"Schedule sale" = "Schedule sale";

/* Status name of a scheduled Blaze campaign */
"Scheduled" = "Scheduled";

/* Placeholder in the country search field in store creation profiler. */
"Search" = "Search";

Expand Down Expand Up @@ -10967,9 +11010,6 @@ which should be translated separately and considered part of this sentence. */
/* Error message shown during In-Person Payments when the payment gateway is not available. */
"Unable to process payment. We could not connect to the payment system. Please contact support if this error continues." = "Unable to process payment. We could not connect to the payment system. Please contact support if this error continues.";

/* Error message when collecting an In-Person Payment and unable to update the order. */
"Unable to process payment. We could not fetch the latest order details. Please check your network connection and try again." = "Unable to process payment. We could not fetch the latest order details. Please check your network connection and try again.";

/* Error message when collecting an In-Person Payment and unable to update the order. %!$@ will be replaced with further error details. */
"Unable to process payment. We could not fetch the latest order details. Please check your network connection and try again. Underlying error: %1$@" = "Unable to process payment. We could not fetch the latest order details. Please check your network connection and try again. Underlying error: %1$@";

Expand Down Expand Up @@ -11060,8 +11100,7 @@ which should be translated separately and considered part of this sentence. */
/* Value for the plugin version detail row in settings, when the version is unknown. This is in place of the current version number. */
"unknown" = "unknown";

/* Status name of a Blaze campaign without specified state
Unknown Application State
/* Unknown Application State
Unknown product name, displayed in a review
Unknown Tag Name */
"Unknown" = "Unknown";
Expand Down
2 changes: 1 addition & 1 deletion WooCommerce/Resources/release_notes.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Enhance your WooCommerce experience with our latest update! Now you can pick videos from your local library for downloadable files and view private tags on the product list tab. We've fixed the customer list loading issue in order creation and improved dashboard stability. Plus, bookable products are now disabled in order forms. Enjoy smoother payments with added log insights. Update today!
Discover the latest updates to WooCommerce mobile app! We’ve enhanced Blaze Campaigns with date range checks to prevent validation errors, improved UX for a more intuitive interface, and fixed multiple issues with card reader connections. Plus, we’ve refined error handling during payment collection for a smoother experience. Update now for a better WooCommerce experience!
4 changes: 2 additions & 2 deletions config/Version.Public.xcconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CURRENT_PROJECT_VERSION = $VERSION_LONG
MARKETING_VERSION = $VERSION_SHORT
VERSION_LONG = 19.2.0.2
VERSION_SHORT = 19.2
VERSION_LONG = 19.3.0.0
VERSION_SHORT = 19.3