From b7d9d01cc8d4a60ecbe028ce1147ff8c551506ce Mon Sep 17 00:00:00 2001 From: Alexei Kotov Date: Fri, 5 Sep 2025 09:29:34 +0300 Subject: [PATCH] Use l10n for wait dialog gamepad actions --- apps/openmw/mwgui/waitdialog.cpp | 13 +++++++++++-- files/data-mw/l10n/Interface/gmst.yaml | 3 +++ files/data/l10n/Interface/de.yaml | 3 +++ files/data/l10n/Interface/en.yaml | 3 +++ files/data/l10n/Interface/fr.yaml | 3 +++ files/data/l10n/Interface/pl.yaml | 3 +++ files/data/l10n/Interface/ru.yaml | 3 +++ files/data/l10n/Interface/sv.yaml | 3 +++ 8 files changed, 32 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp index 7d5fb0503e..8663ea1071 100644 --- a/apps/openmw/mwgui/waitdialog.cpp +++ b/apps/openmw/mwgui/waitdialog.cpp @@ -330,8 +330,17 @@ namespace MWGui ControllerButtons* WaitDialog::getControllerButtons() { - mControllerButtons.mA = mSleeping ? "#{sRest}" : "#{sWait}"; - mControllerButtons.mX = mSleeping && mUntilHealedButton->getVisible() ? "#{sUntilHealed}" : ""; + mControllerButtons.mX.clear(); + if (mSleeping) + { + mControllerButtons.mA = "#{Interface:Rest}"; + if (mUntilHealedButton->getVisible()) + mControllerButtons.mX = "#{Interface:UntilHealed}"; + } + else + { + mControllerButtons.mA = "#{Interface:Wait}"; + } return &mControllerButtons; } diff --git a/files/data-mw/l10n/Interface/gmst.yaml b/files/data-mw/l10n/Interface/gmst.yaml index b3ca68f311..d690b9d457 100644 --- a/files/data-mw/l10n/Interface/gmst.yaml +++ b/files/data-mw/l10n/Interface/gmst.yaml @@ -19,6 +19,7 @@ Off: "sOff" OK: "sOK" On: "sOn" Prev: "sPrev" +Rest: "sRest" ScrollDown: "sScrolldown" ScrollUp: "sScrollup" Select: "sSelect" @@ -27,4 +28,6 @@ Take: "sTake" TakeAll: "sTakeAll" Topics: "sTopics" Travel: "sTravel" +UntilHealed: "sUntilHealed" +Wait: "sWait" Yes: "sYes" diff --git a/files/data/l10n/Interface/de.yaml b/files/data/l10n/Interface/de.yaml index b324306964..8b731e3f64 100644 --- a/files/data/l10n/Interface/de.yaml +++ b/files/data/l10n/Interface/de.yaml @@ -45,6 +45,7 @@ OK: "OK" On: "An" Prev: "Zurück" Reset: "Zurücksetzen" +Rest: "Rasten" ScrollDown: "Nach unten scrollen" ScrollUp: "Nach oben scrollen" Select: "Auswählen" @@ -53,4 +54,6 @@ Take: "Nehmen" TakeAll: "Alles nehmen" Topics: "Themen" Travel: "Reisen" +UntilHealed: "Bis geheilt" +Wait: "Warten" Yes: "Ja" diff --git a/files/data/l10n/Interface/en.yaml b/files/data/l10n/Interface/en.yaml index 923c36dd88..a4b3ec21cb 100644 --- a/files/data/l10n/Interface/en.yaml +++ b/files/data/l10n/Interface/en.yaml @@ -36,6 +36,7 @@ OK: "OK" On: "On" Prev: "Prev" Reset: "Reset" +Rest: "Rest" ScrollDown: "Scroll Down" ScrollUp: "Scroll Up" Select: "Select" @@ -44,4 +45,6 @@ Take: "Take" TakeAll: "Take All" Topics: "Topics" Travel: "Travel" +UntilHealed: "Until Healed" +Wait: "Wait" Yes: "Yes" diff --git a/files/data/l10n/Interface/fr.yaml b/files/data/l10n/Interface/fr.yaml index bfc15a6233..c435eec4f1 100644 --- a/files/data/l10n/Interface/fr.yaml +++ b/files/data/l10n/Interface/fr.yaml @@ -36,6 +36,7 @@ OK: "Valider" On: "Actif" Prev: "Précédent" Reset: "Réinitialiser" +Rest: "Repos" ScrollDown: "Défilement bas" ScrollUp: "Défilement haut" Select: "Sélectionner" @@ -44,4 +45,6 @@ Take: "Prendre" TakeAll: "Tout prendre" Topics: "Sujets" Travel: "Voyager" +UntilHealed: "Récup. totale" +Wait: "Attendre" Yes: "Oui" diff --git a/files/data/l10n/Interface/pl.yaml b/files/data/l10n/Interface/pl.yaml index 71b7f6d3d1..8c634c247e 100644 --- a/files/data/l10n/Interface/pl.yaml +++ b/files/data/l10n/Interface/pl.yaml @@ -34,6 +34,7 @@ OK: "OK" On: "Wł." Prev: "Poprz." Reset: "Przywróć" +Rest: "Odpocznij" ScrollDown: "Przewiń w dół" ScrollUp: "Przewiń w górę" Select: "Wybierz" @@ -42,4 +43,6 @@ Take: "Weź" TakeAll: "Weź wszystko" Topics: "Tematy" Travel: "Podróż" +UntilHealed: "Do wyzdr." +Wait: "Czekaj" Yes: "Tak" diff --git a/files/data/l10n/Interface/ru.yaml b/files/data/l10n/Interface/ru.yaml index 37280cd0d5..a8fc333701 100644 --- a/files/data/l10n/Interface/ru.yaml +++ b/files/data/l10n/Interface/ru.yaml @@ -33,6 +33,7 @@ OK: "OK" On: "Вкл" Prev: "Пред" Reset: "Сбросить" +Rest: "Отдых" ScrollDown: "Прокрутить вниз" ScrollUp: "Прокрутить вверх" Select: "Выбрать" @@ -41,4 +42,6 @@ Take: "Взять" TakeAll: "Взять все" Topics: "Темы" Travel: "Путешествие" +UntilHealed: "Выздороветь" +Wait: "Ждать" Yes: "Да" diff --git a/files/data/l10n/Interface/sv.yaml b/files/data/l10n/Interface/sv.yaml index 510fdcc0c1..e0bd136b72 100644 --- a/files/data/l10n/Interface/sv.yaml +++ b/files/data/l10n/Interface/sv.yaml @@ -36,6 +36,7 @@ OK: "Ok" On: "På" Prev: "Föreg." Reset: "Återställ" +# Rest: "Rest" # ScrollDown: "Scroll Down" ScrollUp: "Scrolla upp" Select: "Välj" @@ -44,4 +45,6 @@ Take: "Ta" TakeAll: "Ta allt" # Topics: "Topics" # Travel: "Travel" +# UntilHealed: "Until Healed" +# Wait: "Wait" Yes: "Ja"