Fix #247 - Woocommerce [products] shortcode and Polylang

hyyan · hyyan · commit c18a2735173d · 2017-10-24T23:57:38.000+02:00
diff --git a/src/Hyyan/WPI/Pages.php b/src/Hyyan/WPI/Pages.php
@@ -17,13 +17,12 @@
  *
  * @author Hyyan Abo Fakher <hyyanaf@gmail.com>
  */
-class Pages
-{
+class Pages {
+
     /**
      * Construct object.
      */
-    public function __construct()
-    {
+    public function __construct() {
         $method = array($this, 'getPostTranslationID');
         $pages = apply_filters(HooksInterface::PAGES_LIST, array(
             'shop',
@@ -48,10 +47,9 @@ public function __construct()
             /* To get product from current language in the shop page */
             add_filter('parse_request', array($this, 'correctShopPage'));
         }
-        
+
         add_filter(
-                'woocommerce_shortcode_products_query',
-                array($this, 'addShortcodeLanguageFilter'), 10, 2
+                'woocommerce_shortcode_products_query', array($this, 'addShortcodeLanguageFilter'), 10, 2
         );
     }
 
@@ -62,8 +60,7 @@ public function __construct()
      *
      * @return int
      */
-    public function getPostTranslationID($id)
-    {
+    public function getPostTranslationID($id) {
         if (!function_exists('pll_get_post')) {
             return $id;
         }
@@ -85,8 +82,7 @@ public function getPostTranslationID($id)
      * @return bool false if the current language is the same as default
      *              language or if the "pagename" var is empty
      */
-    public function correctShopPage(\WP $wp)
-    {
+    public function correctShopPage(\WP $wp) {
         global $polylang;
 
         $shopID = wc_get_page_id('shop');
@@ -131,8 +127,7 @@ public function correctShopPage(\WP $wp)
      *
      * @return string translated url
      */
-    public function translateShopUrl($url, $language)
-    {
+    public function translateShopUrl($url, $language) {
         $result = $url;
 
         if (!is_post_type_archive('product')) {
@@ -155,7 +150,7 @@ public function translateShopUrl($url, $language)
 
         return $result;
     }
-    
+
     /**
      * Add Shortcode Language Filter
      *
@@ -167,13 +162,18 @@ public function translateShopUrl($url, $language)
      *
      * @return string modified form
      */
-    public function addShortcodeLanguageFilter($query_args, $atts)
-    {
-        if (function_exists('pll_current_language')) {
-            $query_args['lang'] = isset($query_args['lang']) ?
-                                  $query_args['lang'] : pll_current_language();
-            
-            return $query_args;
+    public function addShortcodeLanguageFilter($query_args, $atts) {
+        
+        $ids = explode(',', $atts['ids']);
+        $transIds = array();
+        foreach ($ids as $id) {
+            array_push($transIds, pll_get_post($id));
         }
+
+        $atts['ids'] = $transIds;
+        $query_args['post__in'] = $transIds;
+
+        return $query_args;
     }
+
 }
