Skip to content
This repository has been archived by the owner on Feb 23, 2024. It is now read-only.

Mini Cart block - fix translations handling #6153 #6158

Merged
merged 5 commits into from
Apr 1, 2022
Merged

Mini Cart block - fix translations handling #6153 #6158

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
419f2c8
Mini Cart block - fix translations handling #6153
gigitux Mar 29, 2022
b4a4519
Merge branch 'trunk' into fix/6153-mini-cart-i18n
gigitux Mar 29, 2022
a559c8f
Mini Cart block - fix translations handling (#6164)
dinhtungdu Mar 30, 2022
4765958
loads translations for deps
gigitux Mar 30, 2022
cbadbfe
address code review. load translations close to associated scripts
dinhtungdu Mar 31, 2022
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
31 changes: 26 additions & 5 deletions src/BlockTypes/MiniCart.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,11 +260,10 @@ protected function append_script_and_deps_src( $script ) {
return;
}
$this->scripts_to_lazy_load[ $script->handle ] = array(
'src' => $script->src,
'version' => $script->ver,
'before' => $wp_scripts->print_inline_script( $script->handle, 'before', false ),
'after' => $wp_scripts->print_inline_script( $script->handle, 'after', false ),
'translations' => $wp_scripts->print_translations( $script->handle, false ),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking closer, I notice that the $wp_scripts->print_translations() of enqueued scripts cause the JS errors; even we don't echo them, they are still printed.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if related, but I remember being confused by something similar and it was because we hook into pre_load_script_translations to print the translations, which runs no matter if you echo them or not:
https://github.com/woocommerce/woocommerce-gutenberg-products-block/blob/2d0270cc23121f79a5d3f1759a7e7df43f1323a4/woocommerce-gutenberg-products-block.php#L239

Copy link
Member

@dinhtungdu dinhtungdu Mar 30, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're the lifesaver @Aljullu! Thanks so much for the suggestion!

Aljullu marked this conversation as resolved.
Show resolved Hide resolved
'src' => $script->src,
'version' => $script->ver,
'before' => $wp_scripts->print_inline_script( $script->handle, 'before', false ),
'after' => $wp_scripts->print_inline_script( $script->handle, 'after', false ),
);
}

Expand Down Expand Up @@ -442,4 +441,26 @@ protected function get_tax_label() {
protected function get_cart_payload() {
return WC()->api->get_endpoint_data( '/wc/store/cart' );
}

/**
* Register script and style assets for the block type before it is registered.
*
* This registers the scripts; it does not enqueue them.
* The children blocks are register here because this block handles the loading of the frontend scripts.
*/
protected function register_block_type_assets() {
parent::register_block_type_assets();
$blocks = [
'mini-cart-contents-block/filled-cart',
'mini-cart-contents-block/empty-cart',
'mini-cart-contents-block/title',
'mini-cart-contents-block/items',
'mini-cart-contents-block/products-table',
'mini-cart-contents-block/footer',
'mini-cart-contents-block/shopping-button',
];
$chunks = preg_filter( '/$/', '-frontend', $blocks );

$this->register_chunk_translations( $chunks );
}
}