From 9cc790869ed3905c78c7eeeb0bb44f800b3f2af4 Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 18 Apr 2014 17:11:09 +0200
Subject: 3.15

---
 Application.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'Application.cpp')

diff --git a/Application.cpp b/Application.cpp
index d22a0d8e..e87b4294 100644
--- a/Application.cpp
+++ b/Application.cpp
@@ -19,7 +19,7 @@
 #include "library/resources.h"
 #include "ui/switch_to_gui.h"
 #include "shared/standard_paths.h"
-#include "shared/localization.h"
+#include "shared/i18n.h"
 #include "shared/app_main.h"
 #include <wx/sound.h>
 #include "shared/file_handling.h"
@@ -128,7 +128,7 @@ void Application::OnStartApplication(wxIdleEvent&)
     }
 
     //set program language
-    CustomLocale::getInstance().setLanguage(globalSettings.programLanguage);
+    ffs3::setLanguage(globalSettings.programLanguage);
 
 
     if (!cfgFilename.empty())
@@ -187,7 +187,7 @@ int Application::OnRun()
 int Application::OnExit()
 {
     //get program language
-    globalSettings.programLanguage = CustomLocale::getInstance().getLanguage();
+    globalSettings.programLanguage = ffs3::getLanguage();
 
     try //save global settings to XML
     {
@@ -209,7 +209,6 @@ void Application::runGuiMode(const wxString& cfgFileName, xmlAccess::XmlGlobalSe
     frame->Show();
 }
 
-
 void Application::runBatchMode(const wxString& filename, xmlAccess::XmlGlobalSettings& globSettings)
 {
     using namespace xmlAccess;
-- 
cgit