@geogirafe/lib-geoportal 1.2.0-dev.2775426316 → 1.2.0-dev.2776642665

package/assets/i18n/de.json

@@ -32,6 +32,7 @@
     "Basemap visible": "Hintergrundkartenauswahl sichtbar",
     "Basemaps": "Hintergrundkarten",
     "Batch creation mode": "Batch-Modus",
+    "Browser or application default": "Browser- oder Applikationseinstellung",
     "Build": "Build",
     "by selecting a theme": "wählen Sie ein Thema",
     "Cancel": "Abbrechen",

package/assets/i18n/en.json

@@ -32,6 +32,7 @@
     "Basemap visible": "Basemap selection visible",
     "Basemaps": "Basemaps",
     "Batch creation mode": "Batch creation mode",
+    "Browser or application default": "Browser or application default",
     "Build": "Build",
     "by selecting a theme": "by selecting a theme",
     "Cancel": "Cancel",

package/assets/i18n/fr.json

@@ -32,6 +32,7 @@
     "Basemap visible": "Sélection de la carte de base visible",
     "Basemaps": "Fonds de carte",
     "Batch creation mode": "mode batch",
+    "Browser or application default": "Paramètres du navigateur ou de l'application",
     "Build": "Build",
     "by selecting a theme": "en sélectionnant un thème",
     "Cancel": "Annuler",

package/assets/i18n/it.json

@@ -32,6 +32,7 @@
     "Basemap visible": "Selezione mappa di base visibile",
     "Basemaps": "Mappe di base",
     "Batch creation mode": "Modalità di creazione batch",
+    "Browser or application default": "Impostazioni del browser o dell'applicazione",
     "Build": "Build",
     "by selecting a theme": "selezionando un tema",
     "Cancel": "Annulla",

package/components/userpreferences/component.d.ts

@@ -30,6 +30,7 @@ export default class UserPreferencesComponent extends GirafeHTMLElement implemen
      For preferences that have options to choose from, readout all possible select options to show in the dropdowns
      */
     private initPreferenceOptions;
+    private refreshLanguageOptions;
     /**
      * Collect all possible options for the default theme preference. This has to be repeatable, since the user
      * can create new custom themes at any time.
@@ -71,10 +72,6 @@ export default class UserPreferencesComponent extends GirafeHTMLElement implemen
      Save the user preference as a config override in user data storage
      */
     private updatePreferenceInStorage;
-    /**
-     Delete user preference in the local browser storage
-     */
-    private deletePreferenceInStorage;
     /**
      * Reset user preferences back to defaults. This will delete the configOverrides object in storage and set the
      * current state back to the defaults from config.json

package/components/userpreferences/component.js

@@ -37,7 +37,15 @@ ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
     initPreferences() {
         // Define all settings that the user can change
         this.preferences = {
-            language: new UserPreference('languages.defaultLanguage', 'language', 'system', 'select'),
+            language: new UserPreference('languages.userLanguage', 'language', 'system', 'select', (lang) => {
+                if (lang === null) {
+                    // No user preference, reset language to default
+                    return this.context.stateManager.decideLanguage();
+                }
+                else {
+                    return lang;
+                }
+            }),
             logLevel: new UserPreference('general.logLevel', null, 'system', 'select'),
             theme: new UserPreference('themes.defaultTheme', 'theme', 'map', 'select', (themeName) => {
                 const themeId = Object.keys(this.state.themes._allThemes).find((themeKey) => this.state.themes._allThemes[Number(themeKey)].name === themeName);
@@ -72,8 +80,8 @@ ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
                 delete this.preferences[key];
             }
         }
-        this.subscribe('themes.isLoaded', (_, isLoaded) => {
-            if (isLoaded) {
+        this.subscribe('application.isReady', (_, isReady) => {
+            if (isReady) {
                 this.initPreferenceOptions();
                 this.initCurrentPreferenceValues();
                 this.initDarkModeDefaults();
@@ -127,11 +135,7 @@ ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
      For preferences that have options to choose from, readout all possible select options to show in the dropdowns
      */
     initPreferenceOptions() {
-        if (this.preferences.language) {
-            this.preferences.language.options = Object.keys(this.context.configManager.Config.languages.translations).map((key) => {
-                return { label: key, value: key };
-            });
-        }
+        this.refreshLanguageOptions();
         if (this.preferences.logLevel) {
             this.preferences.logLevel.options = [
                 { label: 'debug', value: 'debug' },
@@ -172,6 +176,19 @@ ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
             ];
         }
     }
