Merge branch 'main' of https://github.com/kwaroran/RisuAI

src/lib/ChatScreens/Chat.svelte

@@ -140,11 +140,12 @@
                 translateText = false
                 try {
                     if(DBState.db.autoTranslate){
-                        if(DBState.db.autoTranslateCachedOnly && DBState.db.translatorType === "llm"){
-                            const cache = await getLLMCache(data)
-                            if(cache !== null){
-                                translateText = true
-                            }
+                        if(DBState.db.autoTranslateCachedOnly && DBState.db.translatorType === 'llm'){
+                            const cache = DBState.db.translateBeforeHTMLFormatting
+                            ? await getLLMCache(data)
+                            : await getLLMCache(await ParseMarkdown(data, charArg, 'pretranslate', chatID, getCbsCondition()))
+                  
+                            translateText = cache !== null
                         }
                         else{
                             translateText = true

src/ts/translator/translator.ts

@@ -111,7 +111,7 @@ export async function runTranslator(text:string, reverse:boolean, from:string,ta
 async function translateMain(text:string, arg:{from:string, to:string, host:string}){
     let db = getDatabase()
     if(db.translatorType === 'llm'){
-        const tr = db.translator || 'en'
+        const tr = arg.to || 'en'
         return translateLLM(text, {to: tr})
     }
     if(db.translatorType === 'deepl'){