Changeset 3142013

Timestamp:

08/27/2024 04:13:59 AM (7 months ago)

Author:

mvpis

Message:

Improving Language Management and Search

Location:

fluentc-translation/trunk

Files:

• fluentc_wordpress_plugin.php (modified) (2 diffs)
• readme.txt (modified) (1 diff)
• src/services/class-fluentc-translations.php (modified) (1 diff)

fluentc-translation/trunk/fluentc_wordpress_plugin.php

@@ -7 +7 @@
  * Plugin URI: https://github.com/fluentc/wordpress-plugin
  * Description: A plugin that enables website owners to easily install the FluentC Translation on their WordPress site.
- * Version: 1.7
+ * Version: 1.7.1
  * Author: FluentC
  * Author URI: https://www.fluentc.ai
@@ -17 +17 @@
 define( 'FLUENTC_DIR', __DIR__ );
 define( 'FLUENTC_SLUG', 'fluentc_translation' );
-define( 'FLUENTC_TRANSLATION_VERSION', "1.7" );
+define( 'FLUENTC_TRANSLATION_VERSION', "1.7.1" );
 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.1
-Stable tag: 1.7
+Stable tag: 1.7.1
 Requires PHP: 7.3
 License: GPLv2 or later

fluentc-translation/trunk/src/services/class-fluentc-translations.php

@@ -33 +33 @@
 
     private function get_paginated_translations($offset, $limit) {
-        $fluentc_cache = new \FluentC\Services\Cache();
-        $all_transients = $fluentc_cache->get_fluentc_transients();
-        
+        global $wpdb;
         $translations = [];
         $count = 0;
-        $processed_ids = []; // Now an associative array
-        
-        foreach ($all_transients as $transient_name => $transient_data) {
+    
+        $sql = "SELECT option_name, option_value 
+                FROM {$wpdb->options} 
+                WHERE option_name LIKE '_transient_fluentc%'
+                LIMIT %d OFFSET %d";
+    
+        $results = $wpdb->get_results($wpdb->prepare($sql, $limit, $offset), ARRAY_A);
+    
+        foreach ($results as $result) {
+            $transient_name = str_replace('_transient_', '', $result['option_name']);
+            $transient_data = $result['option_value'];
+    
             if (is_string($transient_data)) {
                 $data = json_decode($transient_data, true);
                 if (json_last_error() === JSON_ERROR_NONE && isset($data['data']['translateSite']['body'])) {
-                   
-                    $originalText = html_entity_decode($data['data']['translateSite']['body']['originalText'], ENT_QUOTES | ENT_XML1, 'UTF-8');
-                    $translatedText = html_entity_decode($data['data']['translateSite']['body']['translatedText'], ENT_QUOTES | ENT_XML1, 'UTF-8');
+                    $body = $data['data']['translateSite']['body'];
                     
-                    // Generate a unique identifier for this translation
-                    $unique_id = md5($transient_name . $originalText . $translatedText);
-                    
-                    // Check if we've processed this unique translation before
-                    if ($originalText !== $translatedText && !isset($processed_ids[$unique_id])) {
-                        if ($count >= $offset && count($translations) < $limit) {
+                    // Check if body is a single translation or an array of translations
+                    if (isset($body['originalText'])) {
+                        $body = [$body]; // Convert single translation to array
+                    }
+    
+                    foreach ($body as $translation) {
+                        $originalText = html_entity_decode($translation['originalText'], ENT_QUOTES | ENT_XML1, 'UTF-8');
+                        $translatedText = html_entity_decode($translation['translatedText'], ENT_QUOTES | ENT_XML1, 'UTF-8');
+                        
+                        if ($originalText !== $translatedText) {
                             $translations[] = [
                                 'id' => $transient_name,
-                                'sourceLanguage' => $data['data']['translateSite']['body']['sourceLanguage'],
-                                'targetLanguage' => $data['data']['translateSite']['body']['targetLanguage'],
+                                'sourceLanguage' => $translation['sourceLanguage'],
+                                'targetLanguage' => $translation['targetLanguage'],
                                 'originalText' => $originalText,
                                 'translatedText' => $translatedText
                             ];
+                            $count++;
+    
+                            if (count($translations) >= $limit) {
+                                break 2; // Exit both loops if we've reached the limit
+                            }
                         }
+                    }
+                }
+            }
+        }
+    
+        return $translations;
+    }
+    
+    private function get_total_translations_count() {
+        global $wpdb;
+        $count = 0;
+    
+        $sql = "SELECT option_value 
+                FROM {$wpdb->options} 
+                WHERE option_name LIKE '_transient_fluentc%'";
+    
+        $results = $wpdb->get_col($sql);
+    
+        foreach ($results as $transient_data) {
+            $data = json_decode($transient_data, true);
+            if (json_last_error() === JSON_ERROR_NONE && isset($data['data']['translateSite']['body'])) {
+                $body = $data['data']['translateSite']['body'];
+                
+                // Check if body is a single translation or an array of translations
+                if (isset($body['originalText'])) {
+                    $body = [$body]; // Convert single translation to array
+                }
+    
+                foreach ($body as $translation) {
+                    $originalText = html_entity_decode($translation['originalText'], ENT_QUOTES | ENT_XML1, 'UTF-8');
+                    $translatedText = html_entity_decode($translation['translatedText'], ENT_QUOTES | ENT_XML1, 'UTF-8');
+                    
+                    if ($originalText !== $translatedText) {
                         $count++;
-                        $processed_ids[$unique_id] = true; // Mark this translation as processed
-                        
                     }
-                
+                }
             }
-            }
-        }
-        
-        return $translations;
-    }
-
-    private function get_total_translations_count() {
-        $fluentc_cache = new \FluentC\Services\Cache();
-        $all_transients = $fluentc_cache->get_fluentc_transients();
-        
-        $count = 0;
-        $processed_ids = []; // Now an associative array.
-        foreach ($all_transients as $transient_name => $transient_data) {
-            if (is_string($transient_data)) {
-                $data = json_decode($transient_data, true);
-                if (json_last_error() === JSON_ERROR_NONE && isset($data['data']['translateSite']['body'])) {
-                   
-                    $originalText = html_entity_decode($data['data']['translateSite']['body']['originalText'], ENT_QUOTES | ENT_XML1, 'UTF-8');
-                    $translatedText = html_entity_decode($data['data']['translateSite']['body']['translatedText'], ENT_QUOTES | ENT_XML1, 'UTF-8');
-                    
-                    $unique_id = md5($transient_name . $originalText . $translatedText);
-                    
-                    if ($originalText !== $translatedText && !isset($processed_ids[$unique_id])) {
-                        $count++;
-                        $processed_ids[$unique_id] = true;
-                    }
-                
-            }
-            }
-        }
+        }
+    
         return $count;
     }