Merge branch 'kwaroran:main' into main

src/lib/ChatScreens/Chat.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
     import { ArrowLeft, ArrowRight, PencilIcon, LanguagesIcon, RefreshCcwIcon, TrashIcon, CopyIcon, Volume2Icon, BotIcon, ArrowLeftRightIcon, UserIcon } from "lucide-svelte";
-    import { ParseMarkdown, type simpleCharacterArgument } from "../../ts/parser";
+    import { ParseMarkdown, postTranslationParse, type simpleCharacterArgument } from "../../ts/parser";
     import AutoresizeArea from "../UI/GUI/TextAreaResizable.svelte";
     import { alertConfirm, alertError, alertRequestData } from "../../ts/alert";
     import { language } from "../../lang";
@@ -102,13 +102,25 @@
             } catch (error) {}
         }
             if(translateText){
-                const marked = await ParseMarkdown(data, charArg, mode, chatID)
-                translating = true
-                const translated = await translateHTML(marked, false, charArg, chatID)
-                translating = false
-                lastParsed = translated
-                lastCharArg = charArg
-                return translated
+                if(!$DataBase.legacyTranslation){
+                    const marked = await ParseMarkdown(data, charArg, 'pretranslate', chatID)
+                    translating = true
+                    console.log(marked)
+                    const translated = postTranslationParse(await translateHTML(marked, false, charArg, chatID))
+                    translating = false
+                    lastParsed = translated
+                    lastCharArg = charArg
+                    return translated
+                }
+                else{
+                    const marked = await ParseMarkdown(data, charArg, mode, chatID)
+                    translating = true
+                    const translated = await translateHTML(marked, false, charArg, chatID)
+                    translating = false
+                    lastParsed = translated
+                    lastCharArg = charArg
+                    return translated
+                }
             }
             else{
                 const marked = await ParseMarkdown(data, charArg, mode, chatID)

src/lib/ChatScreens/DefaultChatScreen.svelte

@@ -338,11 +338,14 @@
 
             for(const chat of chats){
                 const cnv = await html2canvas.toCanvas(chat as HTMLElement)
+                alertWait("Taking screenShot... "+canvases.length+"/"+chats.length)
                 canvases.push(cnv)
             }
 
             canvases.reverse()
 
+            alertWait("Merging images...")
+            
             let mergedCanvas = document.createElement('canvas');
             mergedCanvas.width = 0;
             mergedCanvas.height = 0;

src/lib/Setting/Pages/LanguageSettings.svelte

@@ -127,4 +127,10 @@
             <Help key="combineTranslation"/>
         </Check>
     </div>
+
+    <div class="flex items-center mt-4">
+        <Check bind:check={$DataBase.legacyTranslation} name={language.legacyTranslation}>
+            <Help key="legacyTranslation"/>
+        </Check>
+    </div>
 {/if}

src/lib/Setting/Pages/PluginSettings.svelte

@@ -17,29 +17,12 @@
 <span class="text-draculared text-xs mb-4">{language.pluginWarn}</span>
 
 
-<div class="border-solid border-borderc p-2 flex flex-col border-1">
-    <div class="flex">
-        <span class="font-bold flex-grow">Metric Systemizer <Help key="metrica" /> <span class="text-green-500 italic">(Official Plugin)</span></span>
-    </div>
-    <div class="flex items-center mt-2">
-        <Check bind:check={$DataBase.officialplugins.metrica} name={language.able}/>
-    </div>
-    <div class="flex">
-        <span class="font-bold flex-grow">OpenAI Fixer <Help key="openAIFixer" /> <span class="text-green-500 italic">(Official Plugin)</span></span>
-    </div>
-    <div class="flex items-center mt-2">
-        <Check bind:check={$DataBase.officialplugins.oaiFix} name={language.able}/>
-    </div>
-    {#if $DataBase.officialplugins.oaiFix}
-        <div class="flex items-center mt-2">
-            <Check bind:check={$DataBase.officialplugins.oaiFixEmdash} name={"Remove Emdash"}/>
-        </div>
-        <div class="flex items-center mt-2">
-            <Check bind:check={$DataBase.officialplugins.oaiFixLetters} name={"Fix Letters"}/>
-        </div>
+<div class="border-solid border-darkborderc p-2 flex flex-col border-1">
+    {#if !$DataBase.plugins || $DataBase.plugins?.length === 0}
+        <span class="text-textcolor2">{language.noPlugins}</span>
     {/if}
     {#each $DataBase.plugins as plugin, i}
-        <div class="border-borderc mt-2 mb-2 w-full border-solid border-b-1 seperator"></div>
+        <div class="border-darkborderc mt-2 mb-2 w-full border-solid border-b-1 seperator"></div>
         <div class="flex">
             <span class="font-bold flex-grow">{plugin.displayName ?? plugin.name}</span>
             <button class="textcolor2 hover:gray-200 cursor-pointer" on:click={async () => {
@@ -48,7 +31,7 @@
                     if($DataBase.currentPluginProvider === plugin.name){
                         $DataBase.currentPluginProvider  = ''
                     }
-                    let plugins = $DataBase.plugins
+                    let plugins = $DataBase.plugins ?? []
                     plugins.splice(i, 1)
                     $DataBase.plugins = plugins
                 }

src/lib/UI/Realm/RealmPopUp.svelte

@@ -95,7 +95,7 @@
             {/if}
             <button class="text-textcolor2 hover:text-green-500" on:click|stopPropagation={async () => {
                 await navigator.clipboard.writeText(`https://realm.risuai.net/character/${openedData.id}`)
-                alertNormal("Copied to clipboard")
+                alertNormal(language.clipboardSuccess)
             }}>
                 <PaperclipIcon />
             </button>