Release 1.2.4

Author: konstantin-convergine

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## 1.2.4 - 2025-03-19
+### Changed
+- Allow selecting different API versions for DeepL.
+
+### Fixed
+- Fixed an issue with translating nested entries in CKEditor fields.
+
 ## 1.2.3 - 2025-03-18
 ### Fixed
 - Fixed an issue with DeepL Pro API keys.

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.3",
+    "version": "1.2.4",
     "keywords": [
         "craftcms",
         "content-buddy",

src/api/text/DeepL.php

@@ -58,7 +58,12 @@ public function sendRequest($prompt, $maxTokens, $temperature, $isTranslate = fa
 
 	private function getEndpoint() : string {
         $api_key = $this->settings->getDeepLApiKey();
-		return str_ends_with($api_key,':fx') ? "https://api-free.deepl.com/v2/translate" : "https://api.deepl.com/v2/translate";
+        $api_version = $this->settings->getDeepLApiVersion();
+        if($api_version == 'v1') {
+            return "https://api.deepl.com/v1/translate";
+        } else {
+            return str_ends_with($api_key,':fx') ? "https://api-free.deepl.com/".$api_version."/translate" : "https://api.deepl.com/".$api_version."/translate";
+        }
 	}
 
 	private function _getTextGeneration($result) : string {

src/models/SettingsModel.php

@@ -33,10 +33,16 @@ class SettingsModel extends Model
 	 */
 	public string $preferredTranslationModel = 'gpt-3.5-turbo';
 
-	/**
-	 * @var string
-	 */
-	public string $deepLApiKey = '';
+    /**
+     * @var string
+     */
+    public string $deepLApiKey = '';
+
+    /**
+     * @var string
+     */
+    public string $deepLApiVersion = 'v2';
+
     /**
      * @var string
      */
@@ -156,12 +162,19 @@ public function getXAiApiKey(): string {
         return App::parseEnv($this->xAiApiKey);
     }
 
-	/**
-	 * @return string
-	 */
-	public function getDeepLApiKey(): string {
-		return App::parseEnv($this->deepLApiKey);
-	}
+    /**
+     * @return string
+     */
+    public function getDeepLApiKey(): string {
+        return App::parseEnv($this->deepLApiKey);
+    }
+
+    /**
+     * @return string
+     */
+    public function getDeepLApiVersion(): string {
+        return $this->deepLApiVersion;
+    }
 
 	/**
 	 * @return string

src/services/Translate.php

@@ -702,11 +702,19 @@ public function translateEntry(
 		}
 
 		if ( $_entry ) {
-			$prompt = "Translate to {$lang}";
-			if ( $instructions ) {
-				$prompt .= ", {$instructions},";
+
+			$prompt = "Translate to $lang";
+			if($instructions) {
+				$prompt .= ", $instructions,";
 			}
 			$prompt .= " following text";
+
+            $prompt_ckeditor = "Translate to $lang. Do not translate or remove any <craft-entry> tags";
+            if($instructions) {
+                $prompt_ckeditor .= ", $instructions,";
+            }
+            $prompt_ckeditor .= " following text";
+
 			try {
 				$translated_text = BuddyPlugin::getInstance()->request
 					->send( $prompt . ": {$entry->title}", 30000, 0.7, true,$lang );
@@ -751,17 +759,16 @@ public function translateEntry(
 					}
 
 					try {
-						$translated_text = BuddyPlugin::getInstance()
-							->request->send( $prompt . ": {$entry_value}", 30000, 0.7, true,$lang );
+                        $translated_text = BuddyPlugin::getInstance()->request->send( ($fieldType == 'craft\ckeditor\Field' ? $prompt_ckeditor : $prompt) . ": {$entry_value}", 30000, 0.7, true, $lang);
 
-                        Craft::info( $prompt . ": {$entry_value}", 'content-buddy' );
-                        Craft::info( $fieldHandle, 'content-buddy' );
+                        Craft::info( ($fieldType == 'craft\ckeditor\Field' ? $prompt_ckeditor : $prompt) . ": {$entry_value}", 'content-buddy' );
+                        Craft::info( $fieldHandle . '(' . $fieldType . ')', 'content-buddy' );
                         Craft::info( $translated_text, 'content-buddy' );
                         $translated_text = trim( $translated_text, '```html' );
                         $translated_text = rtrim( $translated_text, '```' );
 
                         if($fieldType == 'craft\ckeditor\Field') {
-                            $translated_text = $this->translateEntriesInCKEditorField($translated_text,$translate_to_site,$prompt);
+                            $translated_text = $this->translateEntriesInCKEditorField($translated_text,$translate_to_site,$prompt_ckeditor);
                             Craft::info('New CKEditor translated text: '.$translated_text, 'content-buddy');
                         }
 

src/templates/settings/_translation.twig

@@ -74,6 +74,16 @@
         </div>
 
         <div id="deepl" class="{% if settings.translationAi != 'deepl' %}hidden{% endif %}">
+            {{ forms.selectField({
+                label: 'DeepL API Version'|t('convergine-contentbuddy'),
+                name: 'deepLApiVersion',
+                value: settings.deepLApiVersion,
+                instructions: 'deepLApiVersionDescription'|t('convergine-contentbuddy'),
+                options: {
+                    "v2": "v2",
+                    "v1": "v1",
+                }
+            }) }}
 
             {{ forms.autosuggestField({
                 label: 'DeepL API Key'|t('convergine-contentbuddy'),

src/translations/en/convergine-contentbuddy.php

@@ -25,6 +25,7 @@
     'delaySectionDescription' => 'During bulk translations, the plugin will add a delay of this amount of seconds for every extra section.',
     'maxAttemptsDescription' => 'The maximum number of attempts to try when saving an entry during translation. This is only an issue if another task or user is editing the same entry at the same time.',
     'ttrDescription' => 'The maximum time a translation task should wait around for the job to be handled before assuming it failed.',
+    'deepLApiVersionDescription' => 'API version to use. For more information, see https://developers.deepl.com/docs/getting-started/auth#api-versions',
 
 	/* Settings -> Api Page */
 	'API: Access Token'=>'API: Access Token',