OpenHAB
/
openhab-webui
mirror of https://github.com/openhab/openhab-webui.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Setup wizard: Fix already set i18n settings not respected (#2559) 

Fixes https://github.com/openhab/openhab-core/issues/4105.

The setup wizard did not respect the i18n config file's content, which
resulted in overwriting the existing i18n settings.

Signed-off-by: Florian Hotze <florianh_dev@icloud.com>
pull/2560/head
Florian Hotze 2024-05-02 14:42:06 +02:00 committed by GitHub
parent 6f5a59f57e
commit 9d89146705
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bundles/org.openhab.ui/web/src/pages/wizards/setup-wizard.vue
View File

@ -505,8 +505,7 @@ export default {
this.availableLanguages = data[0].parameters.find(p => p.name === 'language').options
this.availableRegions = data[0].parameters.find(p => p.name === 'region').options
this.availableTimezones = data[0].parameters.find(p => p.name === 'timezone').options
if (data[1].region) this.region = data[1].region
if (data[1].location) this.location = data[1].location
if (Intl && Intl.DateTimeFormat().resolvedOptions()) {
const intlOptions = Intl.DateTimeFormat().resolvedOptions()
if (intlOptions.locale) {
@ -516,8 +515,14 @@ export default {
if (intlOptions.timeZone) {
if (this.availableTimezones.find((tz) => tz.value === intlOptions.timeZone)) this.timezone = intlOptions.timeZone
}
this.i18nReady = true
}
if (data[1].language) this.language = data[1].language
if (data[1].location) this.location = data[1].location
if (data[1].region) this.region = data[1].region
if (data[1].timezone) this.timezone = data[1].timezone
this.i18nReady = true
})
this.$oh.api.get('/rest/addons/suggestions').then((suggestedAddons) => {
const suggestions = suggestedAddons.flatMap(s => s.id)