Merge branch 'staging' into chid-unify-type

b3eb6e071f5b63f89b9cdade151eed66f1a669f0

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: 12335f48609b86a8a6d28f48b146ce22dbd8784f 40720971c540434b83e81efdbfc1854fbb003bd7
3 files changed, +15 -9Showing whitespace changes
public/index.html+7 -7
@@ -4153,7 +4153,7 @@
41534153 </div>
41544154 <div id="UI-language-block" class="flex-container alignItemsBaseline">
41554155 <span data-i18n="UI Language">Language:</span>
41564156 <select id="ui_language_select" class="flex1 margin0 text_pole">
41574157 <option value="" data-i18n="Default">Default</option>
41584158 <option value="en">English</option>
41594159 </select>
@@ -5388,17 +5388,17 @@
53885388 </div>
53895389 </div>
53905390 <div id="GroupFavDelOkBack" class="flex-container flexGap5 spaceEvenly flex1">
53915391 <div id="rm_button_back_from_group" class="heightFitContent margin0 menu_button fa-solid fa-fw fa-left-long"></div>
53925392 <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>
53935393 <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>
53945394 <input id="rm_group_fav" type="hidden" />
53955395 <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.">
53965396 <i id="group_media_allowed_icon" class="fa-solid fa-fw fa-link"></i>
53975397 <i id="group_media_forbidden_icon" class="fa-solid fa-fw fa-link-slash"></i>
53985398 </div>
53995399 <div id="rm_group_submit" class="heightFitContent margin0 menu_button fa-solid fa-fw fa-check" title="Create" data-i18n="[title]Create"></div>
54005400 <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>
54015401 <div id="rm_group_delete" class="heightFitContent margin0 menu_button fa-solid fa-fw fa-trash-can" title="Delete" data-i18n="[title]Delete"></div>
54025402 <div class="flex1">
54035403 <label class="checkbox_label whitespacenowrap">
54045404 <input id="rm_group_allow_self_responses" type="checkbox" />
public/script.js+2 -0
@@ -7697,6 +7697,7 @@ export function select_selected_character(chid) {
76977697 $('#create_button').attr('value', 'Save'); // what is the use case for this?
76987698 $('#dupe_button').show();
76997699 $('#create_button_label').css('display', 'none');
7700+ $('#char_connections_button').show();
77007701
77017702 // Hide the chat scenario button if we're peeking the group member defs
77027703 $('#set_chat_scenario').toggle(!selected_group);
@@ -7781,6 +7782,7 @@ function select_rm_create() {
77817782 $('#create_button_label').css('display', '');
77827783 $('#create_button').attr('value', 'Create');
77837784 $('#dupe_button').hide();
7785+ $('#char_connections_button').hide();
77847786
77857787 //create text poles
77867788 $('#rm_button_back').css('display', '');
public/scripts/i18n.js+6 -2
@@ -132,10 +132,14 @@ async function getLocaleData(language) {
132132 return data;
133133}
134134
135+/**
136+ * Gets a language object for the given language code.
137+ * @param {string} language Language code
138+ */
135139function findLang(language) {
136140 varconst supportedLang = langs.find(x => x.lang === language);
137141
138142 if (!supportedLang && language !== 'en') {
139143 console.warn(`Unsupported language: ${language}`);
140144 }
141145 return supportedLang;