From 0b99fafd012d7e6f108ea0684fec12448f4f521a Mon Sep 17 00:00:00 2001 From: Alexei Kotov Date: Thu, 21 Aug 2025 05:15:38 +0300 Subject: [PATCH] Expose class dialog, companion and container actions to l10n --- apps/openmw/mwgui/class.cpp | 32 +++++++++++++------------- apps/openmw/mwgui/companionwindow.cpp | 6 ++--- apps/openmw/mwgui/container.cpp | 10 ++++---- files/data-mw/l10n/Interface/gmst.yaml | 3 +++ files/data/l10n/Interface/en.yaml | 3 +++ 5 files changed, 30 insertions(+), 24 deletions(-) diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp index b60e0e3116..a2dcafd826 100644 --- a/apps/openmw/mwgui/class.cpp +++ b/apps/openmw/mwgui/class.cpp @@ -59,8 +59,8 @@ namespace MWGui { mOkButton->setStateSelected(true); mDisableGamepadCursor = true; - mControllerButtons.mA = "#{sSelect}"; - mControllerButtons.mB = "#{sBack}"; + mControllerButtons.mA = "#{Interface:Select}"; + mControllerButtons.mB = "#{Interface:Back}"; } center(); @@ -149,9 +149,9 @@ namespace MWGui if (Settings::gui().mControllerMenus) { - mControllerButtons.mLStick = "#{sMouse}"; - mControllerButtons.mA = "#{sSelect}"; - mControllerButtons.mB = "#{sBack}"; + mControllerButtons.mLStick = "#{Interface:Mouse}"; + mControllerButtons.mA = "#{Interface:Select}"; + mControllerButtons.mB = "#{Interface:Back}"; } updateClasses(); @@ -167,13 +167,13 @@ namespace MWGui { okButton->setCaption( MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {}))); - mControllerButtons.mX = "#{sNext}"; + mControllerButtons.mX = "#{Interface:Next}"; } else if (Settings::gui().mControllerMenus) { okButton->setCaption( MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sDone", {}))); - mControllerButtons.mX = "#{sDone}"; + mControllerButtons.mX = "#{Interface:Done}"; } else okButton->setCaption( @@ -392,7 +392,7 @@ namespace MWGui center(); mDisableGamepadCursor = Settings::gui().mControllerMenus; - mControllerButtons.mA = "#{sSelect}"; + mControllerButtons.mA = "#{Interface:Select}"; } void InfoBoxDialog::setText(const std::string& str) @@ -584,9 +584,9 @@ namespace MWGui if (Settings::gui().mControllerMenus) { okButton->setStateSelected(true); - mControllerButtons.mLStick = "#{sMouse}"; - mControllerButtons.mA = "#{sSelect}"; - mControllerButtons.mB = "#{sBack}"; + mControllerButtons.mLStick = "#{Interface:Mouse}"; + mControllerButtons.mA = "#{Interface:Select}"; + mControllerButtons.mB = "#{Interface:Back}"; } // Set default skills, attributes @@ -678,13 +678,13 @@ namespace MWGui { okButton->setCaption( MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {}))); - mControllerButtons.mX = "#{sNext}"; + mControllerButtons.mX = "#{Interface:Next}"; } else if (Settings::gui().mControllerMenus) { okButton->setCaption( MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sDone", {}))); - mControllerButtons.mX = "#{sDone}"; + mControllerButtons.mX = "#{Interface:Done}"; } else okButton->setCaption( @@ -882,7 +882,7 @@ namespace MWGui getWidget(cancelButton, "CancelButton"); cancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SelectSpecializationDialog::onCancelClicked); - mControllerButtons.mA = "#{sSelect}"; + mControllerButtons.mA = "#{Interface:Select}"; mControllerButtons.mB = "#{Interface:Cancel}"; } @@ -963,7 +963,7 @@ namespace MWGui if (mAttributeButtons.size() > 0) mAttributeButtons[0]->setStateSelected(true); - mControllerButtons.mA = "#{sSelect}"; + mControllerButtons.mA = "#{Interface:Select}"; mControllerButtons.mB = "#{Interface:Cancel}"; } } @@ -1063,7 +1063,7 @@ namespace MWGui if (mSkillButtons.size() > 0) mSkillButtons[0]->setStateSelected(true); - mControllerButtons.mA = "#{sSelect}"; + mControllerButtons.mA = "#{Interface:Select}"; mControllerButtons.mB = "#{Interface:Cancel}"; } } diff --git a/apps/openmw/mwgui/companionwindow.cpp b/apps/openmw/mwgui/companionwindow.cpp index 0972f8e57e..aebfd1f45a 100644 --- a/apps/openmw/mwgui/companionwindow.cpp +++ b/apps/openmw/mwgui/companionwindow.cpp @@ -64,10 +64,10 @@ namespace MWGui setCoord(200, 0, 600, 300); - mControllerButtons.mA = "#{sTake}"; + mControllerButtons.mA = "#{Interface:Take}"; mControllerButtons.mB = "#{Interface:Close}"; - mControllerButtons.mR3 = "#{sInfo}"; - mControllerButtons.mL2 = "#{sInventory}"; + mControllerButtons.mR3 = "#{Interface:Info}"; + mControllerButtons.mL2 = "#{Interface:Inventory}"; } void CompanionWindow::onItemSelected(int index) diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp index 126b6ea1d3..fe811b47a9 100644 --- a/apps/openmw/mwgui/container.cpp +++ b/apps/openmw/mwgui/container.cpp @@ -59,11 +59,11 @@ namespace MWGui setCoord(200, 0, 600, 300); - mControllerButtons.mA = "#{sTake}"; + mControllerButtons.mA = "#{Interface:Take}"; mControllerButtons.mB = "#{Interface:Close}"; - mControllerButtons.mX = "#{sTakeAll}"; - mControllerButtons.mR3 = "#{sInfo}"; - mControllerButtons.mL2 = "#{sInventory}"; + mControllerButtons.mX = "#{Interface:TakeAll}"; + mControllerButtons.mR3 = "#{Interface:Info}"; + mControllerButtons.mL2 = "#{Interface:Inventory}"; } void ContainerWindow::onItemSelected(int index) @@ -355,7 +355,7 @@ namespace MWGui ControllerButtons* ContainerWindow::getControllerButtons() { - mControllerButtons.mR1 = mDisposeCorpseButton->getVisible() ? "#{sDisposeofCorpse}" : ""; + mControllerButtons.mR1 = mDisposeCorpseButton->getVisible() ? "#{Interface:DisposeOfCorpse}" : {}; return &mControllerButtons; } diff --git a/files/data-mw/l10n/Interface/gmst.yaml b/files/data-mw/l10n/Interface/gmst.yaml index 2f693078f6..e4bcc60bcd 100644 --- a/files/data-mw/l10n/Interface/gmst.yaml +++ b/files/data-mw/l10n/Interface/gmst.yaml @@ -16,3 +16,6 @@ Mouse: "sMouse" Done: "sDone" Prev: "sPrev" Take: "sTake" +TakeAll: "sTakeAll" +Inventory: "sInventory" +DisposeOfCorpse: "sDisposeofCorpse" diff --git a/files/data/l10n/Interface/en.yaml b/files/data/l10n/Interface/en.yaml index 9fe3426ec2..b7ba10202e 100644 --- a/files/data/l10n/Interface/en.yaml +++ b/files/data/l10n/Interface/en.yaml @@ -33,3 +33,6 @@ Mouse: "Mouse" Done: "Done" Prev: "Prev" Take: "Take" +TakeAll: "Take All" +Inventory: "Inventory" +DisposeOfCorpse: "Dispose of Corpse"