Updated for release 4.30.0

rmraya · Jan 29, 2024 · 0c28634 · 0c28634
1 parent 0a72d7e
commit 0c28634
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 27 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "swordfish",
     "productName": "Swordfish",
-    "version": "4.29.0",
+    "version": "4.30.0",
     "description": "Swordfish Translation Editor",
     "main": "js/Swordfish.js",
     "scripts": {
@@ -20,11 +20,11 @@
         "url": "https://github.com/rmraya/Swordfish.git"
     },
     "devDependencies": {
-        "electron": "^28.1.3",
+        "electron": "^28.2.0",
         "typescript": "^5.3.3"
     },
     "dependencies": {
-        "mtengines": "^1.2.1",
+        "mtengines": "^1.3.0",
         "typesbcp47": "^1.2.0",
         "typesxml": "^1.2.1"
     }

diff --git a/src/com/maxprograms/swordfish/Constants.java b/src/com/maxprograms/swordfish/Constants.java
@@ -19,8 +19,8 @@ private Constants() {
 	}
 
 	public static final String APPNAME = "Swordfish";
-	public static final String VERSION = "4.29.0";
-	public static final String BUILD = "20240122_0818";
+	public static final String VERSION = "4.30.0";
+	public static final String BUILD = "20240126_0948";
 
 	public static final String REASON = "reason";
 	public static final String STATUS = "status";

diff --git a/ts/Swordfish.ts b/ts/Swordfish.ts
@@ -106,8 +106,7 @@ export class Swordfish {
             enabled: false,
             apiKey: '',
             srcLang: 'none',
-            tgtLang: 'none',
-            proPlan: true
+            tgtLang: 'none'
         },
         chatGpt: {
             enabled: false,

diff --git a/ts/mtContentHandler.ts b/ts/mtContentHandler.ts
@@ -132,8 +132,6 @@ export class MTContentHandler implements ContentHandler {
 
     translate(segment: XMLElement): void {
         let source: XMLElement = segment.getChild('source');
-
         this.mtManager.translateElement(source, this.project, this.file, this.unit, this.segment);
-
     }
 }
diff --git a/ts/mtManager.ts b/ts/mtManager.ts
@@ -70,7 +70,7 @@ export class MTManager {
             this.mtEngines.push(yandexTranslator);
         }
         if (preferences.deepl.enabled) {
-            let deeplTranslator: DeepLTranslator = new DeepLTranslator(preferences.deepl.apiKey, preferences.deepl.proPlan);
+            let deeplTranslator: DeepLTranslator = new DeepLTranslator(preferences.deepl.apiKey);
             deeplTranslator.setSourceLanguage(preferences.deepl.srcLang);
             deeplTranslator.setTargetLanguage(preferences.deepl.tgtLang);
             this.mtEngines.push(deeplTranslator);

diff --git a/ts/preferences.ts b/ts/preferences.ts
@@ -49,7 +49,6 @@ class Preferences {
         apiKey: string;
         srcLang: string;
         tgtLang: string;
-        proPlan: boolean;
     };
     chatGpt: {
         enabled: boolean;

diff --git a/ts/preferencesDialog.ts b/ts/preferencesDialog.ts
@@ -52,8 +52,6 @@ class PreferencesDialog {
 
     enableDeepL: HTMLInputElement;
     deeplKey: HTMLInputElement;
-    deeplPro: HTMLInputElement;
-    deeplFree: HTMLInputElement;
     deeplSrcLang: HTMLSelectElement;
     deeplTgtLang: HTMLSelectElement;
 
@@ -243,10 +241,7 @@ class PreferencesDialog {
             this.deeplKey.disabled = !this.enableDeepL.checked;
             this.deeplSrcLang.disabled = !this.enableDeepL.checked;
             this.deeplTgtLang.disabled = !this.enableDeepL.checked;
-            this.deeplPro.disabled = !this.enableDeepL.checked;
-            this.deeplFree.disabled = !this.enableDeepL.checked;
         });
-        this.deeplPro.checked = preferences.deepl.proPlan;
 
         this.enableChatGPT.checked = preferences.chatGpt.enabled;
         this.chatGPTKey.value = preferences.chatGpt.apiKey;
@@ -374,8 +369,7 @@ class PreferencesDialog {
                 enabled: this.enableDeepL.checked,
                 apiKey: this.deeplKey.value,
                 srcLang: this.deeplSrcLang.value,
-                tgtLang: this.deeplTgtLang.value,
-                proPlan: this.deeplPro.checked
+                tgtLang: this.deeplTgtLang.value
             },
             chatGpt: {
                 enabled: this.enableChatGPT.checked,
@@ -1257,19 +1251,10 @@ class PreferencesDialog {
         td.innerHTML = '<select id="deeplTgtLang" class="table_select"></select>';
         tr.appendChild(td);
 
-        let deeplPlan: HTMLDivElement = document.createElement('div');
-        deeplPlan.classList.add('middle');
-        deeplPlan.classList.add('row');
-        deeplPlan.style.paddingLeft = '4px';
-        deeplPlan.innerHTML = '<input type="radio" id="deeplFree" name="deeplPlan" value="free" checked><label for="deeplFree" style="padding-top:4px;">Free Plan</label><input type="radio" id="deeplPro" name="deeplPlan" value="pro"><label for="deeplPro" style="padding-top:4px;">Pro Plan</label>';
-        container.appendChild(deeplPlan);
-
         this.enableDeepL = document.getElementById('enableDeepL') as HTMLInputElement;
         this.deeplKey = document.getElementById('deeplKey') as HTMLInputElement;
         this.deeplSrcLang = document.getElementById('deeplSrcLang') as HTMLSelectElement;
         this.deeplTgtLang = document.getElementById('deeplTgtLang') as HTMLSelectElement;
-        this.deeplFree = document.getElementById('deeplFree') as HTMLInputElement;
-        this.deeplPro = document.getElementById('deeplPro') as HTMLInputElement;
     }
 
     populateChatGptTab(container: HTMLDivElement): void {