Skip to content

Commit

Permalink
fix: Incorrect log message for nested settings
Browse files Browse the repository at this point in the history
  • Loading branch information
oliversalzburg committed Oct 19, 2022
1 parent 65da07d commit 09ec486
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 30 deletions.
4 changes: 2 additions & 2 deletions packages/userscript/source/ui/BonfireSettingsUi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -254,11 +254,11 @@ export class BonfireSettingsUi extends SettingsSectionUi<BonfireSettings> {
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"),
]),
}
Expand Down
4 changes: 2 additions & 2 deletions packages/userscript/source/ui/BuildingUpgradeSettingsUi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ export class BuildingUpgradeSettingsUi extends SettingsPanel<BuildingUpgradeSett
for (const setting of Object.values(this.setting.buildings)) {
const label = this._host.engine.i18n(`$buildings.${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 });
Expand Down
4 changes: 2 additions & 2 deletions packages/userscript/source/ui/MissionSettingsUi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ export class MissionSettingsUi extends SettingsPanel<MissionSettings> {
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 });
Expand Down
4 changes: 2 additions & 2 deletions packages/userscript/source/ui/PolicySettingsUi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ export class PolicySettingsUi extends SettingsPanel<PolicySettings> {
`$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 });
Expand Down
4 changes: 2 additions & 2 deletions packages/userscript/source/ui/SettingsSectionUi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/userscript/source/ui/TechSettingsUi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ export class TechSettingsUi extends SettingsPanel<TechSettings> {
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 });
Expand Down
4 changes: 2 additions & 2 deletions packages/userscript/source/ui/TimeControlSettingsUi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ export class TimeControlSettingsUi extends SettingsSectionUi<TimeControlSettings
this._host.engine.i18n("option.accelerate"),
this.setting.accelerateTime,
{
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]),
}
);
this._timeSkipUi = new TimeSkipSettingsUi(this._host, this.setting.timeSkip);
Expand Down
4 changes: 2 additions & 2 deletions packages/userscript/source/ui/TradeSettingsUi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,11 @@ export class TradeSettingsUi extends SettingsSectionUi<TradeSettings> {
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"),
]),
}
Expand Down
4 changes: 2 additions & 2 deletions packages/userscript/source/ui/UpgradeSettingsUi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ export class UpgradeSettingsUi extends SettingsPanel<UpgradeSettings> {
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 });
Expand Down
18 changes: 8 additions & 10 deletions packages/userscript/source/ui/VillageSettingsUi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,9 @@ export class VillageSettingsUi extends SettingsSectionUi<VillageSettings> {
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);
Expand All @@ -90,11 +88,11 @@ export class VillageSettingsUi extends SettingsSectionUi<VillageSettings> {
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"),
]),
}
Expand All @@ -107,11 +105,11 @@ export class VillageSettingsUi extends SettingsSectionUi<VillageSettings> {
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"),
]),
}
Expand All @@ -125,8 +123,8 @@ export class VillageSettingsUi extends SettingsSectionUi<VillageSettings> {
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
);
Expand Down
4 changes: 2 additions & 2 deletions packages/userscript/source/ui/WorkshopSettingsUi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,11 @@ export class WorkshopSettingsUi extends SettingsSectionUi<WorkshopSettings> {
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"),
]),
}
Expand Down

0 comments on commit 09ec486

Please sign in to comment.