Merge pull request #8826 from woocommerce/merge/12.2-code-freeze-into-trunk

Merge 12.2 code freeze into trunk

Author: spencertransier

Gemfile.lock

@@ -164,7 +164,7 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-appcenter (1.11.1)
-    fastlane-plugin-sentry (1.14.0)
+    fastlane-plugin-sentry (1.15.0)
       os (~> 1.1, >= 1.1.4)
     fastlane-plugin-wpmreleasetoolkit (6.3.0)
       activesupport (~> 5)

Podfile

@@ -27,15 +27,15 @@ def aztec
 end
 
 def tracks
-  pod 'Automattic-Tracks-iOS', '~> 2.0.0-beta.1'
+  pod 'Automattic-Tracks-iOS', '~> 2.0.0'
   # pod 'Automattic-Tracks-iOS', :git => 'https://github.com/Automattic/Automattic-Tracks-iOS.git', :branch => 'trunk'
   # pod 'Automattic-Tracks-iOS', :git => 'https://github.com/Automattic/Automattic-Tracks-iOS.git', :commit => ''
   # pod 'Automattic-Tracks-iOS', :path => '../Automattic-Tracks-iOS'
 end
 
 def wordpress_kit
   # To allow pod to pick up beta versions use -beta. E.g., 1.1.7-beta.1
-  pod 'WordPressKit', '~> 6.0-beta'
+  pod 'WordPressKit', '~> 6.0'
   # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => ''
 end
 

Podfile.lock

@@ -6,7 +6,7 @@ PODS:
   - AppAuth/Core (1.6.0)
   - AppAuth/ExternalUserAgent (1.6.0):
     - AppAuth/Core
-  - Automattic-Tracks-iOS (2.0.0-beta.1):
+  - Automattic-Tracks-iOS (2.0.0):
     - Sentry (~> 7.25)
     - Sodium (>= 0.9.1)
     - UIDeviceIdentifier (~> 2.0)
@@ -75,7 +75,7 @@ PODS:
 
 DEPENDENCIES:
   - Alamofire (~> 4.8)
-  - Automattic-Tracks-iOS (~> 2.0.0-beta.1)
+  - Automattic-Tracks-iOS (~> 2.0.0)
   - CocoaLumberjack (~> 3.7.4)
   - CocoaLumberjack/Swift (~> 3.7.4)
   - Gridicons (~> 1.2.0)
@@ -85,7 +85,7 @@ DEPENDENCIES:
   - StripeTerminal (~> 2.14)
   - WordPress-Editor-iOS (~> 1.11.0)
   - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, branch `trunk`)
-  - WordPressKit (~> 6.0-beta)
+  - WordPressKit (~> 6.0)
   - WordPressShared (~> 2.0)
   - WordPressUI (~> 1.12.5)
   - Wormholy (~> 1.6.5)
@@ -144,7 +144,7 @@ CHECKOUT OPTIONS:
 SPEC CHECKSUMS:
   Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844
   AppAuth: 8fca6b5563a5baef2c04bee27538025e4ceb2add
-  Automattic-Tracks-iOS: 20220d63a075787a890513ae56214a17a160ec43
+  Automattic-Tracks-iOS: 8b065227e3fb341d19bd502ff748fcffb8199a1d
   CocoaLumberjack: 543c79c114dadc3b1aba95641d8738b06b05b646
   GoogleSignIn: fd381840dbe7c1137aa6dc30849a5c3e070c034a
   Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d
@@ -178,6 +178,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
 
-PODFILE CHECKSUM: edd03ed08aa5c68531f27bdd04f1c0b846f98749
+PODFILE CHECKSUM: a09e3ee200fbf92e30759055ee99fd73f879837d
 
 COCOAPODS: 1.11.3

RELEASE-NOTES.txt

