summaryrefslogtreecommitdiff
path: root/Source/Core/Common/Src/MsgHandler.cpp
diff options
context:
space:
mode:
authorGlenn Rice <glennricster@gmail.com>2011-01-13 20:53:37 +0000
committerGlenn Rice <glennricster@gmail.com>2011-01-13 20:53:37 +0000
commit984b0d14d2f5008440dfdbe4fe3a52c6d5ecf353 (patch)
tree6c56d9c6c2eb668711233dc80cab680b37dce091 /Source/Core/Common/Src/MsgHandler.cpp
parent3a8290a8253ecb3c19b9b91faac620edabca6edb (diff)
Translate PanicAlert captions too.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6841 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common/Src/MsgHandler.cpp')
-rw-r--r--Source/Core/Common/Src/MsgHandler.cpp31
1 files changed, 28 insertions, 3 deletions
diff --git a/Source/Core/Common/Src/MsgHandler.cpp b/Source/Core/Common/Src/MsgHandler.cpp
index d851ec0b74..231d9c34b4 100644
--- a/Source/Core/Common/Src/MsgHandler.cpp
+++ b/Source/Core/Common/Src/MsgHandler.cpp
@@ -49,12 +49,37 @@ void SetEnableAlert(bool enable)
/* This is the first stop for gui alerts where the log is updated and the
correct windows is shown */
-bool MsgAlert(const char* caption, bool yes_no, int Style, const char* format, ...)
+bool MsgAlert(bool yes_no, int Style, const char* format, ...)
{
// Read message and write it to the log
+ std::string caption;
char buffer[2048];
bool ret = true;
+ static std::string info_caption;
+ static std::string warn_caption;
+ static std::string ques_caption;
+
+ if (!info_caption.length())
+ {
+ info_caption = std::string(str_translator(_trans("Information")));
+ ques_caption = std::string(str_translator(_trans("Question")));
+ warn_caption = std::string(str_translator(_trans("Warning")));
+ }
+
+ switch(Style)
+ {
+ case INFORMATION:
+ caption = info_caption;
+ break;
+ case QUESTION:
+ caption = ques_caption;
+ break;
+ case WARNING:
+ caption = warn_caption;
+ break;
+ }
+
const char *tr_format = str_translator(format);
va_list args;
@@ -62,11 +87,11 @@ bool MsgAlert(const char* caption, bool yes_no, int Style, const char* format, .
CharArrayFromFormatV(buffer, 2047, tr_format, args);
va_end(args);
- ERROR_LOG(MASTER_LOG, "%s: %s", caption, buffer);
+ ERROR_LOG(MASTER_LOG, "%s: %s", caption.c_str(), buffer);
// Don't ignore questions, especially AskYesNo, PanicYesNo could be ignored
if (msg_handler && (AlertEnabled || Style == QUESTION)) {
- ret = msg_handler(caption, buffer, yes_no, Style);
+ ret = msg_handler(caption.c_str(), buffer, yes_no, Style);
}
return ret;
}