From 40d4123f08f9ec50daee17f742587f3fac9cced6 Mon Sep 17 00:00:00 2001
From: Tony Ribeiro <tonyribeiro.research.aca@gmail.com>
Date: Mon, 14 Aug 2023 04:59:11 +0200
Subject: [PATCH 1/5] Correct typo in tts index file that cause tts provider
 settings to be destroyed.

---
 public/scripts/extensions/tts/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/scripts/extensions/tts/index.js b/public/scripts/extensions/tts/index.js
index 00007430c..153a20c7a 100644
--- a/public/scripts/extensions/tts/index.js
+++ b/public/scripts/extensions/tts/index.js
@@ -638,7 +638,7 @@ function onTtsProviderSettingsInput() {
 
     // Persist changes to SillyTavern tts extension settings
 
-    extension_settings.tts[ttsProviderName] = ttsProvider.setttings
+    extension_settings.tts[ttsProviderName] = ttsProvider.settings
     saveSettingsDebounced()
     console.info(`Saved settings ${ttsProviderName} ${JSON.stringify(ttsProvider.settings)}`)
 }

From 869478627de50fcf47ae78ea491226c831591c16 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Tue, 15 Aug 2023 21:32:17 +0300
Subject: [PATCH 2/5] Add UI locale selector

---
 public/index.html            | 15 ++++++++++++++-
 public/scripts/power-user.js | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/public/index.html b/public/index.html
