ensure correct language is used during feed generation when retrieving products

Author: petitphp

src/Feed/FeedBuilder/FeedBuilder.php

@@ -124,7 +124,7 @@ abstract public function get_languages(): array;
 	/**
 	 * List current languages.
 	 *
-	 * @return array
+	 * @return string
 	 */
 	abstract public function current_languages(): string;
 

src/Feed/FeedBuilder/FeedBuilderPolylang.php

@@ -31,7 +31,7 @@ public function generate_feed( $lang = null ) {
 			$args     = [
 				'lang' => $language,
 			];
-			$products = Products::get_instance()->get_products( $args );
+			$products = Products::get_instance()->get_products( $args, $lang );
 
 			$this->write_products_feed(
 				self::get_feed_file_path( $language ),
@@ -160,7 +160,8 @@ public function generate_part( string $lang, int $page = 1, int $post_per_page =
 			'return' => 'ids',
 			'lang'   => $lang,
 		);
-		$products = Products::get_instance()->get_products( $args );
+
+		$products = Products::get_instance()->get_products( $args, $lang );
 
 		// If the query doesn't return any products, schedule the combine action and stop the current action.
 		if ( empty( $products ) ) {

src/Feed/FeedBuilder/FeedBuilderWpml.php

@@ -33,7 +33,7 @@ public function generate_feed( $lang = null ) {
 			$original_language = apply_filters( 'wpml_current_language', null );
 			do_action( 'wpml_switch_language', $language );
 
-			$products = Products::get_instance()->get_products();
+			$products = Products::get_instance()->get_products( [], $lang );
 			$this->write_products_feed(
 				self::get_feed_file_path( $language ),
 				$products

src/Products/Products.php

@@ -45,7 +45,15 @@ public function __wakeup() {
 		throw new \Exception( 'Cannot serialize singleton' );
 	}
 
-	public function get_list_args() {
+	/**
+	 * Get default query args to retrieve products for the feed.
+	 *
+	 * @param string $lang The current language associated with the feed. Language slug or empty string if
+	 *                     site isn't multilingual.
+	 *
+	 * @return array
+	 */
+	public function get_list_args( $lang = '' ) {
 		$default_args = array(
 			'limit'        => - 1,
 			'orderby'      => 'date',
@@ -61,7 +69,7 @@ public function get_list_args() {
 		/**
 		 * Export only the categories selected in BO
 		 */
-		$current_language  = ShoppingFeedHelper::current_language();
+		$current_language  = ! empty( $lang ) ? $lang : ShoppingFeedHelper::current_language();
 		$export_categories = ShoppingFeedHelper::get_sf_feed_export_categories( $current_language );
 		if ( ! empty( $export_categories ) ) {
 			$categories = [];
@@ -76,7 +84,7 @@ public function get_list_args() {
 			$default_args['category'] = $categories;
 		}
 
-		return wp_parse_args( ShoppingFeedHelper::wc_products_custom_query_args(), $default_args );
+		return wp_parse_args( ShoppingFeedHelper::wc_products_custom_query_args( $lang ), $default_args );
 	}
 
 	/**
@@ -92,8 +100,17 @@ public function get_list() {
 		}
 	}
 
-	public function get_products( $args = array() ) {
-		$query = new \WC_Product_Query( wp_parse_args( $args, $this->get_list_args() ) );
+	/**
+	 * Get a list of product to include in the feed.
+	 *
+	 * @param array  $args Query args for the `WC_Product_Query`.
+	 * @param string $lang The current language associated with the feed. Language slug or empty string if
+	 *                     site isn't multilingual.
+	 *
+	 * @return array
+	 */
+	public function get_products( $args = array(), $lang = '' ) {
+		$query = new \WC_Product_Query( wp_parse_args( $args, $this->get_list_args( $lang ) ) );
 
 		return $query->get_products();
 	}

src/ShoppingFeedHelper.php

@@ -632,10 +632,21 @@ public static function wc_product_ean( $wc_product = false ) {
 
 	/**
 	 * Add filter for products list query
+	 *
+	 * @param string $lang The current language associated with the feed. Language slug or empty string if
+	 *                     site isn't multilingual.
+	 *
 	 * @return array
 	 */
-	public static function wc_products_custom_query_args() {
-		return apply_filters( 'shopping_feed_products_custom_args', array() );
+	public static function wc_products_custom_query_args( $lang = '' ) {
+		/**
+		 * Filter args used to retrieve products for the feed.
+		 *
+		 * @param array  $args Custom query args for the `WC_Product_Query`.
+		 * @param string $lang The current language associated with the feed. Language slug or empty string if
+		 *                     site isn't multilingual.
+		 */
+		return apply_filters( 'shopping_feed_products_custom_args', array(), $lang );
 	}
 
 	/**