From 0528ef58b2ea1fe771bf6ea43022c4e3265166b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 21 May 2023 14:24:20 +0200 Subject: [PATCH] Extract hard-coded FPS limiter with parameter. --- .../Widgets/Logic/Settings/DisplaySettingsLogic.cs | 4 +++- mods/cnc/chrome/settings-display.yaml | 1 - mods/common/chrome/settings-display.yaml | 1 - mods/common/languages/en.ftl | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Settings/DisplaySettingsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Settings/DisplaySettingsLogic.cs index 6e0c6a2acb..e755573c90 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Settings/DisplaySettingsLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Settings/DisplaySettingsLogic.cs @@ -65,6 +65,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic [TranslationReference] const string Disabled = "options-target-lines.disabled"; + [TranslationReference("fps")] + const string FrameLimiter = "checkbox-frame-limiter"; static readonly int OriginalVideoDisplay; static readonly WindowMode OriginalGraphicsMode; static readonly int2 OriginalGraphicsWindowedSize; @@ -229,7 +231,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic var frameLimitGamespeedCheckbox = panel.Get("FRAME_LIMIT_GAMESPEED_CHECKBOX"); var frameLimitCheckbox = panel.Get("FRAME_LIMIT_CHECKBOX"); var frameLimitOrigLabel = frameLimitCheckbox.Text; - var frameLimitLabel = new CachedTransform(fps => frameLimitOrigLabel + $" ({fps} FPS)"); + var frameLimitLabel = new CachedTransform(fps => TranslationProvider.GetString(FrameLimiter, Translation.Arguments("fps", fps))); frameLimitCheckbox.GetText = () => frameLimitLabel.Update(ds.MaxFramerate); frameLimitCheckbox.IsDisabled = () => ds.CapFramerateToGameFps; diff --git a/mods/cnc/chrome/settings-display.yaml b/mods/cnc/chrome/settings-display.yaml index a31785279f..06753a3d2e 100644 --- a/mods/cnc/chrome/settings-display.yaml +++ b/mods/cnc/chrome/settings-display.yaml @@ -288,7 +288,6 @@ Container@DISPLAY_PANEL: Width: PARENT_RIGHT Height: 20 Font: Regular - Text: Enable Frame Limiter Container@FRAME_LIMIT_SLIDER_CONTAINER: Width: PARENT_RIGHT / 2 - 20 Children: diff --git a/mods/common/chrome/settings-display.yaml b/mods/common/chrome/settings-display.yaml index 1cf15684f1..1823235253 100644 --- a/mods/common/chrome/settings-display.yaml +++ b/mods/common/chrome/settings-display.yaml @@ -297,7 +297,6 @@ Container@DISPLAY_PANEL: Width: PARENT_RIGHT Height: 20 Font: Regular - Text: Enable Frame Limiter Container@FRAME_LIMIT_SLIDER_CONTAINER: Width: PARENT_RIGHT / 2 - 20 Children: diff --git a/mods/common/languages/en.ftl b/mods/common/languages/en.ftl index c7640730af..e595f949a7 100644 --- a/mods/common/languages/en.ftl +++ b/mods/common/languages/en.ftl @@ -353,6 +353,8 @@ options-target-lines = .manual = Manual .disabled = Disabled +checkbox-frame-limiter = Enable Frame Limiter ({ $fps } FPS) + ## HotkeysSettingsLogic label-original-notice = The default is "{ $key }" label-duplicate-notice = This is already used for "{ $key }" in the { $context } context