From 09ec4860a3590d08d294b7af92ac7b928421a86b Mon Sep 17 00:00:00 2001 From: Oliver Salzburg Date: Wed, 19 Oct 2022 21:57:56 +0200 Subject: [PATCH] fix: Incorrect log message for nested settings --- .../userscript/source/ui/BonfireSettingsUi.ts | 4 ++-- .../source/ui/BuildingUpgradeSettingsUi.ts | 4 ++-- .../userscript/source/ui/MissionSettingsUi.ts | 4 ++-- .../userscript/source/ui/PolicySettingsUi.ts | 4 ++-- .../userscript/source/ui/SettingsSectionUi.ts | 4 ++-- .../userscript/source/ui/TechSettingsUi.ts | 4 ++-- .../source/ui/TimeControlSettingsUi.ts | 4 ++-- .../userscript/source/ui/TradeSettingsUi.ts | 4 ++-- .../userscript/source/ui/UpgradeSettingsUi.ts | 4 ++-- .../userscript/source/ui/VillageSettingsUi.ts | 18 ++++++++---------- .../userscript/source/ui/WorkshopSettingsUi.ts | 4 ++-- 11 files changed, 28 insertions(+), 30 deletions(-) diff --git a/packages/userscript/source/ui/BonfireSettingsUi.ts b/packages/userscript/source/ui/BonfireSettingsUi.ts index 0e6fd1248..0a3373aec 100644 --- a/packages/userscript/source/ui/BonfireSettingsUi.ts +++ b/packages/userscript/source/ui/BonfireSettingsUi.ts @@ -254,11 +254,11 @@ export class BonfireSettingsUi extends SettingsSectionUi { this.setting.turnOnSteamworks, { onCheck: () => - this._host.engine.imessage("status.auto.enable", [ + this._host.engine.imessage("status.sub.enable", [ this._host.engine.i18n("option.steamworks"), ]), onUnCheck: () => - this._host.engine.imessage("status.auto.disable", [ + this._host.engine.imessage("status.sub.disable", [ this._host.engine.i18n("option.steamworks"), ]), } diff --git a/packages/userscript/source/ui/BuildingUpgradeSettingsUi.ts b/packages/userscript/source/ui/BuildingUpgradeSettingsUi.ts index 9419be963..6ecf6b768 100644 --- a/packages/userscript/source/ui/BuildingUpgradeSettingsUi.ts +++ b/packages/userscript/source/ui/BuildingUpgradeSettingsUi.ts @@ -26,8 +26,8 @@ export class BuildingUpgradeSettingsUi extends SettingsPanel this._host.engine.imessage("status.auto.enable", [label]), - onUnCheck: () => this._host.engine.imessage("status.auto.disable", [label]), + onCheck: () => this._host.engine.imessage("status.sub.enable", [label]), + onUnCheck: () => this._host.engine.imessage("status.sub.disable", [label]), }); items.push({ label: label, button: button }); diff --git a/packages/userscript/source/ui/MissionSettingsUi.ts b/packages/userscript/source/ui/MissionSettingsUi.ts index a064cdd68..68e75e713 100644 --- a/packages/userscript/source/ui/MissionSettingsUi.ts +++ b/packages/userscript/source/ui/MissionSettingsUi.ts @@ -26,8 +26,8 @@ export class MissionSettingsUi extends SettingsPanel { for (const setting of Object.values(this.setting.missions)) { const label = this._host.engine.i18n(`$space.${setting.mission}.label`); const button = new SettingListItem(this._host, label, setting, { - onCheck: () => this._host.engine.imessage("status.auto.enable", [label]), - onUnCheck: () => this._host.engine.imessage("status.auto.disable", [label]), + onCheck: () => this._host.engine.imessage("status.sub.enable", [label]), + onUnCheck: () => this._host.engine.imessage("status.sub.disable", [label]), }); items.push({ label: label, button: button }); diff --git a/packages/userscript/source/ui/PolicySettingsUi.ts b/packages/userscript/source/ui/PolicySettingsUi.ts index 7a1508332..be4f1bfb5 100644 --- a/packages/userscript/source/ui/PolicySettingsUi.ts +++ b/packages/userscript/source/ui/PolicySettingsUi.ts @@ -28,8 +28,8 @@ export class PolicySettingsUi extends SettingsPanel { `$policy.${setting.policy === "authocracy" ? "autocracy" : setting.policy}.label` ); const policyButton = new SettingListItem(this._host, policyLabel, setting, { - onCheck: () => this._host.engine.imessage("status.auto.enable", [policyLabel]), - onUnCheck: () => this._host.engine.imessage("status.auto.disable", [policyLabel]), + onCheck: () => this._host.engine.imessage("status.sub.enable", [policyLabel]), + onUnCheck: () => this._host.engine.imessage("status.sub.disable", [policyLabel]), }); items.push({ label: policyLabel, button: policyButton }); diff --git a/packages/userscript/source/ui/SettingsSectionUi.ts b/packages/userscript/source/ui/SettingsSectionUi.ts index 2568c3f33..864aea265 100644 --- a/packages/userscript/source/ui/SettingsSectionUi.ts +++ b/packages/userscript/source/ui/SettingsSectionUi.ts @@ -32,8 +32,8 @@ export abstract class SettingsSectionUi< label, option, { - onCheck: () => this._host.engine.imessage("status.auto.enable", [label]), - onUnCheck: () => this._host.engine.imessage("status.auto.disable", [label]), + onCheck: () => this._host.engine.imessage("status.sub.enable", [label]), + onUnCheck: () => this._host.engine.imessage("status.sub.disable", [label]), }, delimiter, upgradeIndicator diff --git a/packages/userscript/source/ui/TechSettingsUi.ts b/packages/userscript/source/ui/TechSettingsUi.ts index 58ef60c19..cf094947e 100644 --- a/packages/userscript/source/ui/TechSettingsUi.ts +++ b/packages/userscript/source/ui/TechSettingsUi.ts @@ -26,8 +26,8 @@ export class TechSettingsUi extends SettingsPanel { for (const setting of Object.values(this.setting.techs)) { const label = this._host.engine.i18n(`$science.${setting.tech}.label`); const button = new SettingListItem(this._host, label, setting, { - onCheck: () => this._host.engine.imessage("status.auto.enable", [label]), - onUnCheck: () => this._host.engine.imessage("status.auto.disable", [label]), + onCheck: () => this._host.engine.imessage("status.sub.enable", [label]), + onUnCheck: () => this._host.engine.imessage("status.sub.disable", [label]), }); items.push({ label: label, button: button }); diff --git a/packages/userscript/source/ui/TimeControlSettingsUi.ts b/packages/userscript/source/ui/TimeControlSettingsUi.ts index a2fb6879f..ecb5f1f78 100644 --- a/packages/userscript/source/ui/TimeControlSettingsUi.ts +++ b/packages/userscript/source/ui/TimeControlSettingsUi.ts @@ -35,8 +35,8 @@ export class TimeControlSettingsUi extends SettingsSectionUi this._host.engine.imessage("status.auto.enable", [label]), - onUnCheck: () => this._host.engine.imessage("status.auto.disable", [label]), + onCheck: () => this._host.engine.imessage("status.sub.enable", [label]), + onUnCheck: () => this._host.engine.imessage("status.sub.disable", [label]), } ); this._timeSkipUi = new TimeSkipSettingsUi(this._host, this.setting.timeSkip); diff --git a/packages/userscript/source/ui/TradeSettingsUi.ts b/packages/userscript/source/ui/TradeSettingsUi.ts index 56ed36251..fbaab2be5 100644 --- a/packages/userscript/source/ui/TradeSettingsUi.ts +++ b/packages/userscript/source/ui/TradeSettingsUi.ts @@ -129,11 +129,11 @@ export class TradeSettingsUi extends SettingsSectionUi { this.setting.unlockRaces, { onCheck: () => - this._host.engine.imessage("status.auto.enable", [ + this._host.engine.imessage("status.sub.enable", [ this._host.engine.i18n("ui.upgrade.races"), ]), onUnCheck: () => - this._host.engine.imessage("status.auto.disable", [ + this._host.engine.imessage("status.sub.disable", [ this._host.engine.i18n("ui.upgrade.races"), ]), } diff --git a/packages/userscript/source/ui/UpgradeSettingsUi.ts b/packages/userscript/source/ui/UpgradeSettingsUi.ts index 9ee24bcef..c93782fcb 100644 --- a/packages/userscript/source/ui/UpgradeSettingsUi.ts +++ b/packages/userscript/source/ui/UpgradeSettingsUi.ts @@ -26,8 +26,8 @@ export class UpgradeSettingsUi extends SettingsPanel { for (const setting of Object.values(this.setting.upgrades)) { const label = this._host.engine.i18n(`$workshop.${setting.upgrade}.label`); const button = new SettingListItem(this._host, label, setting, { - onCheck: () => this._host.engine.imessage("status.auto.enable", [label]), - onUnCheck: () => this._host.engine.imessage("status.auto.disable", [label]), + onCheck: () => this._host.engine.imessage("status.sub.enable", [label]), + onUnCheck: () => this._host.engine.imessage("status.sub.disable", [label]), }); items.push({ label: label, button: button }); diff --git a/packages/userscript/source/ui/VillageSettingsUi.ts b/packages/userscript/source/ui/VillageSettingsUi.ts index a2c949e92..93121f642 100644 --- a/packages/userscript/source/ui/VillageSettingsUi.ts +++ b/packages/userscript/source/ui/VillageSettingsUi.ts @@ -75,11 +75,9 @@ export class VillageSettingsUi extends SettingsSectionUi { this.setting.hunt, { onCheck: () => - this._host.engine.imessage("status.auto.enable", [this._host.engine.i18n("option.hunt")]), + this._host.engine.imessage("status.sub.enable", [this._host.engine.i18n("option.hunt")]), onUnCheck: () => - this._host.engine.imessage("status.auto.disable", [ - this._host.engine.i18n("option.hunt"), - ]), + this._host.engine.imessage("status.sub.disable", [this._host.engine.i18n("option.hunt")]), } ); this.addChild(this._hunt); @@ -90,11 +88,11 @@ export class VillageSettingsUi extends SettingsSectionUi { this.setting.holdFestivals, { onCheck: () => - this._host.engine.imessage("status.auto.enable", [ + this._host.engine.imessage("status.sub.enable", [ this._host.engine.i18n("option.festival"), ]), onUnCheck: () => - this._host.engine.imessage("status.auto.disable", [ + this._host.engine.imessage("status.sub.disable", [ this._host.engine.i18n("option.festival"), ]), } @@ -107,11 +105,11 @@ export class VillageSettingsUi extends SettingsSectionUi { this.setting.promoteLeader, { onCheck: () => - this._host.engine.imessage("status.auto.enable", [ + this._host.engine.imessage("status.sub.enable", [ this._host.engine.i18n("option.promote"), ]), onUnCheck: () => - this._host.engine.imessage("status.auto.disable", [ + this._host.engine.imessage("status.sub.disable", [ this._host.engine.i18n("option.promote"), ]), } @@ -125,8 +123,8 @@ export class VillageSettingsUi extends SettingsSectionUi { label, option, { - onCheck: () => this._host.engine.imessage("status.auto.enable", [label]), - onUnCheck: () => this._host.engine.imessage("status.auto.disable", [label]), + onCheck: () => this._host.engine.imessage("status.sub.enable", [label]), + onUnCheck: () => this._host.engine.imessage("status.sub.disable", [label]), }, delimiter ); diff --git a/packages/userscript/source/ui/WorkshopSettingsUi.ts b/packages/userscript/source/ui/WorkshopSettingsUi.ts index 6c3d8a143..cfedd9e2c 100644 --- a/packages/userscript/source/ui/WorkshopSettingsUi.ts +++ b/packages/userscript/source/ui/WorkshopSettingsUi.ts @@ -130,11 +130,11 @@ export class WorkshopSettingsUi extends SettingsSectionUi { this.setting.shipOverride, { onCheck: () => - this._host.engine.imessage("status.auto.enable", [ + this._host.engine.imessage("status.sub.enable", [ this._host.engine.i18n("option.shipOverride"), ]), onUnCheck: () => - this._host.engine.imessage("status.auto.disable", [ + this._host.engine.imessage("status.sub.disable", [ this._host.engine.i18n("option.shipOverride"), ]), }