+    refreshLanguageOptions() {
+        if (this.preferences.language) {
+            this.preferences.language.options = Object.keys(this.context.configManager.Config.languages.translations).map((key) => {
+                return { label: key, value: key };
+            });
+            const defaultOptionLabel = this.context.i18nManager.getTranslation('Browser or application default');
+            const fallbackLanguage = this.context.i18nManager.getTranslation(this.context.stateManager.fallbackLanguage() ?? '?');
+            this.preferences.language.options = [
+                { label: `${defaultOptionLabel} (${fallbackLanguage})`, value: null },
+                ...this.preferences.language.options
+            ];
+        }
+    }
     /**
      * Collect all possible options for the default theme preference. This has to be repeatable, since the user
      * can create new custom themes at any time.
@@ -238,6 +255,10 @@ ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
             this.refreshThemeOptions();
             this.refreshRender();
         }
+        else if (preferenceKey === 'language') {
+            this.refreshLanguageOptions();
+            this.refreshRender();
+        }
     }
     /**
      Called when user changes a preference in the panel
@@ -285,12 +306,6 @@ ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
         // Values are saved under 'configOverrides' in the same structure as in the config
         this.context.userDataManager.saveUserData(`${this.storagePath}.${preference.configPath}`, preference.currentValue);
     }
-    /**
-     Delete user preference in the local browser storage
-     */
-    deletePreferenceInStorage(preferenceKey) {
-        this.context.userDataManager.deleteUserData(`${this.storagePath}.${this.preferences[preferenceKey].configPath}`);
-    }
     /**
      * Reset user preferences back to defaults. This will delete the configOverrides object in storage and set the
      * current state back to the defaults from config.json
@@ -302,8 +317,8 @@ ${this.htmlUnsafe(this.feedbackTemplateHtml ?? '')}`;
         }
     }
     resetAll() {
+        this.context.userDataManager.deleteUserData(this.storagePath);
         for (const preferenceKey in this.preferences) {
-            this.deletePreferenceInStorage(preferenceKey);
             this.preferences[preferenceKey].currentValue = this.context.configManager.getDefaultConfigValue(this.preferences[preferenceKey].configPath);
             this.updatePreferenceInState(preferenceKey);
             this.updatePreferenceInConfig(preferenceKey);

package/package.json

@@ -5,7 +5,7 @@
     "name": "GeoGirafe PSC",
     "url": "https://doc.geogirafe.org"
   },
-  "version": "1.2.0-dev.2775426316",
+  "version": "1.2.0-dev.2776642665",
   "type": "module",
   "engines": {
     "node": ">=20.19.0"

package/templates/public/about.json

@@ -1 +1 @@
-{"version":"1.2.0-dev.2775426316", "build":"2775426316", "date":"20/08/2026"}
+{"version":"1.2.0-dev.2776642665", "build":"2776642665", "date":"20/08/2026"}

package/tools/configuration/girafeconfig.d.ts

@@ -14,6 +14,7 @@ declare class GirafeConfig {
             [key: string]: string[];
         };
         defaultLanguage: string;
+        userLanguage: string | null;
     };
     interface: {
         defaultSelectionComponent: string;

package/tools/configuration/girafeconfig.js

@@ -339,6 +339,7 @@ class GirafeConfig {
         if (!config.languages) {
             throw new Error(`Configuration for languages is required. See https://doc.geogirafe.org/docs/configuration.`);
         }
+        config.languages.userLanguage = config.languages.userLanguage ?? null;
         return config.languages;
     }
     initConfigInterface(config) {

package/tools/state/statemanager.d.ts

@@ -10,6 +10,15 @@ declare class StateManager extends GirafeSingleton {
     constructor(context: IGirafeContext);
     initializeSingleton(): void;
     private setDefaultValues;
+    /**
+     * Get the language based on the following priority:
+     * 1. user preferences, 2. browser language, 3. app default language
+     */
+    decideLanguage(): string | null;
+    /**
+     * The fallback language is based on the browser language or app default language
+     */
+    fallbackLanguage(): string | null;
     private onChange;
     subscribe(path: string, callback: Callback): Callback;
     subscribe(path: RegExp, callback: Callback): Callback;

package/tools/state/statemanager.js

@@ -26,10 +26,32 @@ class StateManager extends GirafeSingleton {
         if (this.state && config) {
             this.state.application.isConfigurationLoaded = true;
             this.state.projection = config.map.srid;
-            this.state.language = config.languages.defaultLanguage;
+            this.state.language = this.decideLanguage();
             this.state.interface.selectionComponent = config.interface.defaultSelectionComponent;
         }
     }
+    /**
+     * Get the language based on the following priority:
+     * 1. user preferences, 2. browser language, 3. app default language
+     */
+    decideLanguage() {
+        return this.context.configManager.Config?.languages.userLanguage ?? this.fallbackLanguage();
+    }
+    /**
+     * The fallback language is based on the browser language or app default language
+     */
+    fallbackLanguage() {
+        const languageConfig = this.context.configManager.Config?.languages;
+        if (!languageConfig) {
+            return null;
+        }
+        const browserLanguage = navigator.language.toLowerCase();
+        const languageCode = browserLanguage.substring(0, 2);
+        if (Object.keys(languageConfig.translations).includes(languageCode)) {
+            return languageCode;
+        }
+        return languageConfig.defaultLanguage;
+    }
     onChange(property, oldValue, value, parents) {
         const path = property.trim();
         for (const key in this.callbacks) {