1 files changed, 9 insertions, 9 deletions
diff --git a/src/Core/Application.cpp b/src/Core/Application.cpp
index 666f2cb..86b5b7b 100644
--- a/src/Core/Application.cpp
+++ b/src/Core/Application.cpp
@@ -33,7 +33,7 @@ namespace Mad {
 namespace Core {
 
 Application::Application() {
-  std::setlocale(LC_ALL, "");
+  std::setlocale(LC_ALL, "en_US.UTF-8");
 
   configManager = new ConfigManager(this);
   logManager = new LogManager(this);
@@ -47,7 +47,7 @@ Application::~Application() {
 }
 
 
-void Application::logfv(Logger::MessageCategory category, Logger::MessageLevel level, const char *format, va_list ap) {
+void Application::logfv(Logger::MessageCategory category, Logger::MessageLevel level, const Core::String &format, va_list ap) {
   int size = 100;
   char *buf = (char*)std::malloc(size);
 
@@ -56,11 +56,11 @@ void Application::logfv(Logger::MessageCategory category, Logger::MessageLevel l
     va_list ap2;
 
     va_copy(ap2, ap);
-    int n = vsnprintf(buf, size, format, ap2);
+    int n = vsnprintf(buf, size, format.toLocale().c_str(), ap2);
     va_end(ap2);
 
     if(n > -1 && n < size) {
-      logManager->log(category, level, boost::posix_time::microsec_clock::universal_time(), buf);
+      logManager->log(category, level, boost::posix_time::microsec_clock::universal_time(), Core::String::fromLocale(buf));
       std::free(buf);
       return;
     }
@@ -75,32 +75,32 @@ void Application::logfv(Logger::MessageCategory category, Logger::MessageLevel l
 
 }
 
-void Application::log(Logger::MessageCategory category, Logger::MessageLevel level, const std::string &message) {
+void Application::log(Logger::MessageCategory category, Logger::MessageLevel level, const Core::String &message) {
   logManager->log(category, level, boost::posix_time::microsec_clock::universal_time(), message);
 }
 
-void Application::logf(Logger::MessageCategory category, Logger::MessageLevel level, const char *format, ...) {
+void Application::logf(Logger::MessageCategory category, Logger::MessageLevel level, const Core::String &format, ...) {
   va_list ap;
   va_start(ap, format);
   logfv(category, level, format, ap);
   va_end(ap);
 }
 
-void Application::logf(Logger::MessageCategory category, const char *format, ...) {
+void Application::logf(Logger::MessageCategory category, const Core::String &format, ...) {
   va_list ap;
   va_start(ap, format);
   logfv(category, Logger::LOG_DEFAULT, format, ap);
   va_end(ap);
 }
 
-void Application::logf(Logger::MessageLevel level, const char *format, ...) {
+void Application::logf(Logger::MessageLevel level, const Core::String &format, ...) {
   va_list ap;
   va_start(ap, format);
   logfv(Logger::LOG_GENERAL, level, format, ap);
   va_end(ap);
 }
 
-void Application::logf(const char *format, ...) {
+void Application::logf(const Core::String &format, ...) {
   va_list ap;
   va_start(ap, format);
   logfv(Logger::LOG_GENERAL, Logger::LOG_DEFAULT, format, ap);