From 19035ec2ebef818756472e476566e5587379c53e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=AD=C5=A1a=20Szlachta?= <risa.szlachta@gmail.com>
Date: Sun, 27 Jul 2025 18:25:03 +0200
Subject: [PATCH] Fix unlocalized word for conjunction when having multiple
 shortcuts for the same action (#24838)

* create STR_7000: "or"

* declare STR_OR

* enable localisation via LanguageGetString()

* Update ShortcutManager.cpp

* Update changelog.txt

---------

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
---
 data/language/en-GB.txt                   | 1 +
 distribution/changelog.txt                | 1 +
 src/openrct2-ui/UiStringIds.h             | 1 +
 src/openrct2-ui/input/ShortcutManager.cpp | 6 ++++--
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt
index 6b8c3e6c30..01bcb7a1db 100644
--- a/data/language/en-GB.txt
+++ b/data/language/en-GB.txt
@@ -3838,3 +3838,4 @@ STR_6796    :•{MOVE_X}{10}{STRINGID}
 STR_6797    :No preview
 STR_6798    :Screenshot
 STR_6799    :Mini map
+STR_7000    :or
diff --git a/distribution/changelog.txt b/distribution/changelog.txt
index 38cdb34b1f..00e88b7ca4 100644
--- a/distribution/changelog.txt
+++ b/distribution/changelog.txt
@@ -18,6 +18,7 @@
 - Fix: [#24826] The Junior Roller Coaster flat-to-steep track piece tunnels are incorrect.
 - Fix: [#24829] The pattern of long grass across tiles is different to RCT1 and RCT2.
 - Fix: [#24831] Park names are being overwritten for custom RCT1 scenarios that use competition id slots.
+- Fix: [#24838] Not using localized word for conjunction when having multiple shortcuts for the same action.
 
 0.4.24 (2025-07-05)
 ------------------------------------------------------------------------
diff --git a/src/openrct2-ui/UiStringIds.h b/src/openrct2-ui/UiStringIds.h
index d8c2c4532a..574890bc31 100644
--- a/src/openrct2-ui/UiStringIds.h
+++ b/src/openrct2-ui/UiStringIds.h
@@ -274,6 +274,7 @@ namespace OpenRCT2
         STR_SHORTCUT_WINDOWED_MODE_TOGGLE = 5806,
         STR_SHORTCUT_ZOOM_VIEW_IN = 2498,
         STR_SHORTCUT_ZOOM_VIEW_OUT = 2497,
+        STR_OR = 7000,
 
         // Widgets
         STR_CLOSE_X = 824,
diff --git a/src/openrct2-ui/input/ShortcutManager.cpp b/src/openrct2-ui/input/ShortcutManager.cpp
index 52f3c09bc3..7777f8f8ef 100644
--- a/src/openrct2-ui/input/ShortcutManager.cpp
+++ b/src/openrct2-ui/input/ShortcutManager.cpp
@@ -12,6 +12,7 @@
 #include "ShortcutIds.h"
 
 #include <SDL.h>
+#include <openrct2-ui/UiStringIds.h>
 #include <openrct2/Context.h>
 #include <openrct2/PlatformEnvironment.h>
 #include <openrct2/core/Console.hpp>
@@ -101,8 +102,9 @@ std::string RegisteredShortcut::GetDisplayString() const
         result += kc.ToLocalisedString();
         if (i < numChords - 1)
         {
-            // TODO localise...
-            result += " or ";
+            result += " ";
+            result += LanguageGetString(STR_OR);
+            result += " ";
         }
     }
     return result;