Release 1.2.10

Author: konstantin-convergine

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+## 1.2.10 - 2025-07-16
+### Fixed
+- Resolved an issue affecting the translation of `<img>` tags within CKEditor fields.
+- Fixed translation issues with Gaelic languages when using OpenAI.
+
 ## 1.2.9 - 2025-06-17
 ### Fixed
 - Resolved an issue where the bulk translation exclusions table was not created correctly on systems with `sql_require_primary_key` enabled.

composer.json

@@ -2,7 +2,7 @@
     "name": "convergine/craft-content-buddy",
     "description": "Content Buddy is an AI-driven CraftCMS plugin that leverages the ChatGPT API to automatically generate and manage multi-language content, including text and images, with customizable settings and features for precise control and enhanced content creation.",
     "type": "craft-plugin",
-    "version": "1.2.9",
+    "version": "1.2.10",
     "keywords": [
         "craftcms",
         "content-buddy",

src/api/text/OpenAi.php

@@ -46,8 +46,19 @@ public function sendRequest($prompt, $maxTokens, $temperature, $isTranslate = fa
         }
 
         $choices = $json['choices'];
+        $text = $this->getTextGenerationBasedOnModel( $model, $choices );
+
+        //check for repeated phrases
+        if(in_array($lang,['gv','gd','ga'])) {
+            $normalized = preg_replace('/[\p{P}]+/u', '', strtolower($text));
+            $normalized = preg_replace('/\s+/', ' ', $normalized);
+            if(preg_match_all('/(\b(?:\w+\s?){1,6})\s+(\1\s*){2,}/u', $normalized, $matches)) {
+                Craft::info( 'OpenAI response contains repeated phrases: ' . implode(', ', $matches[0]), 'content-buddy');
+                return $this->sendRequest($prompt, $maxTokens, $temperature, $isTranslate, $instructions, $lang);
+            }
+        }
 
-        return $this->getTextGenerationBasedOnModel( $model, $choices );
+        return $text;
     }
 
     private function buildTextGenerationRequestBody($model, $prompt, $maxTokensToGenerate, $temperature = 0.7, $isTranslate = false, $instructions = '') {

src/services/Request.php

@@ -52,7 +52,8 @@ private function hasHtmlTags($text): bool {
 
     private function getMinSentencesPerChunk($lang): int {
         return match ($lang) {
-            'gv' => 3,
+            'gv', 'gd', 'ga' => 3,
+            'el' => 20,
             'nl-NL', 'nl', 'sl' => 100,
             default => 40,
         };

src/services/Translate.php

@@ -421,6 +421,7 @@ public function translateCategory(
 					if ( $fieldType == 'craft\ckeditor\Field' ) {
 						$fieldValue  = $entry->getFieldValue( $fieldHandle );
 						$entry_value = $fieldValue !== null ? $fieldValue->getRawContent() : $fieldValue;
+                        $entry_value = $this->fixAssets($entry_value);
 					} else {
 						$entry_value = $entry->getFieldValue( $fieldHandle );
 					}
@@ -604,6 +605,7 @@ public function translateAsset(
 					if ( $fieldType == 'craft\ckeditor\Field' ) {
 						$fieldValue  = $entry->getFieldValue( $fieldHandle );
 						$entry_value = $fieldValue !== null ? $fieldValue->getRawContent() : $fieldValue;
+                        $entry_value = $this->fixAssets($entry_value);
 					} else {
 						$entry_value = $entry->getFieldValue( $fieldHandle );
 					}
@@ -776,6 +778,7 @@ public function translateProduct(
 					if ( $fieldType == 'craft\ckeditor\Field' ) {
 						$fieldValue  = $entry->getFieldValue( $fieldHandle );
 						$entry_value = $fieldValue !== null ? $fieldValue->getRawContent() : $fieldValue;
+                        $entry_value = $this->fixAssets($entry_value);
 					} else {
 						$entry_value = $entry->getFieldValue( $fieldHandle );
 					}
@@ -976,6 +979,7 @@ public function translateEntry(
 					if ( $fieldType == 'craft\ckeditor\Field' ) {
 						$fieldValue  = $entry->getFieldValue( $fieldHandle );
 						$entry_value = $fieldValue !== null ? $fieldValue->getRawContent() : $fieldValue;
+                        $entry_value = $this->fixAssets($entry_value);
 					} else {
 						$entry_value = $entry->getFieldValue( $fieldHandle );
 					}
@@ -1150,7 +1154,7 @@ public function processMatrixFields( string $lang, Element $entry_from, int $tra
 			if ( in_array( $fieldType, static::$textFields ) && $processField && ! $or_entry ) {
 				if ( $fieldType == 'craft\ckeditor\Field' ) {
 					$fieldValue         = $entry_from->getFieldValue( $field->handle );
-					$originalFieldValue = $field->serializeValue( $fieldValue !== null ? $fieldValue->getRawContent() : $fieldValue, $entry_from );
+					$originalFieldValue = $field->serializeValue( $fieldValue !== null ? $this->fixAssets($fieldValue->getRawContent()) : $fieldValue, $entry_from );
 				} else {
 					$originalFieldValue = $field->serializeValue( $entry_from->getFieldValue( $field->handle ), $entry_from );
 				}
@@ -1866,6 +1870,16 @@ private function getHtmlTags( $text ): array {
 		return array_unique( $matches[1] );
 	}
 
+    private function fixAssets($text): string {
+        return preg_replace_callback(
+            '/\{asset:\d+:url\|\|(.*?)\}/',
+            function($matches) {
+                return $matches[1];
+            },
+            $text
+        );
+    }
+
 	private function saveElement( $element ): bool {
 		/** @var SettingsModel $settings */
 		$settings    = BuddyPlugin::getInstance()->getSettings();
@@ -1905,7 +1919,11 @@ public static function isCommerceInstalled(): bool {
 	}
 
 	public function saveExcludeBulkSites( $element ): void {
-		$params = Craft::$app->request->post();
+        $request = Craft::$app->getRequest();
+        if(!($request instanceof \craft\web\Request)) {
+            return;
+        }
+        $params = $request->post();
 		if(isset($params['elementId']) && $params['elementId'] == $element->id) {
 			Craft::info( 'saveExcludeBulkSites', 'content-buddy' );
 			Craft::info( $params, 'content-buddy' );