Merge pull request #138 from SondreNjaastad/base

Presist language user_preference
This commit is contained in:
Nariman Jelveh 2024-03-19 09:45:47 -07:00 committed by GitHub
commit 6e5b97dd1f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 8 deletions

View File

@ -503,6 +503,7 @@ async function UIDesktop(options){
// update local user preferences
const user_preferences = {
show_hidden_files: (await puter.kv.get('user_preferences.show_hidden_files')) === 'true',
language: (await puter.kv.get('user_preferences.language'))
};
update_user_preferences(user_preferences);

View File

@ -722,6 +722,7 @@ window.mutate_user_preferences = function(user_preferences_delta) {
window.update_user_preferences = function(user_preferences) {
window.user_preferences = user_preferences;
localStorage.setItem('user_preferences', JSON.stringify(user_preferences));
window.locale = user_preferences.language;
}
window.sendWindowWillCloseMsg = function(iframe_element) {

View File

@ -10,11 +10,8 @@ window.i18n = function (key, replacements = [], encode_html = true) {
replacements = [replacements];
}
// if locale is not set, default to en
if(!translations[window.locale])
window.locale = 'en';
let str = translations[window.locale].dictionary[key];
let language = translations[window.locale] ?? translations['en'];
let str = language.dictionary[key] ?? translations['en'].dictionary[key];
if (!str) {
str = key;

View File

@ -46,9 +46,6 @@ window.initgui = async function(){
if(window.api_origin && puter.APIOrigin !== window.api_origin)
puter.setAPIOrigin(api_origin);
// determine locale
window.locale = window.user_preferences.language;
// Checks the type of device the user is on (phone, tablet, or desktop).
// Depending on the device type, it sets a class attribute on the body tag
// to style or script the page differently for each device type.