Changeset 3255173

Timestamp:

03/13/2025 07:38:31 AM (2 weeks ago)

Author:

mvpis

Message:

Update with enhancements

Location:

fluentc-translation/trunk

Files:

• fluentc_wordpress_plugin.php (modified) (2 diffs)
• readme.txt (modified) (1 diff)
• src/actions/class-wordpress.php (modified) (2 diffs)
• src/fluentc_language_functions.php (modified) (1 diff)

fluentc-translation/trunk/fluentc_wordpress_plugin.php

@@ -7 +7 @@
  * Plugin URI: https://www.fluentc.ai
  * Description: A plugin that enables website owners to easily install the FluentC Translation on their WordPress site.
- * Version: 2.4.3
+ * Version: 2.4.4
  * Author: FluentC
  * Author URI: https://www.fluentc.ai
@@ -17 +17 @@
 define( 'FLUENTC_DIR', __DIR__ );
 define( 'FLUENTC_SLUG', 'fluentc_translation' );
-define( 'FLUENTC_TRANSLATION_VERSION', "2.4.3" );
+define( 'FLUENTC_TRANSLATION_VERSION', "2.4.4" );
 define( 'FLUENTC_TRANSLATION_PLUGIN_DIR', plugin_dir_path(__FILE__) );
 define( 'FLUENTC_TRANSLATION_PLUGIN_URL', plugin_dir_url(__FILE__) );

fluentc-translation/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 4.6
 Tested up to: 6.6.2
-Stable tag: 2.4.3
+Stable tag: 2.4.4
 Requires PHP: 7.3
 License: GPLv2 or later

fluentc-translation/trunk/src/actions/class-wordpress.php

@@ -169 +169 @@
         add_action('fluentc_language_set', array($this, 'refresh_language_code'));
         
-        // Register browser language detection and redirection.
-        add_action('template_redirect', array($this, 'fluentc_language_redirect'), 1);
+   
     }
     
@@ -454 +453 @@
     }
 
-    /**
-     * Get translation manager, initializing if needed
-     *
-     * @return Translation_Manager|null
-     */
-    private function get_translation_manager() {
-        // Don't translate if no language code
-        if (!$this->language_code) {
-            return null;
-        }
-        
-        // Skip translation if current language is same as site language
-        if ($this->language_code === $this->site_language) {
-            return null;
-        }
-        
-        // Initialize translation manager if not already done
-        if ($this->translation_manager === null) {
-            try {
-                $this->translation_manager = new Translation_Manager(
-                    $this->fluentc_connect,
-                    $this->fluentc_cache,
-                    $this->site_language,
-                    $this->language_code
-                );
-            } catch (\Exception $e) {
-                error_log('FluentC: Error initializing Translation Manager: ' . $e->getMessage());
-                return null;
-            }
-        }
-        
-        return $this->translation_manager;
-    }
-
-    /**
-     * Redirect users based on browser language
-     * 
-     * @return void
-     */
-    public function fluentc_language_redirect() {
-        // Skip if already on a language page or in admin/AJAX context
-        if ($this->language_code || is_admin() || wp_doing_ajax()) {
-            return;
-        }
-        
-        // Get API key
-        $widgetapikey = $this->widgetapikey;
-        if (!$widgetapikey) {
-            return;
-        }
-        
-        // Get default language
-        $default_language = $this->fluentc_language->fluentc_site_language();
-        
-        // Get browser language
-        $user_language = isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) : '';
-        if (empty($user_language)) {
-            return;
-        }
-    
-        // Get available languages
-        $available_languages = $this->fluentc_connect->get_display_language_list($widgetapikey);
-        if (empty($available_languages)) {
-            return;
-        }
-    
-        // Find matching language
-        $matching_language = null;
-        foreach ($available_languages as $language) {
-            if (strtolower($language[1]) === strtolower($user_language)) {
-                $matching_language = $language[1];
-                break;
-            }
-        }
-    
-        // FIXED: Only redirect if matching language is NOT the default language
-        if ($matching_language && strtolower($matching_language) !== strtolower($default_language)) {
-            // Get current URL
-            $current_url = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . 
-                "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";
-    
-            // Use helper function if available
-            if (function_exists('fluentc_add_language_to_url')) {
-                $new_url = fluentc_add_language_to_url($current_url, $matching_language);
-                wp_redirect($new_url);
-                exit;
-            }
-            
-            // Legacy approach if helper function not available
-            $url_parts = wp_parse_url($current_url);
-            
-            // Check if language code already in URL
-            if (!isset($url_parts['path']) || !preg_match('/\/' . $matching_language . '(\/|$|\?|#)/', $url_parts['path'])) {
-                // Add language code to path
-                $new_path = '/' . $matching_language . (isset($url_parts['path']) ? $url_parts['path'] : '/');
-                
-                // Rebuild URL with language code
-                $new_url = $url_parts['scheme'] . '://' . $url_parts['host'] . $new_path;
-                
-                if (!empty($url_parts['query'])) {
-                    $new_url .= '?' . $url_parts['query'];
-                }
-                
-                if (!empty($url_parts['fragment'])) {
-                    $new_url .= '#' . $url_parts['fragment'];
-                }
-                
-                wp_redirect($new_url);
-                exit;
-            }
-        }
-    }
+    
 }

fluentc-translation/trunk/src/fluentc_language_functions.php

@@ -117 +117 @@
     }
     
+    // Get the default language
+    $default_language = fluentc_get_default_language();
+    
+    // Don't add language code if it's the default language
+    if ($language_code === $default_language) {
+        return $url;
+    }
+    
     $url_parts = parse_url($url);