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 chid-unify-type

Browse Source
This commit is contained in:
Cohee
2025-02-28 22:04:14 +02:00
parent 12335f4860 40720971c5
commit b3eb6e071f
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/index.html
View File

@@ -4153,7 +4153,7 @@
</div> </div>
<div id="UI-language-block" class="flex-container alignItemsBaseline"> <div id="UI-language-block" class="flex-container alignItemsBaseline">
<span data-i18n="UI Language">Language:</span> <span data-i18n="UI Language">Language:</span>
<select id="ui_language_select" class="flex1 margin0"> <select id="ui_language_select" class="flex1 margin0 text_pole">
<option value="" data-i18n="Default">Default</option> <option value="" data-i18n="Default">Default</option>
<option value="en">English</option> <option value="en">English</option>
</select> </select>
@@ -5388,17 +5388,17 @@
</div> </div>
</div> </div>
<div id="GroupFavDelOkBack" class="flex-container flexGap5 spaceEvenly flex1"> <div id="GroupFavDelOkBack" class="flex-container flexGap5 spaceEvenly flex1">
<div id="rm_button_back_from_group" class="heightFitContent margin0 menu_button fa-solid fa-left-long"></div> <div id="rm_button_back_from_group" class="heightFitContent margin0 menu_button fa-solid fa-fw fa-left-long"></div>
<div id="rm_group_scenario" class="heightFitContent margin0 menu_button fa-solid fa-scroll" title="Set a group chat scenario" data-i18n="[title]Set a group chat scenario"></div> <div id="rm_group_scenario" class="heightFitContent margin0 menu_button fa-solid fa-fw fa-scroll" title="Set a group chat scenario" data-i18n="[title]Set a group chat scenario"></div>
<div id="group_favorite_button" class="heightFitContent margin0 menu_button fa-solid fa-star" title="Add to Favorites" data-i18n="[title]Add to Favorites"></div> <div id="group_favorite_button" class="heightFitContent margin0 menu_button fa-solid fa-fw fa-star" title="Add to Favorites" data-i18n="[title]Add to Favorites"></div>
<input id="rm_group_fav" type="hidden" /> <input id="rm_group_fav" type="hidden" />
<div id="group_open_media_overrides" class="heightFitContent margin0 menu_button menu_button_icon open_media_overrides" title="Click to allow/forbid the use of external media for this group." data-i18n="[title]Click to allow/forbid the use of external media for this group."> <div id="group_open_media_overrides" class="heightFitContent margin0 menu_button menu_button_icon open_media_overrides" title="Click to allow/forbid the use of external media for this group." data-i18n="[title]Click to allow/forbid the use of external media for this group.">
<i id="group_media_allowed_icon" class="fa-solid fa-fw fa-link"></i> <i id="group_media_allowed_icon" class="fa-solid fa-fw fa-link"></i>
<i id="group_media_forbidden_icon" class="fa-solid fa-fw fa-link-slash"></i> <i id="group_media_forbidden_icon" class="fa-solid fa-fw fa-link-slash"></i>
</div> </div>
<div id="rm_group_submit" class="heightFitContent margin0 menu_button fa-solid fa-check" title="Create" data-i18n="[title]Create"></div> <div id="rm_group_submit" class="heightFitContent margin0 menu_button fa-solid fa-fw fa-check" title="Create" data-i18n="[title]Create"></div>
<div id="rm_group_restore_avatar" class="heightFitContent margin0 menu_button fa-solid fa-images" title="Restore collage avatar" data-i18n="[title]Restore collage avatar"></div> <div id="rm_group_restore_avatar" class="heightFitContent margin0 menu_button fa-solid fa-fw fa-images" title="Restore collage avatar" data-i18n="[title]Restore collage avatar"></div>
<div id="rm_group_delete" class="heightFitContent margin0 menu_button fa-solid fa-trash-can" title="Delete" data-i18n="[title]Delete"></div> <div id="rm_group_delete" class="heightFitContent margin0 menu_button fa-solid fa-fw fa-trash-can" title="Delete" data-i18n="[title]Delete"></div>
<div class="flex1"> <div class="flex1">
<label class="checkbox_label whitespacenowrap"> <label class="checkbox_label whitespacenowrap">
<input id="rm_group_allow_self_responses" type="checkbox" /> <input id="rm_group_allow_self_responses" type="checkbox" />

2
public/script.js
View File

@@ -7697,6 +7697,7 @@ export function select_selected_character(chid) {
$('#create_button').attr('value', 'Save'); // what is the use case for this? $('#create_button').attr('value', 'Save'); // what is the use case for this?
$('#dupe_button').show(); $('#dupe_button').show();
$('#create_button_label').css('display', 'none'); $('#create_button_label').css('display', 'none');
$('#char_connections_button').show();
// Hide the chat scenario button if we're peeking the group member defs // Hide the chat scenario button if we're peeking the group member defs
$('#set_chat_scenario').toggle(!selected_group); $('#set_chat_scenario').toggle(!selected_group);
@@ -7781,6 +7782,7 @@ function select_rm_create() {
$('#create_button_label').css('display', ''); $('#create_button_label').css('display', '');
$('#create_button').attr('value', 'Create'); $('#create_button').attr('value', 'Create');
$('#dupe_button').hide(); $('#dupe_button').hide();
$('#char_connections_button').hide();
//create text poles //create text poles
$('#rm_button_back').css('display', ''); $('#rm_button_back').css('display', '');

8
public/scripts/i18n.js
View File

@@ -132,10 +132,14 @@ async function getLocaleData(language) {
return data; return data;
} }
/**
* Gets a language object for the given language code.
* @param {string} language Language code
*/
function findLang(language) { function findLang(language) {
var supportedLang = langs.find(x => x.lang === language); const supportedLang = langs.find(x => x.lang === language);
if (!supportedLang) { if (!supportedLang && language !== 'en') {
console.warn(`Unsupported language: ${language}`); console.warn(`Unsupported language: ${language}`);
} }
return supportedLang; return supportedLang;