1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 09:32:29 +01:00

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>
This commit is contained in:
Ríša Szlachta
2025-07-27 18:25:03 +02:00
committed by GitHub
parent f8865469cb
commit 19035ec2eb
4 changed files with 7 additions and 2 deletions

View File

@@ -3838,3 +3838,4 @@ STR_6796 :•{MOVE_X}{10}{STRINGID}
STR_6797 :No preview
STR_6798 :Screenshot
STR_6799 :Mini map
STR_7000 :or

View File

@@ -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)
------------------------------------------------------------------------

View File

@@ -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,

View File

@@ -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;