index fcad53a20..39bd1c828 100644
--- a/public/index.html
+++ b/public/index.html
@@ -49,7 +49,8 @@
     <link rel="icon" type="image/x-icon" href="favicon.ico">
     <script>
         function applyLocale() {
-            var language = navigator.language || navigator.userLanguage;
+            const overrideLanguage = localStorage.getItem("language");
+            var language = overrideLanguage || navigator.language || navigator.userLanguage;
             language = language.toLowerCase();
             console.log(language)
             //load the appropriate language file
@@ -2484,6 +2485,18 @@
                                     </div>
                                 </div>
                             </div>
+                            <div id="UI-language-block" class="flex-container flexFlowColumn">
+                                <h4>
+                                    <span data-i18n="UI Language">UI Language</span>
+                                </h4>
+                                <div class="flex-container flexnowrap alignitemscenter">
+                                    <select id="ui_language_select" class="margin0 margin-r5">
+                                        <option value="" data-i18n="Browser default">
+                                            Browser default
+                                        </option>
+                                    </select>
+                                </div>
+                            </div>
                             <div id="UI-presets-block" class="flex-container flexFlowColumn">
                                 <h4>
                                     <span data-i18n="UI Theme Preset">UI Theme Preset</span>
diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js
index 60be1f0f6..b09827140 100644
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@@ -202,6 +202,7 @@ let movingUIPresets = [];
 let instruct_presets = [];
 
 const storage_keys = {
+    ui_language: "language",
     fast_ui_mode: "TavernAI_fast_ui_mode",
     avatar_style: "TavernAI_avatar_style",
     chat_display: "TavernAI_chat_display",
@@ -1339,8 +1340,25 @@ function doResetPanels() {
     $("#movingUIreset").trigger('click');
 }
 
+function addLanguagesToDropdown() {
+    $.getJSON('i18n.json', function (data) {
+        if (!Array.isArray(data?.lang)) {
+            return;
+        }
 
+        for (const lang of data.lang) {
+            const option = document.createElement('option');
+            option.value = lang;
+            option.innerText = lang;
+            $('#ui_language_select').append(option);
+        }
 
+        const selectedLanguage = localStorage.getItem(storage_keys.ui_language);
+        if (selectedLanguage) {
+            $('#ui_language_select').val(selectedLanguage);
+        }
+    });
+}
 
 function setAvgBG() {
     const bgimg = new Image();
@@ -2090,6 +2108,23 @@ $(document).ready(() => {
         saveSettingsDebounced();
     });
 
+    $('#ui_language_select').on('change', async function () {
+        const language = $(this).val();
+
+        if (language) {
+            localStorage.setItem(storage_keys.ui_language, language);
+            window["applyLocale"]();
+        } else {
+            const result = confirm("Are you sure you want to reset the language to default? This will reload the page.")
+            if (result) {
+                localStorage.removeItem(storage_keys.ui_language);
+                location.reload();
+            } else {
+                $(this).val(localStorage.getItem(storage_keys.ui_language));
+            }
+        }
+    })
+
     $(window).on('focus', function () {
         browser_has_focus = true;
     });
@@ -2105,4 +2140,5 @@ $(document).ready(() => {
     registerSlashCommand('cut', doMesCut, [], ' <span class="monospace">(requred number)</span> – cuts the specified message from the chat', true, true);
     registerSlashCommand('resetpanels', doResetPanels, ['resetui'], ' – resets UI panels to original state.', true, true);
     registerSlashCommand('bgcol', setAvgBG, [], ' – WIP test of auto-bg avg coloring', true, true);
+    addLanguagesToDropdown();
 });

From 4a0c93f02311b0aed376bddd873c3ba8beaeb562 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Tue, 15 Aug 2023 21:36:28 +0300
Subject: [PATCH 3/5] Show OpenRouter icon

---
 public/img/openrouter.svg | 14 ++++++++++++++
 public/script.js          | 16 ++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 public/img/openrouter.svg

diff --git a/public/img/openrouter.svg b/public/img/openrouter.svg
new file mode 100644
index 000000000..0452cf4db
--- /dev/null
+++ b/public/img/openrouter.svg
@@ -0,0 +1,14 @@
+<svg width="100%" height="100%" viewBox="0 0 512 512"
+    xmlns="http://www.w3.org/2000/svg" class="Navbar_logo__INhgK" aria-label="Logo">
+    <g clip-path="url(#clip0_205_3)">
+        <path d="M3 248.945C18 248.945 76 236 106 219C136 202 136 202 198 158C276.497 102.293 332 120.945 423 120.945" stroke-width="90"></path>
+        <path d="M511 121.5L357.25 210.268L357.25 32.7324L511 121.5Z"></path>
+        <path d="M0 249C15 249 73 261.945 103 278.945C133 295.945 133 295.945 195 339.945C273.497 395.652 329 377 420 377" stroke-width="90"></path>
+        <path d="M508 376.445L354.25 287.678L354.25 465.213L508 376.445Z"></path>
+    </g>
+    <defs>
+        <clipPath id="clip0_205_3">
+            <rect width="512" height="512"></rect>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/public/script.js b/public/script.js
index e4799b8b9..5c6d1aba1 100644
--- a/public/script.js
+++ b/public/script.js
@@ -1369,9 +1369,21 @@ function messageFormatting(mes, ch_name, isSystem, isUser) {
 function insertSVGIcon(mes, extra) {
     // Determine the SVG filename
     let modelName;
-    if (extra.api === "openai" && extra.model.toLowerCase().includes("claude")) {
+
+    // Claude on OpenRouter or Anthropic
+    if (extra.api === "openai" && extra.model?.toLowerCase().includes("claude")) {
         modelName = "claude";
-    } else {
+    }
+    // OpenAI on OpenRouter
+    else if (extra.api === "openai" && extra.model?.toLowerCase().includes("openai")) {
+        modelName = "openai";
+    }
+    // OpenRouter website model or other models
+    else if (extra.api === "openai" && (extra.model === null || extra.model?.toLowerCase().includes("/"))) {
+        modelName = "openrouter";
+    }
+    // Everything else
+    else {
         modelName = extra.api;
     }
 

From eb81c4807afa2787b480f7c9e15e25b4afdc3fd2 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Tue, 15 Aug 2023 21:32:17 +0300
Subject: [PATCH 4/5] Add UI locale selector

---
 public/index.html            | 15 ++++++++++++-
 public/scripts/power-user.js | 41 ++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/public/index.html b/public/index.html
index 58f8d72f2..23ddcb30e 100644
--- a/public/index.html
+++ b/public/index.html
@@ -48,7 +48,8 @@
     <link rel="icon" type="image/x-icon" href="favicon.ico">
     <script>
         function applyLocale() {
-            var language = navigator.language || navigator.userLanguage;
+            const overrideLanguage = localStorage.getItem("language");
+            var language = overrideLanguage || navigator.language || navigator.userLanguage;
             language = language.toLowerCase();
             console.log(language)
             //load the appropriate language file
@@ -2361,6 +2362,18 @@
                                     </div>
                                 </div>
                             </div>
+                            <div id="UI-language-block" class="flex-container flexFlowColumn">
+                                <h4>
+                                    <span data-i18n="UI Language">UI Language</span>
+                                </h4>
+                                <div class="flex-container flexnowrap alignitemscenter">
+                                    <select id="ui_language_select" class="margin0 margin-r5">
+                                        <option value="" data-i18n="Browser default">
+                                            Browser default
+                                        </option>
+                                    </select>
+                                </div>
+                            </div>
                             <div id="UI-presets-block" class="flex-container flexFlowColumn">
                                 <h4>
                                     <span data-i18n="UI Theme Preset">UI Theme Preset</span>
diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js
index b5be8be5a..4a6edd4f6 100644
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@@ -200,6 +200,7 @@ let movingUIPresets = [];
 let instruct_presets = [];
 
 const storage_keys = {
+    ui_language: "language",
     fast_ui_mode: "TavernAI_fast_ui_mode",
     avatar_style: "TavernAI_avatar_style",
     chat_display: "TavernAI_chat_display",
@@ -1301,8 +1302,25 @@ function doResetPanels() {
     $("#movingUIreset").trigger('click');
 }
 
+function addLanguagesToDropdown() {
+    $.getJSON('i18n.json', function (data) {
+        if (!Array.isArray(data?.lang)) {
+            return;
+        }
 
+        for (const lang of data.lang) {
+            const option = document.createElement('option');
+            option.value = lang;
+            option.innerText = lang;
+            $('#ui_language_select').append(option);
+        }
 
+        const selectedLanguage = localStorage.getItem(storage_keys.ui_language);
+        if (selectedLanguage) {
+            $('#ui_language_select').val(selectedLanguage);
+        }
+    });
+}
 
 function setAvgBG() {
     const bgimg = new Image();
@@ -2040,6 +2058,28 @@ $(document).ready(() => {
         saveSettingsDebounced();
     });
 
+    $('#lazy_load').on('input', function () {
+        power_user.lazy_load = Number($(this).val());
+        saveSettingsDebounced();
+    });
+
+    $('#ui_language_select').on('change', async function () {
+        const language = $(this).val();
+
+        if (language) {
+            localStorage.setItem(storage_keys.ui_language, language);
+            window["applyLocale"]();
+        } else {
+            const result = confirm("Are you sure you want to reset the language to default? This will reload the page.")
+            if (result) {
+                localStorage.removeItem(storage_keys.ui_language);
+                location.reload();
+            } else {
+                $(this).val(localStorage.getItem(storage_keys.ui_language));
+            }
+        }
+    })
+
     $(window).on('focus', function () {
         browser_has_focus = true;
     });
@@ -2055,4 +2095,5 @@ $(document).ready(() => {
     registerSlashCommand('cut', doMesCut, [], ' <span class="monospace">(requred number)</span> – cuts the specified message from the chat', true, true);
     registerSlashCommand('resetpanels', doResetPanels, ['resetui'], ' – resets UI panels to original state.', true, true);
     registerSlashCommand('bgcol', setAvgBG, [], ' – WIP test of auto-bg avg coloring', true, true);
+    addLanguagesToDropdown();
 });

From 8470acda41927a4f9d96bf5c81231a60eb30c2d4 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Tue, 15 Aug 2023 21:47:49 +0300
Subject: [PATCH 5/5] Add English language option

---
 public/index.html            |  1 +
 public/scripts/power-user.js | 13 ++++---------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/public/index.html b/public/index.html
index 23ddcb30e..22ece5dd6 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2371,6 +2371,7 @@
                                         <option value="" data-i18n="Browser default">
                                             Browser default
                                         </option>
+                                        <option value="en">en</option>
                                     </select>
                                 </div>
                             </div>
diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js
index 4a6edd4f6..f72566dda 100644
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@@ -2068,17 +2068,12 @@ $(document).ready(() => {
 
         if (language) {
             localStorage.setItem(storage_keys.ui_language, language);
-            window["applyLocale"]();
         } else {
-            const result = confirm("Are you sure you want to reset the language to default? This will reload the page.")
-            if (result) {
-                localStorage.removeItem(storage_keys.ui_language);
-                location.reload();
-            } else {
-                $(this).val(localStorage.getItem(storage_keys.ui_language));
-            }
+            localStorage.removeItem(storage_keys.ui_language);
         }
-    })
+
+        location.reload();
+    });
 
     $(window).on('focus', function () {
         browser_has_focus = true;