Merge pull request #3241 from RivelleDays/staging

Fix Missing i18n Tags & Update zh-tw.json

public/scripts/templates/changeName.html

@@ -1,5 +1,5 @@
 <div class="flex-container">
-    <h3>
+    <h3 data-i18n="Enter a new display name:">
         Enter a new display name:
     </h3>
 </div>

public/scripts/templates/createCheckpoint.html

@@ -1,8 +1,8 @@
 <div>
-    <span class="margin-right-10px">Enter Checkpoint Name:</span><small>(Leave empty to auto-generate)</small>
+    <span class="margin-right-10px" data-i18n="Enter Checkpoint Name:">Enter Checkpoint Name:</span><small data-i18n="(Leave empty to auto-generate)">(Leave empty to auto-generate)</small>
 </div>
 {{#if isReplace}}
 <div class="m-t-1">
-    <small>The currently existing checkpoint will be unlinked and replaced with the new checkpoint, but can still be found in the Chat Management.</small>
+    <small data-i18n="The currently existing checkpoint will be unlinked and replaced with the new checkpoint, but can still be found in the Chat Management.">The currently existing checkpoint will be unlinked and replaced with the new checkpoint, but can still be found in the Chat Management.</small>
 </div>
 {{/if}}

public/scripts/templates/debug.html

@@ -1,6 +1,6 @@
 <div>
     <h3 data-i18n="Debug Menu">Debug Menu</h3>
-    <div data-i18n="Debug Warning">
+    <div data-i18n="Functions in this category are for advanced users only. Don't click anything if you're not sure about the consequences.">
         Functions in this category are for advanced users only. Don't click anything if you're not sure about the consequences.
     </div>
     <table id="debug_table" class="responsiveTable">

public/scripts/templates/installExtension.html

@@ -1,7 +1,10 @@
-<h3>Enter the Git URL of the extension to install</h3>
+<h3 data-i18n="Enter the Git URL of the extension to install">Enter the Git URL of the extension to install</h3>
 <br>
-<p><b>Disclaimer:</b> Please be aware that using external extensions can have unintended side effects and may pose
-    security risks. Always make sure you trust the source before importing an extension. We are not responsible for any
-    damage caused by third-party extensions.</p>
+<p>
+  <b data-i18n="Disclaimer:">Disclaimer:</b>
+  <span data-i18n="Please be aware that using external extensions can have unintended side effects and may pose security risks. Always make sure you trust the source before importing an extension. We are not responsible for any damage caused by third-party extensions.">
+    Please be aware that using external extensions can have unintended side effects and may pose security risks. Always make sure you trust the source before importing an extension. We are not responsible for any damage caused by third-party extensions.
+  </span>
+</p>
 <br>
-<p>Example: <tt> https://github.com/author/extension-name </tt></p>
+<p><span data-i18n="Example:">Example:</span> <tt> https://github.com/author/extension-name </tt></p>

public/scripts/templates/itemizationChat.html

@@ -1,21 +1,21 @@
 <h3 class="flex-container justifyCenter alignitemscenter">
-    Prompt Itemization
+    <span data-i18n="Prompt Itemization">Prompt Itemization</span>
     <div id="showRawPrompt" class="fa-solid fa-square-poll-horizontal menu_button" title="Show Raw Prompt" data-i18n="[title]Show Raw Prompt"></div>
     <div id="copyPromptToClipboard" class="fa-solid fa-copy menu_button" title="Copy Prompt" data-i18n="[title]Copy Prompt"></div>
     <div id="diffPrevPrompt" class="fa-solid fa-code-compare menu_button" title="Show Prompt Differences" data-i18n="[title]Show Prompt Differences"></div>
 </h3>
 <div>
     <div>
-        API/Model: {{mainApiFriendlyName}} {{#if apiUsed}}({{apiUsed}}){{/if}} {{#if modelUsed}}&ndash; {{modelUsed}}{{/if}}
+        <span data-i18n="API/Model:">API/Model:</span> {{mainApiFriendlyName}} {{#if apiUsed}}({{apiUsed}}){{/if}} {{#if modelUsed}}&ndash; {{modelUsed}}{{/if}}
     </div>
     <div>
-        <small>Preset: {{presetName}}</small>
+        <small><span data-i18n="Preset:">Preset:</span> {{presetName}}</small>
         <span>|</span>
-        <small>Tokenizer: {{selectedTokenizer}}</small>
+        <small><span data-i18n="Tokenizer:">Tokenizer:</span> {{selectedTokenizer}}</small>
     </div>
 </div>
 
-<span class="tokenItemizingSubclass">
+<span class="tokenItemizingSubclass" data-i18n="Only the white numbers really matter. All numbers are estimates. Grey color items may not have been included in the context due to certain prompt format settings.">
     Only the white numbers really matter. All numbers are estimates.
     Grey color items may not have been included in the context due to certain prompt format settings.
 </span>
@@ -37,12 +37,12 @@
         <div class="flex-container wide50p">
             <div class="wide100p flex-container flexNoGap flexFlowColumn">
                 <div class="flex-container wide100p">
-                    <div class="flex1" style="color: grey;">System Info:</div>
-                    <div class=""> {{oaiSystemTokens}}</div>
+                    <div class="flex1" style="color: grey;"><span data-i18n="System Info:">System Info:</span></div>
+                    <div class="">{{oaiSystemTokens}}</div>
                 </div>
                 <div class="flex-container ">
                     <div class=" flex1 tokenItemizingSubclass">-- Chat Start: </div>
-                    <div class="tokenItemizingSubclass"> {{oaiStartTokens}}</div>
+                    <div class="tokenItemizingSubclass">{{oaiStartTokens}}</div>
                 </div>
                 <div class="flex-container ">
                     <div class=" flex1 tokenItemizingSubclass">-- Main: </div>
@@ -67,8 +67,8 @@
             </div>
             <div class="wide100p flex-container flexNoGap flexFlowColumn">
                 <div class="flex-container wide100p">
-                    <div class="flex1" style="color: indianred;">Prompt Tokens:</div>
-                    <div class=""> {{oaiPromptTokens}}</div>
+                    <div class="flex1" style="color: indianred;"><span data-i18n="Prompt Tokens:">Prompt Tokens:</span></div>
+                    <div class="">{{oaiPromptTokens}}</div>
                 </div>
                 <div class="flex-container ">
                     <div class=" flex1 tokenItemizingSubclass">-- Description: </div>
@@ -76,7 +76,7 @@
                 </div>
                 <div class="flex-container ">
                     <div class=" flex1 tokenItemizingSubclass">-- Personality:</div>
-                    <div class="tokenItemizingSubclass"> {{charPersonalityTokens}}</div>
+                    <div class="tokenItemizingSubclass">{{charPersonalityTokens}}</div>
                 </div>
                 <div class="flex-container ">
                     <div class=" flex1 tokenItemizingSubclass">-- Scenario: </div>
@@ -84,24 +84,24 @@
                 </div>
                 <div class="flex-container ">
                     <div class=" flex1 tokenItemizingSubclass">-- Examples:</div>
-                    <div class="tokenItemizingSubclass"> {{examplesStringTokens}}</div>
+                    <div class="tokenItemizingSubclass">{{examplesStringTokens}}</div>
                 </div>
                 <div class="flex-container ">
                     <div class=" flex1 tokenItemizingSubclass">-- User Persona:</div>
-                    <div class="tokenItemizingSubclass"> {{userPersonaStringTokens}}</div>
+                    <div class="tokenItemizingSubclass">{{userPersonaStringTokens}}</div>
                 </div>
             </div>
             <div class="wide100p flex-container">
-                <div class="flex1" style="color: gold;">World Info:</div>
+                <div class="flex1" style="color: gold;"><span data-i18n="World Info:">World Info:</span></div>
                 <div class="">{{worldInfoStringTokens}}</div>
             </div>
             <div class="wide100p flex-container">
-                <div class="flex1" style="color: palegreen;">Chat History:</div>
-                <div class=""> {{ActualChatHistoryTokens}}</div>
+                <div class="flex1" style="color: palegreen;"><span data-i18n="Chat History:">Chat History:</span></div>
+                <div class="">{{ActualChatHistoryTokens}}</div>
             </div>
             <div class="wide100p flex-container flexNoGap flexFlowColumn">
                 <div class="wide100p flex-container">
-                    <div class="flex1" style="color: cornflowerblue;">Extensions:</div>
+                    <div class="flex1" style="color: cornflowerblue;"><span data-i18n="Extensions:">Extensions:</span></div>
                     <div class="">{{allAnchorsTokens}}</div>
                 </div>
                 <div class="flex-container ">
@@ -110,23 +110,23 @@
                 </div>
                 <div class="flex-container ">
                     <div class=" flex1 tokenItemizingSubclass">-- Author's Note:</div>
-                    <div class="tokenItemizingSubclass"> {{authorsNoteStringTokens}}</div>
+                    <div class="tokenItemizingSubclass">{{authorsNoteStringTokens}}</div>
                 </div>
                 <div class="flex-container ">
                     <div class=" flex1 tokenItemizingSubclass">-- Smart Context:</div>
-                    <div class="tokenItemizingSubclass"> {{smartContextStringTokens}}</div>
+                    <div class="tokenItemizingSubclass">{{smartContextStringTokens}}</div>
                 </div>
                 <div class="flex-container ">
                     <div class=" flex1 tokenItemizingSubclass">-- Vector Storage (Chats):</div>
-                    <div class="tokenItemizingSubclass"> {{chatVectorsStringTokens}}</div>
+                    <div class="tokenItemizingSubclass">{{chatVectorsStringTokens}}</div>
                 </div>
                 <div class="flex-container ">
                     <div class=" flex1 tokenItemizingSubclass">-- Vector Storage (Data Bank):</div>
-                    <div class="tokenItemizingSubclass"> {{dataBankVectorsStringTokens}}</div>
+                    <div class="tokenItemizingSubclass">{{dataBankVectorsStringTokens}}</div>
                 </div>
             </div>
             <div class="wide100p flex-container">
-                <div class="flex1" style="color: mediumpurple;">&lcub;&lcub;&rcub;&rcub; Bias:</div>
+                <div class="flex1" style="color: mediumpurple;"><span>&lcub;&lcub;&rcub;&rcub;</span> <span data-i18n="Bias:">Bias:</span></div>
                 <div class="">{{oaiBiasTokens}}</div>
             </div>
         </div>
@@ -135,11 +135,11 @@
     <hr>
     <div class="wide100p flex-container flexFlowColumns">
         <div class="flex-container wide100p">
-            <div class="flex1">Total Tokens in Prompt:</div>
-            <div class=""> {{finalPromptTokens}}</div>
+            <div class="flex1"><span data-i18n="Total Tokens in Prompt:">Total Tokens in Prompt:</span></div>
+            <div class="">{{finalPromptTokens}}</div>
         </div>
         <div class="flex-container wide100p">
-            <div class="flex1">Max Context (Context Size - Response Length):</div>
+            <div class="flex1"><span data-i18n="Max Context">Max Context</span>&nbsp;<small data-i18n="(Context Size - Response Length)">(Context Size - Response Length)</small><span data-i18n=":">:</span></div>
             <div class="">{{thisPrompt_max_context}}</div>
         </div>
     </div>

public/scripts/templates/masterExport.html

@@ -1,4 +1,4 @@
-<h3>
+<h3 data-i18n="Choose what to export">
     Choose what to export
 </h3>
 <div class="flex-container flexFlowColumn justifyLeft">

public/scripts/templates/masterImport.html

@@ -1,4 +1,4 @@
-<h3>
+<h3 data-i18n="Choose what to import">
     Choose what to import
 </h3>
 <div class="flex-container flexFlowColumn justifyLeft">

public/scripts/templates/resetSettings.html

@@ -6,7 +6,7 @@
         Don't forget to save a snapshot of your settings before proceeding.
     </div>
     <hr>
-    <div>
+    <div data-i18n="Enter your password below to confirm:">
         Enter your password below to confirm:
     </div>
     <input id="resetSettingsPassword" name="password" type="password" class="text_pole" placeholder="Password">

public/scripts/templates/scenarioOverride.html

@@ -5,10 +5,10 @@
             class="menu_button fa-solid fa-trash-can remove_scenario_override"></div>
     </div>
     <div class="range-block-counter justifyLeft flex-container flexFlowColumn">
-        <strong>Unique to this chat.</strong>
-        <span data-group="true">All group members will use the following scenario text instead of what is specified in their character cards.</span>
-        <span data-character="true">The following scenario text will be used instead of the value set in the character card.</span>
-        Checkpoints inherit the scenario override from their parent, and can be changed individually after that.
+        <strong data-i18n="Unique to this chat.">Unique to this chat.</strong>
+        <span data-group="true" data-i18n="All group members will use the following scenario text instead of what is specified in their character cards.">All group members will use the following scenario text instead of what is specified in their character cards.</span>
+        <span data-character="true" data-i18n="The following scenario text will be used instead of the value set in the character card.">The following scenario text will be used instead of the value set in the character card.</span>
+        <span data-i18n="Checkpoints inherit the scenario override from their parent, and can be changed individually after that.">Checkpoints inherit the scenario override from their parent, and can be changed individually after that.</span>
     </div>
     <div class="range-block-range wide100p">
         <textarea class="wide100p chat_scenario" class="text_pole" rows="15" data-i18n="[placeholder]Type here..."

public/scripts/templates/themeDelete.html

@@ -1,3 +1,4 @@
 <div>
-    Are you sure you want to delete the theme "{{themeName}}"?
+    <div data-i18n="Are you sure you want to delete the theme?">Are you sure you want to delete the theme?</div>
+    <b>"{{themeName}}"<b>
 </div>

public/scripts/templates/userReset.html

@@ -1,12 +1,13 @@
 <form action="javascript:void(0);" class="flex-container flexFlowColumn">
-    <h3 class="neutral_warning">
+    <h3 class="neutral_warning" data-i18n="This will delete all your settings and data. There will be no undo button. Make sure you have a backup before proceeding.">
         This will delete all your settings and data. There will be no undo button.
         Make sure you have a backup before proceeding.
     </h3>
     <hr>
-    <div>
+    <div data-i18n="Account reset code has been posted to the server console.">
         Account reset code has been posted to the server console.
     </div>
+    <br>
     <div class="currentPasswordBlock">
         <label data-i18n="Current Password:" for="user">Current Password:</label>
         <input type="password" name="password" class="text_pole" placeholder="[ No password ]" autocomplete="current-password">