Changeset 852684

Timestamp:

02/06/2014 04:18:11 PM (12 years ago)

Author:

AmirHelzer

Message:

WCML 3.2.1

Location:

woocommerce-multilingual/trunk

Files:

• inc/terms.class.php (modified) (8 diffs)
• inc/woocommerce-2.0-backward-compatibility.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• woocommerce_wpml.class.php (modified) (1 diff)
• wpml-woocommerce.php (modified) (1 diff)

woocommerce-multilingual/trunk/inc/terms.class.php

@@ -22 +22 @@
         add_filter('option_rewrite_rules', array($this, 'rewrite_rules_filter'), 3, 1); // high priority
         
-        add_filter('term_link', array($this, 'translate_category_base'), 3, 3); // high priority
+        add_filter('term_link', array($this, 'translate_category_base'), 0, 3); // high priority
         add_filter('term_link', array($this, 'translate_brand_link'), 10, 3);
         
@@ -208 +208 @@
         
         // handles product categories, product tags and attributes
-        
+                
         $wc_taxonomies = wc_get_attribute_taxonomies();
         foreach($wc_taxonomies as $k => $v){
@@ -219 +219 @@
             if($link = wp_cache_get($cache_key, 'terms')){
                 $termlink = $link;
-                
             }else{               
             
@@ -230 +229 @@
                 
                     $permalinks     = get_option( 'woocommerce_permalinks' );
-                    $base           = $taxonomy == 'product_tag' ? $permalinks['tag_base'] : ($taxonomy == 'category_tag' ? $permalinks['category_base'] : $permalinks['attribute_base']);
+                    $base           = $taxonomy == 'product_tag' ? $permalinks['tag_base'] : ($taxonomy == 'product_cat' ? $permalinks['category_base'] : $permalinks['attribute_base']);
                     
                     if($base === ''){
@@ -260 +259 @@
                     }else{
                         
-                        $string_identifier = $taxonomy == 'product_tag' || $taxonomy == 'product_category' ? $taxonomy : 'attribute';
+                        $string_identifier = ($taxonomy == 'product_tag' || $taxonomy == 'product_cat') ? $taxonomy : 'attribute';
                         
                         if($term_language->language_code != $strings_language){
@@ -269 +268 @@
                                             WHERE s.value='". esc_sql($base)."' 
                                                 AND s.language = '{$strings_language}' 
-                                                AND s.name LIKE 'URL {$string_identifier} slug:%' 
+                                                AND s.name LIKE 'Url {$string_identifier} slug:%' 
                                                 AND t.language = '{$term_language->language_code}'
                             ");
@@ -284 +283 @@
                         $no_recursion_flag = true;
                         $termlink = get_term_link($term, $taxonomy);
-                       
+                                 
                         $wp_rewrite->extra_permastructs[$taxonomy]['struct'] = $buff;
                        
@@ -614 +613 @@
         if(isset( $attribute_taxonomies_arr ) && in_array($taxonomy, $attribute_taxonomies_arr)){
 
-                $wcml_settings = $woocommerce_wpml->get_settings();
-
-                // get term language
-                $term_language = $sitepress->get_element_language_details($tt_id, 'tax_' . $taxonomy);
-
-                if($term_language->language_code != $sitepress->get_default_language()){
-                    // get term in the default language
-                    $term_id = icl_object_id($term_id, $taxonomy, false, $sitepress->get_default_language());
-
-                    //does it belong to any posts (variations)
-                    $objects = get_objects_in_term($term_id, $taxonomy);
-
-                    if(!isset($wcml_settings['variations_needed'][$taxonomy])){
-                        $wcml_settings['variations_needed'][$taxonomy] = 0;
-                    }
-                    $wcml_settings['variations_needed'][$taxonomy] += count($objects);
-
-                    $woocommerce_wpml->update_settings($wcml_settings);
-
-                }
-        }
+                $wcml_settings = $woocommerce_wpml->get_settings();
+
+                // get term language
+                $term_language = $sitepress->get_element_language_details($tt_id, 'tax_' . $taxonomy);
+
+                if($term_language->language_code != $sitepress->get_default_language()){
+                    // get term in the default language
+                    $term_id = icl_object_id($term_id, $taxonomy, false, $sitepress->get_default_language());
+
+                    //does it belong to any posts (variations)
+                    $objects = get_objects_in_term($term_id, $taxonomy);
+
+                    if(!isset($wcml_settings['variations_needed'][$taxonomy])){
+                        $wcml_settings['variations_needed'][$taxonomy] = 0;
+                    }
+                    $wcml_settings['variations_needed'][$taxonomy] += count($objects);
+
+                    $woocommerce_wpml->update_settings($wcml_settings);
+
+                }
+        }
         
     }

woocommerce-multilingual/trunk/inc/woocommerce-2.0-backward-compatibility.php

@@ -59 +59 @@
     }
 
-    add_filter('woocommerce_in_cart_product_title',array($this->products, 'translated_cart_item_name'), 10, 3);
+    add_filter('woocommerce_in_cart_product_title',array($this->strings, 'translated_cart_item_name'), 10, 3);
       
       

woocommerce-multilingual/trunk/readme.txt

@@ -6 +6 @@
 Requires at least: 3.0
 Tested up to: 3.8
-Stable tag: 3.2
+Stable tag: 3.2.1
 
 Allows running fully multilingual e-commerce sites using WooCommerce and WPML.
@@ -77 +77 @@
 
 == Changelog ==
+
+= 3.2.1 =
+* Fixed bug related to product category urls translaiton
+* Fixed bug related to back-compatibility with WooCommerce 2.0.20
 
 = 3.2 =

woocommerce-multilingual/trunk/woocommerce_wpml.class.php

@@ -41 +41 @@
         }
                 
-        $this->products   = new WCML_Products;
-        $this->store      = new WCML_Store_Pages;
-        $this->emails     = new WCML_Emails;
-        $this->terms      = new WCML_Terms;
-        $this->orders     = new WCML_Orders;
+        $this->products         = new WCML_Products;
+        $this->store            = new WCML_Store_Pages;
+        $this->emails           = new WCML_Emails;
+        $this->terms            = new WCML_Terms;
+        $this->orders           = new WCML_Orders;
         $this->troubleshooting  = new WCML_Troubleshooting();
-        $this->compatibility = new WCML_Compatibility();
+        $this->compatibility    = new WCML_Compatibility();
+        $this->strings          = new WCML_WC_Strings;
         
         include WCML_PLUGIN_PATH . '/inc/woocommerce-2.0-backward-compatibility.php';            
 
         new WCML_Ajax_Setup;
-        new WCML_WC_Strings;
 
         new WCML_Requests;

woocommerce-multilingual/trunk/wpml-woocommerce.php

@@ -6 +6 @@
   Author: ICanLocalize
   Author URI: http://wpml.org/
-  Version: 3.2
+  Version: 3.2.1
 */
 
 if(defined('WCML_VERSION')) return;
-define('WCML_VERSION', '3.2');
+define('WCML_VERSION', '3.2.1');
 define('WCML_PLUGIN_PATH', dirname(__FILE__));
 define('WCML_PLUGIN_FOLDER', basename(WCML_PLUGIN_PATH));