@@ -1,5 +1,9 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+12.3
+-----
+
+
 12.2
 -----
 - [*] Fix: Adding a new attribute will auto-capitalize the first letter for each word in the attribute name. [https://github.com/woocommerce/woocommerce-ios/pull/8772]

WooCommerce/Resources/AppStoreStrings.pot

@@ -57,9 +57,9 @@ msgctxt "app_store_promo_text"
 msgid "Run your store from anywhere"
 msgstr ""
 
-msgctxt "v12.1-whats-new"
+msgctxt "v12.2-whats-new"
 msgid ""
-"This release includes a few bug fixes and improvements to products and in person payments. Please continue to send us feedback – we are listening!\n"
+"We’ve made a few enhancements to manage your business. It’s now easier to set up your store when logging in. Adding attributes from the app just became a whole lot easier! Keep your feedback coming!\n"
 msgstr ""
 
 #. translators: This is a promo message that will be attached on top of a screenshot in the App Store.

WooCommerce/Resources/en.lproj/Localizable.strings

@@ -32,6 +32,9 @@
 /* Labels an order note. The user know it's visible to the customer. Reads like 05:30 PM - username (To Customer) */
 "%1$@ - %2$@ (To Customer)" = "%1$@ - %2$@ (To Customer)";
 
+/* The original price of a domain. %1$@ is the price per term. %2$@ is the duration of each pricing term, usually year. */
+"%1$@ / %2$@" = "%1$@ / %2$@";
+
 /* A label prompting users to learn more about card readers"
 %1$@ is a placeholder that always replaced with \"Learn more\" string,
 which should be translated separately and considered part of this sentence. */
@@ -410,7 +413,7 @@ which should be translated separately and considered part of this sentence. */
 "Add Downloadable File" = "Add Downloadable File";
 
 /* Footer of text field section in Add Attribute Options screen */
-"Add each option and press enter" = "Add each option and press enter";
+"Add each option and press return" = "Add each option and press return";
 
 /* Button in the CTA View for installing WCShip extension */
 "Add Extension To Store" = "Add Extension To Store";
@@ -515,7 +518,8 @@ which should be translated separately and considered part of this sentence. */
 /* Text field address in Shipping Label Address Validation */
 "Address" = "Address";
 
-/* Details section title in the Edit Address Form */
+/* Address section title in the domain contact info form.
+   Details section title in the Edit Address Form */
 "ADDRESS" = "ADDRESS";
 
 /* Text field address 1 in Edit Address Form */
@@ -761,9 +765,6 @@ which should be translated separately and considered part of this sentence. */
 /* Reads as 'Application name'. Part of the mandatory data in receipts */
 "Application Name" = "Application Name";
 
-/* Message to display when the constructed admin or login URL for the logged-in site is not accessible */
-"Application password cannot be generated due to a custom login or admin URL on your site." = "Application password cannot be generated due to a custom login or admin URL on your site.";
-
 /* Widget description, displayed when selecting which widget to add */
 "appLinkWidget.description" = "Quickly Launch WooCommerce";
 
@@ -815,6 +816,9 @@ which should be translated separately and considered part of this sentence. */
 /* Alert message to confirm a user meant to log out. */
 "Are you sure you want to log out of the account %@?" = "Are you sure you want to log out of the account %@?";
 
+/* Alert message to confirm a user meant to log out. */
+"Are you sure you want to log out of your account?" = "Are you sure you want to log out of your account?";
+
 /* Alert message to confirm a user meant to mark all reviews as read. */
 "Are you sure you want to mark all reviews as read?" = "Are you sure you want to mark all reviews as read?";
 
@@ -1397,7 +1401,7 @@ which should be translated separately and considered part of this sentence. */
 /* Navigation title on the shipping label country selector screen */
 "Choose a Country" = "Choose a Country";
 
-/* Title of the domain selector. */
+/* Title of the domain selector in the store creation flow. */
 "Choose a domain" = "Choose a domain";
 
 /* Title of the password field on the account creation form. */
@@ -1437,6 +1441,12 @@ which should be translated separately and considered part of this sentence. */
 /* Industry option in the store creation category question. */
 "Civic, Fraternal, Or Social Associations" = "Civic, Fraternal, Or Social Associations";
 
+/* Title of button to redeem domain credit in the domain credit banner in domain settings. */
+"Claim Domain" = "Claim Domain";
+
+/* Title of the domain credit banner in domain settings. */
+"Claim your free domain" = "Claim your free domain";
+
 /* Button title for clearing all filters for the list. */
 "Clear all" = "Clear all";
 
@@ -1555,6 +1565,9 @@ which should be translated separately and considered part of this sentence. */
 /* Title displayed if there are no inbox notes in the inbox screen. */
 "Congrats, you’ve read everything!" = "Congrats, you’ve read everything!";
 
+/* Title of the domain purchase success screen. */
+"Congratulations on your purchase" = "Congratulations on your purchase";
+
 /* Settings > Manage Card Reader > Connected Reader > A prompt to update a reader running older software */
 "Congratulations! Your reader is running the latest software" = "Congratulations! Your reader is running the latest software";
 
@@ -2223,12 +2236,14 @@ which should be translated separately and considered part of this sentence. */
    Done navigation button under the Package Selected screen in Shipping Label flow
    Edit product categories screen - button title to apply categories selection
    Edit product downloadable files screen - button title to apply changes to downloadable files
+   Text for the done button in the domain contact info form.
    Text for the done button in the Edit Address Form
    Text for the done button in the edit customer provided note screen
    Text for the done button in the Fee Details screen
    Text for the done button in the Shipping Line Details screen
    The button title to indicate that the user has finished updating their store's address and isready to close the webview. This also tries to connect to the reader again.
-   Title for the Done button on a WebView modal sheet */
+   Title for the Done button on a WebView modal sheet
+   Title of the button to finish the domain purchase success screen. */
 "Done" = "Done";
 
 /* Link title to see instructions for printing a shipping label on an iOS device */
@@ -2893,6 +2908,9 @@ which should be translated separately and considered part of this sentence. */
 /* Industry group option in the store creation category question. */
 "Food And Drink" = "Food And Drink";
 
+/* Title in the error notice when a validation error occurs after submitting domain contact info. */
+"Form Validation Error" = "Form Validation Error";
+
 /* Industry option in the store creation category question. */
 "Fortune Tellers" = "Fortune Tellers";
 
@@ -2902,6 +2920,9 @@ which should be translated separately and considered part of this sentence. */
 /* Country option for a site address. */
 "France" = "France";
 
+/* Label shown for domains that are free for the first year with available domain credit. */
+"Free for the first year" = "Free for the first year";
+
 /* Industry option in the store creation category question. */
 "Freight Forwarders" = "Freight Forwarders";
 
@@ -5458,6 +5479,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Button in the view for adding or editing a coupon code. */
 "Regenerate Coupon Code" = "Regenerate Coupon Code";
 
+/* Title of the domain contact info form. */
+"Register domain" = "Register domain";
+
 /* Describes a domain that was registered with WordPress.com */
 "Registered Domain" = "Registered Domain";
 
@@ -5784,6 +5808,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Accessibility label for the Search Coupons button */
 "Search coupons" = "Search coupons";
 
+/* Title of the domain selector in domain settings. */
+"Search domains" = "Search domains";
+
 /* Title of the button on the domain settings screen to search for a domain. */
 "Search for a Domain" = "Search for a Domain";
 
@@ -6226,6 +6253,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Error message when at least an address on the Coupon Allowed Emails screen is not valid. */
 "Some email address is not valid." = "Some email address is not valid.";
 
+/* Message in the error notice when an unknown validation error occurs after submitting domain contact info. */
+"Some unexpected error with the validation. Please check the fields and try again." = "Some unexpected error with the validation. Please check the fields and try again.";
+
 /* Indicates the reviewer does not have a name. It reads { Someone left a review} */
 "Someone" = "Someone";
 
@@ -6893,6 +6923,15 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Message at the bottom of Review Order screen to inform of emailing the customer upon completing order */
 "The customer will receive an email once order is completed" = "The customer will receive an email once order is completed";
 
+/* Subtitle of the domain selector in domain settings. %1$@ is the free domain of the site from WordPress.com. */
+"The domain purchased will redirect users to **%1$@**" = "The domain purchased will redirect users to **%1$@**";
+
+/* Subtitle of the domain selector in domain settings when a free staging domain is unavailable. */
+"The domain purchased will redirect users to the current staging domain" = "The domain purchased will redirect users to the current staging domain";
+
+/* Footnote about the domain credit banner in domain settings. */
+"The domain purchased will redirect users to your primary address." = "The domain purchased will redirect users to your primary address.";
+
 /* Label within the modal dialog that appears when connecting to a built in card reader */
 "The first time you connect, you may be prompted to accept Apple's Terms of Service." = "The first time you connect, you may be prompted to accept Apple's Terms of Service.";
 
@@ -6959,6 +6998,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Error message when a request times out. */
 "The request timed out - please try again" = "The request timed out - please try again";
 
+/* Message to display when the generating application password fails with unauthorized error */
+"The request to generate application password is not authorized." = "The request to generate application password is not authorized.";
+
 /* Bulk price update error message, when the sale price is added but the regular price is not
    Product price error notice message, when the sale price is added but the regular price is not */
 "The sale price can't be added without the regular price." = "The sale price can't be added without the regular price.";
@@ -7131,7 +7173,7 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Footer text in Product Slug screen */
 "This is the URL-friendly version of the product title" = "This is the URL-friendly version of the product title";
 
-/* Subtitle of the domain selector. */
+/* Subtitle of the domain selector in the store creation flow. */
 "This is where people will find you on the Internet. You can add another domain later." = "This is where people will find you on the Internet. You can add another domain later.";
 
 /* Message in action sheet when an order item is about to be moved on Package Details screen of Shipping Label flow.The package name reads like: Package 1: Custom Envelope. */
@@ -8265,6 +8307,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Info notice at the bottom of the product add-ons screen */
 "You can edit product add-ons in the web dashboard." = "You can edit product add-ons in the web dashboard.";
 
+/* Instructions of the domain purchase success screen. */
+"You can find the domain settings in menu > settings" = "You can find the domain settings in menu > settings";
+
 /* Subtitle displayed in promotional screens shown during the login flow. */
 "You can manage quickly and easily." = "You can manage quickly and easily.";
 
@@ -8293,6 +8338,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Message to be displayed when the user encounters a permission error during Jetpack setup */
 "You don't have permission to manage plugins on this store." = "You don't have permission to manage plugins on this store.";
 
+/* Subtitle of the domain credit banner in domain settings. */
+"You have a free one-year domain registration included with your plan." = "You have a free one-year domain registration included with your plan.";
+
 /* Title for the mocked order notification needed for the AppStore listing screenshot */
 "You have a new order! 🎉" = "You have a new order! 🎉";
 
@@ -8360,6 +8408,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Body text of alert helping users understand their site address */
 "Your site address appears in the bar at the top of the screen when you visit your site in Safari." = "Your site address appears in the bar at the top of the screen when you visit your site in Safari.";
 
+/* Subtitle of the domain purchase success screen. */
+"Your site address is being set up. It may take up 30 minutes for your domain to start working." = "Your site address is being set up. It may take up 30 minutes for your domain to start working.";
+
 /* Header text of the site's domain list in domain settings. */
 "Your site domains" = "Your site domains";
 

WooCommerce/Resources/release_notes.txt

@@ -1 +1 @@
-This release includes a few bug fixes and improvements to products and in person payments. Please continue to send us feedback – we are listening!
+We’ve made a few enhancements to manage your business. It’s now easier to set up your store when logging in. Adding attributes from the app just became a whole lot easier! Keep your feedback coming!

config/Version.Public.xcconfig

@@ -1,7 +1,7 @@
-VERSION_SHORT=12.1
+VERSION_SHORT=12.2
 
 // Public long version example: VERSION_LONG=1.2.0.0
-VERSION_LONG=12.1.0.1
+VERSION_LONG=12.2.0.0
 
 // Re-map our custom version values (used by release-toolkit) to the Xcode ones
 MARKETING_VERSION=$VERSION_SHORT

fastlane/Deliverfile

@@ -15,7 +15,7 @@ app_identifier 'com.automattic.woocommerce'
 screenshots_path './fastlane/promo_screenshots/'
 
 # Make sure to update these keys for a new version
-app_version "12.1"
+app_version "12.2"
 
 team_id '299112'