diff --git a/fastlane/Fastfile b/fastlane/Fastfile index e2701894742..c86f686b88c 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -90,6 +90,11 @@ GLOTPRESS_APP_STRINGS_PROJECT_URL = 'https://translate.wordpress.com/projects/wo # URL of the GlotPress project containing App Store Connect metadata GLOTPRESS_APP_STORE_METADATA_PROJECT_URL = 'https://translate.wordpress.com/projects/woocommerce/woocommerce-ios/release-notes/' +# Set this to `true` if it's intentional that `fastlane/metadata/en-US/` has some `.txt` files overriding the ones in `fastlane/metadata/default/` +# (i.e. you want the `en-US` metadata copies to be _different_ from the metadata copies used as base and fallback for the translation in other locales) +# Set this to `false` otherwise, so that we prevent the accidental case of forgetting to update the `en-US` metadata copies when updating the `default` +# copies during an ASO update, if it was not the intention for those to differ. +ALLOW_EN_US_METADATA_TO_DIFFER_FROM_DEFAULT_LOCALE = false # List of locales used for the app strings (GlotPress code => `*.lproj` folder name`) # # TODO: Replace with `LocaleHelper` once provided by release toolkit (https://github.com/wordpress-mobile/release-toolkit/pull/296) @@ -1042,11 +1047,13 @@ platform :ios do files_to_commit = [File.join(metadata_directory, '**', '*.txt')] # Ensure that none of the `.txt` files in `en-US` would accidentally override our originals in `default` - target_files.values.map { |h| h[:desc] }.each do |file| - en_file_path = File.join(metadata_directory, 'en-US', file) - if File.exist?(en_file_path) - UI.user_error!("File `#{en_file_path}` would override the same one in `#{metadata_directory}/default`, but `default/` is the source of truth. " \ - + "Delete the `#{en_file_path}` file, ensure the `default/` one has the expected original copy, and try again.") + unless ALLOW_EN_US_METADATA_TO_DIFFER_FROM_DEFAULT_LOCALE + target_files.values.map { |h| h[:desc] }.each do |file| + en_file_path = File.join(metadata_directory, 'en-US', file) + if File.exist?(en_file_path) + UI.user_error!("File `#{en_file_path}` would override the same one in `#{metadata_directory}/default`, but `default/` is the source of truth. " \ + + "Delete the `#{en_file_path}` file, ensure the `default/` one has the expected original copy, and try again.") + end end end diff --git a/fastlane/metadata/default/description.txt b/fastlane/metadata/default/description.txt index 1ef6217e78d..dee5881204c 100644 --- a/fastlane/metadata/default/description.txt +++ b/fastlane/metadata/default/description.txt @@ -7,7 +7,10 @@ Create orders on the fly Once you have some products created, it’s simple. Choose items from your catalog, add shipping, and then fill in customer details to quickly create an order that syncs with your inventory. Take payments in person -Collect physical payments using WooCommerce In-Person Payments and a card reader (available in the US and Canada). Start a new order – or find an existing one that’s pending payment – and collect payment using the card reader or a digital wallet, such as Apple Pay. +Collect physical payments using WooCommerce In-Person Payments and a card reader (available in the US, UK, and Canada), Tap to Pay on iPhone, or a digital wallet, such as Apple Pay. Start a new order — or find an existing one that’s pending payment – then seamlessly accept payment. + +Go from clicks to bricks +Turn any tablet into a powerful point of sale with WooCommerce POS. Search products, scan barcodes, apply coupons, and send email receipts, with all of your online and physical sales synced in real time. Available in the US and UK. Get notified of every sale Now that you’re actively selling, never miss an order or a review. Keep yourself in the loop by enabling real-time alerts – and listen for that addictive “cha-ching” sound that comes with each new sale! diff --git a/fastlane/metadata/default/keywords.txt b/fastlane/metadata/default/keywords.txt index b0bccc893a5..2bf83f6b9ab 100644 --- a/fastlane/metadata/default/keywords.txt +++ b/fastlane/metadata/default/keywords.txt @@ -1 +1 @@ -Woocommerce, woocommerce app, woocommerce mobile, woo app, woocommerce order alert, wordpress, eComm \ No newline at end of file +woo,order,ecommerce,pos,point of sale,wordpress,store,payments,credit,card,shipping,stock,inventory \ No newline at end of file