Merge branch 'release' into staging

This commit is contained in:
Cohee 2023-08-15 21:51:08 +03:00
commit fa35e1185e
2 changed files with 5 additions and 9 deletions

View File

@ -2494,6 +2494,7 @@
<option value="" data-i18n="Browser default">
Browser default
</option>
<option value="en">en</option>
</select>
</div>
</div>

View File

@ -2113,17 +2113,12 @@ $(document).ready(() => {
if (language) {
localStorage.setItem(storage_keys.ui_language, language);
window["applyLocale"]();
} else {
const result = confirm("Are you sure you want to reset the language to default? This will reload the page.")
if (result) {
localStorage.removeItem(storage_keys.ui_language);
location.reload();
} else {
$(this).val(localStorage.getItem(storage_keys.ui_language));
}
localStorage.removeItem(storage_keys.ui_language);
}
})
location.reload();
});
$(window).on('focus', function () {
browser_has_focus = true;