[Scummvm-git-logs] scummvm master -> 9f37857070effff96a2178d90a9c6761a73e33a7

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9529d8a9a0 GRIM: Made InputDialog translatable
9f37857070 GUI: Made "OK" consistent in various dialogs. We used "Ok" in a few places


Commit: 9529d8a9a0f421a03b75e1ff75ef4c7e08eb793d
    https://github.com/scummvm/scummvm/commit/9529d8a9a0f421a03b75e1ff75ef4c7e08eb793d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-03-18T13:21:11+01:00

Commit Message:
GRIM: Made InputDialog translatable

Changed paths:
    engines/grim/POTFILES
    engines/grim/inputdialog.cpp


diff --git a/engines/grim/POTFILES b/engines/grim/POTFILES
index 071b0c61919..46af45379fb 100644
--- a/engines/grim/POTFILES
+++ b/engines/grim/POTFILES
@@ -1,5 +1,6 @@
 engines/grim/detection.cpp
 engines/grim/grim.cpp
+engines/grim/inputdialog.cpp
 engines/grim/md5check.cpp
 engines/grim/md5checkdialog.cpp
 engines/grim/metaengine.cpp
diff --git a/engines/grim/inputdialog.cpp b/engines/grim/inputdialog.cpp
index 56777e38108..ab3f418cc18 100644
--- a/engines/grim/inputdialog.cpp
+++ b/engines/grim/inputdialog.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "common/system.h"
+#include "common/translation.h"
 
 #include "gui/gui-manager.h"
 #include "gui/ThemeEval.h"
@@ -75,12 +76,12 @@ InputDialog::InputDialog(const Common::String &message, const Common::String &st
 	}
 	height += 10;
 	if (_hasTextField) {
-		m_text = new GUI::EditTextWidget(this, 10, height, _w - 20, kLineHeight, Common::U32String(string), Common::U32String("input"));
+		m_text = new GUI::EditTextWidget(this, 10, height, _w - 20, kLineHeight, Common::U32String(string), _("Input text"));
 		height += kLineHeight + 10;
 	}
 
-	new GUI::ButtonWidget(this, 10, height, buttonWidth, buttonHeight, Common::U32String("Ok"), Common::U32String(), GUI::kOKCmd, Common::ASCII_RETURN); // Confirm dialog
-	new GUI::ButtonWidget(this, _w - buttonWidth - 10, height, buttonWidth, buttonHeight, Common::U32String("Cancel"), Common::U32String(), GUI::kCloseCmd, Common::ASCII_ESCAPE);   // Cancel dialog
+	new GUI::ButtonWidget(this, 10, height, buttonWidth, buttonHeight, _("OK"), Common::U32String(), GUI::kOKCmd, Common::ASCII_RETURN); // Confirm dialog
+	new GUI::ButtonWidget(this, _w - buttonWidth - 10, height, buttonWidth, buttonHeight, _("Cancel"), Common::U32String(), GUI::kCloseCmd, Common::ASCII_ESCAPE);   // Cancel dialog
 }
 
 Common::String InputDialog::getString() {


Commit: 9f37857070effff96a2178d90a9c6761a73e33a7
    https://github.com/scummvm/scummvm/commit/9f37857070effff96a2178d90a9c6761a73e33a7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-03-18T13:21:11+01:00

Commit Message:
GUI: Made "OK" consistent in various dialogs. We used "Ok" in a few places

Changed paths:
    engines/nancy/dialogs.cpp
    gui/editrecorddialog.cpp
    gui/predictivedialog.cpp


diff --git a/engines/nancy/dialogs.cpp b/engines/nancy/dialogs.cpp
index 1147d663cb9..42cb33bdbad 100644
--- a/engines/nancy/dialogs.cpp
+++ b/engines/nancy/dialogs.cpp
@@ -98,7 +98,7 @@ CheatDialog::CheatDialog() : GUI::Dialog(20, 20, 600, 440) {
 
 	GUI::TabWidget *_tabs = new GUI::TabWidget(this, 0, 0, 600, 370);
 	new GUI::ButtonWidget(this, 420, 410, 60, 20, _("Cancel"), Common::U32String(), GUI::kCloseCmd);
-	new GUI::ButtonWidget(this, 520, 410, 60, 20, _("Ok"), Common::U32String(), GUI::kOKCmd);
+	new GUI::ButtonWidget(this, 520, 410, 60, 20, _("OK"), Common::U32String(), GUI::kOKCmd);
 
 	_tabs->addTab(_("General"), "Cheat.General");
 
diff --git a/gui/editrecorddialog.cpp b/gui/editrecorddialog.cpp
index 76ee35e0f22..0fca0f12d0a 100644
--- a/gui/editrecorddialog.cpp
+++ b/gui/editrecorddialog.cpp
@@ -64,7 +64,7 @@ EditRecordDialog::EditRecordDialog(const Common::U32String author, const Common:
 	_notesEdit->setEditString(notes);
 	_nameEdit->setEditString(name);
 	new GUI::ButtonWidget(this, "EditRecordDialog.Cancel", _("Cancel"), Common::U32String(), kCloseCmd);
-	new GUI::ButtonWidget(this, "EditRecordDialog.OK", _("Ok"), Common::U32String(), kOKCmd);
+	new GUI::ButtonWidget(this, "EditRecordDialog.OK", _("OK"), Common::U32String(), kOKCmd);
 }
 
 void EditRecordDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) {
diff --git a/gui/predictivedialog.cpp b/gui/predictivedialog.cpp
index 7c0151efd76..3ba35612042 100644
--- a/gui/predictivedialog.cpp
+++ b/gui/predictivedialog.cpp
@@ -66,7 +66,7 @@ PredictiveDialog::PredictiveDialog() : Dialog("Predictive") {
 	new StaticTextWidget(this, "Predictive.Headline", Common::U32String("Enter Text"));
 
 	_button[kCancelAct] =  new ButtonWidget(this, "Predictive.Cancel",  _("Cancel")   , Common::U32String(), kCancelCmd);
-	_button[kOkAct] =      new ButtonWidget(this, "Predictive.OK",      _("Ok")       , Common::U32String(), kOkCmd);
+	_button[kOkAct] =      new ButtonWidget(this, "Predictive.OK",      _("OK")       , Common::U32String(), kOkCmd);
 
 	if (g_gui.useRTL()) {
 		/** If using RTL, swap the internal name of odd columns, to be flipped again when drawing.