From 4a6d79cb657cdf98ca9f43c39c0dc45b28bfb904 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Tue, 26 Dec 2023 12:09:48 +0100 Subject: [PATCH] I18N: include 'usersettings' in zenlinks --- src/Logic/State/UserRelatedState.ts | 7 ++++--- src/Models/ThemeConfig/LayoutConfig.ts | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Logic/State/UserRelatedState.ts b/src/Logic/State/UserRelatedState.ts index 5fe99c68c..3c437dfee 100644 --- a/src/Logic/State/UserRelatedState.ts +++ b/src/Logic/State/UserRelatedState.ts @@ -24,7 +24,7 @@ import { MapProperties } from "../../Models/MapProperties" * which layers they enabled, ... */ export default class UserRelatedState { - public static readonly usersettingsConfig = UserRelatedState.initUserRelatedState() + public static readonly usersettingsConfig = UserRelatedState.initUserSettingsState() public static readonly availableUserSettingsIds: string[] = UserRelatedState.usersettingsConfig?.tagRenderings?.map((tr) => tr.id) ?? [] public static readonly SHOW_TAGS_VALUES = ["always", "yes", "full"] as const @@ -141,7 +141,7 @@ export default class UserRelatedState { this.language.syncWith(Locale.language) } - private static initUserRelatedState(): LayerConfig { + private static initUserSettingsState(): LayerConfig { try { return new LayerConfig(usersettings, "userinformationpanel") } catch (e) { @@ -319,7 +319,8 @@ export default class UserRelatedState { amendedPrefs.data["_language"] = language const trmode = translationMode.data if ((trmode === "true" || trmode === "mobile") && layout !== undefined) { - const missing = layout.missingTranslations() + const extraInspection = UserRelatedState.usersettingsConfig + const missing = layout.missingTranslations(extraInspection) const total = missing.total const untranslated = missing.untranslated.get(language) ?? [] diff --git a/src/Models/ThemeConfig/LayoutConfig.ts b/src/Models/ThemeConfig/LayoutConfig.ts index 77ee2ef48..17e7a0c53 100644 --- a/src/Models/ThemeConfig/LayoutConfig.ts +++ b/src/Models/ThemeConfig/LayoutConfig.ts @@ -245,7 +245,7 @@ export default class LayoutConfig implements LayoutInformation { return this.layers.some((l) => l.isLeftRightSensitive()) } - public missingTranslations(): { + public missingTranslations(extraInspection: any): { untranslated: Map total: number } { @@ -254,7 +254,7 @@ export default class LayoutConfig implements LayoutInformation { const untranslated = new Map() Utils.WalkObject( - layout, + [layout, extraInspection], (o) => { const translation = (o) if (translation.translations["*"] !== undefined) {