Merge branch 'staging' into chid-unify-type

b3eb6e071f5b63f89b9cdade151eed66f1a669f0

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

Parents: 12335f48609b86a8a6d28f48b146ce22dbd8784f 40720971c540434b83e81efdbfc1854fbb003bd7
3 files changed, +15 -9Ignore whitespace
public/index.html+7 -7
@@ -4153,7 +4153,7 @@
4153 </div>4153 </div>
4154 <div id="UI-language-block" class="flex-container alignItemsBaseline">4154 <div id="UI-language-block" class="flex-container alignItemsBaseline">
4155 <span data-i18n="UI Language">Language:</span>4155 <span data-i18n="UI Language">Language:</span>
4156 <select id="ui_language_select" class="flex1 margin0">4156 <select id="ui_language_select" class="flex1 margin0 text_pole">
4157 <option value="" data-i18n="Default">Default</option>4157 <option value="" data-i18n="Default">Default</option>
4158 <option value="en">English</option>4158 <option value="en">English</option>
4159 </select>4159 </select>
@@ -5388,17 +5388,17 @@
5388 </div>5388 </div>
5389 </div>5389 </div>
5390 <div id="GroupFavDelOkBack" class="flex-container flexGap5 spaceEvenly flex1">5390 <div id="GroupFavDelOkBack" class="flex-container flexGap5 spaceEvenly flex1">
5391 <div id="rm_button_back_from_group" class="heightFitContent margin0 menu_button fa-solid fa-left-long"></div>5391 <div id="rm_button_back_from_group" class="heightFitContent margin0 menu_button fa-solid fa-fw fa-left-long"></div>
5392 <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>5392 <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>
5393 <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>5393 <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>
5394 <input id="rm_group_fav" type="hidden" />5394 <input id="rm_group_fav" type="hidden" />
5395 <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.">5395 <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.">
5396 <i id="group_media_allowed_icon" class="fa-solid fa-fw fa-link"></i>5396 <i id="group_media_allowed_icon" class="fa-solid fa-fw fa-link"></i>
5397 <i id="group_media_forbidden_icon" class="fa-solid fa-fw fa-link-slash"></i>5397 <i id="group_media_forbidden_icon" class="fa-solid fa-fw fa-link-slash"></i>
5398 </div>5398 </div>
5399 <div id="rm_group_submit" class="heightFitContent margin0 menu_button fa-solid fa-check" title="Create" data-i18n="[title]Create"></div>5399 <div id="rm_group_submit" class="heightFitContent margin0 menu_button fa-solid fa-fw fa-check" title="Create" data-i18n="[title]Create"></div>
5400 <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>5400 <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>
5401 <div id="rm_group_delete" class="heightFitContent margin0 menu_button fa-solid fa-trash-can" title="Delete" data-i18n="[title]Delete"></div>5401 <div id="rm_group_delete" class="heightFitContent margin0 menu_button fa-solid fa-fw fa-trash-can" title="Delete" data-i18n="[title]Delete"></div>
5402 <div class="flex1">5402 <div class="flex1">
5403 <label class="checkbox_label whitespacenowrap">5403 <label class="checkbox_label whitespacenowrap">
5404 <input id="rm_group_allow_self_responses" type="checkbox" />5404 <input id="rm_group_allow_self_responses" type="checkbox" />
public/script.js+2 -0
@@ -7697,6 +7697,7 @@ export function select_selected_character(chid) {
7697 $('#create_button').attr('value', 'Save'); // what is the use case for this?7697 $('#create_button').attr('value', 'Save'); // what is the use case for this?
7698 $('#dupe_button').show();7698 $('#dupe_button').show();
7699 $('#create_button_label').css('display', 'none');7699 $('#create_button_label').css('display', 'none');
7700 $('#char_connections_button').show();
77007701
7701 // Hide the chat scenario button if we're peeking the group member defs7702 // Hide the chat scenario button if we're peeking the group member defs
7702 $('#set_chat_scenario').toggle(!selected_group);7703 $('#set_chat_scenario').toggle(!selected_group);
@@ -7781,6 +7782,7 @@ function select_rm_create() {
7781 $('#create_button_label').css('display', '');7782 $('#create_button_label').css('display', '');
7782 $('#create_button').attr('value', 'Create');7783 $('#create_button').attr('value', 'Create');
7783 $('#dupe_button').hide();7784 $('#dupe_button').hide();
7785 $('#char_connections_button').hide();
77847786
7785 //create text poles7787 //create text poles
7786 $('#rm_button_back').css('display', '');7788 $('#rm_button_back').css('display', '');
public/scripts/i18n.js+6 -2
@@ -132,10 +132,14 @@ async function getLocaleData(language) {
132 return data;132 return data;
133}133}
134134
135/**
136 * Gets a language object for the given language code.
137 * @param {string} language Language code
138 */
135function findLang(language) {139function findLang(language) {
136 var supportedLang = langs.find(x => x.lang === language);140 const supportedLang = langs.find(x => x.lang === language);
137141
138 if (!supportedLang) {142 if (!supportedLang && language !== 'en') {
139 console.warn(`Unsupported language: ${language}`);143 console.warn(`Unsupported language: ${language}`);
140 }144 }
141 return supportedLang;145 return supportedLang;