rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into char-find-and-sendas-extended

Browse Source
This commit is contained in:
Wolfsblvt
2024-09-29 00:41:34 +02:00
parent 0be48c567a 14b48c5b34
commit 5295c4c023
8 changed files with 86 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/scripts/extensions/connection-manager/edit.html
View File

@@ -8,5 +8,5 @@
</label>
{{/each}}
</div>
<h3>Profile name:</h3>
<h3 data-i18n="Profile name:">Profile name:</h3>
</div>

8
public/scripts/extensions/connection-manager/index.js
View File

@@ -10,6 +10,7 @@ import { enumTypes, SlashCommandEnumValue } from '../../slash-commands/SlashComm
import { SlashCommandParser } from '../../slash-commands/SlashCommandParser.js';
import { SlashCommandScope } from '../../slash-commands/SlashCommandScope.js';
import { collapseSpaces, getUniqueName, isFalseBoolean, uuidv4 } from '../../utils.js';
import { t } from '../../i18n.js';
const MODULE_NAME = 'connection-manager';
const NONE = '<None>';
@@ -284,7 +285,7 @@ async function deleteConnectionProfile() {
}
const name = extension_settings.connectionManager.profiles[index].name;
const confirm = await Popup.show.confirm('Are you sure you want to delete the selected profile?', name);
const confirm = await Popup.show.confirm(t`Are you sure you want to delete the selected profile?`, name);
if (!confirm) {
return;
@@ -398,7 +399,7 @@ async function renderDetailsContent(detailsContent) {
const template = await renderExtensionTemplateAsync(MODULE_NAME, 'view', templateParams);
detailsContent.innerHTML = template;
} else {
detailsContent.textContent = 'No profile selected';
detailsContent.textContent = t`No profile selected`;
}
}
@@ -518,7 +519,6 @@ async function renderDetailsContent(detailsContent) {
console.log('No profile selected');
return;
}
if (!Array.isArray(profile.exclude)) {
profile.exclude = [];
}
@@ -534,7 +534,7 @@ async function renderDetailsContent(detailsContent) {
const template = $(await renderExtensionTemplateAsync(MODULE_NAME, 'edit', { name: profile.name, settings }));
const newName = await callGenericPopup(template, POPUP_TYPE.INPUT, profile.name, {
customButtons: [{
text: 'Save and Update',
text: t`Save and Update`,
classes: ['popup-button-ok'],
result: POPUP_RESULT.AFFIRMATIVE,
action: () => {

6
public/scripts/templates/worldInfoKeywordHeaders.html
View File

@@ -1,8 +1,8 @@
<div id="WIEntryHeaderTitlesPC" class="flex-container wide100p spaceBetween justifyCenter textAlignCenter" style="padding:0 4.5em;">
<small class="flex1" data-i18n="Title/Memo">Title/Memo</small>
<small style="width: calc(3.5em + 15px)" data-i18n="Strategy">Strategy</small>
<small style="width: calc(3.5em + 30px)" data-i18n="Position">Position</small>
<small style="width: calc(3.5em + 20px)" data-i18n="Depth">Depth</small>
<small style="width: calc(3.5em + 10px)" data-i18n="Strategy">Strategy</small>
<small style="width: calc(3.5em + 20px)" data-i18n="Position">Position</small>
<small style="width: calc(3.5em + 15px)" data-i18n="Depth">Depth</small>
<small style="width: calc(3.5em + 20px)" data-i18n="Order">Order</small>
<small style="width: calc(3.5em + 15px)" data-i18n="Trigger %">Trigger %</small>
</div>