From 1ca011d54e47518d3baa481743c53695b6e4eed0 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Wed, 23 Aug 2017 07:51:00 +0200
Subject: [PATCH] loaded language correctly on start
---
src/de/deadlocker8/budgetmaster/main/Main.java | 9 +++++++++
.../ui/controller/SplashScreenController.java | 7 +------
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/de/deadlocker8/budgetmaster/main/Main.java b/src/de/deadlocker8/budgetmaster/main/Main.java
index 71cbbd2de..dae0e5754 100644
--- a/src/de/deadlocker8/budgetmaster/main/Main.java
+++ b/src/de/deadlocker8/budgetmaster/main/Main.java
@@ -3,6 +3,8 @@ package de.deadlocker8.budgetmaster.main;
import java.io.File;
import java.util.Locale;
+import de.deadlocker8.budgetmaster.logic.Settings;
+import de.deadlocker8.budgetmaster.logic.utils.FileHelper;
import de.deadlocker8.budgetmaster.logic.utils.Strings;
import de.deadlocker8.budgetmaster.ui.controller.SplashScreenController;
import javafx.application.Application;
@@ -25,6 +27,13 @@ public class Main extends Application
{
primaryStage = stage;
+ //load correct language
+ Settings settings = FileHelper.loadSettings();
+ if(settings.getLanguage() != null)
+ {
+ Localization.loadLanguage(settings.getLanguage().getLocale());
+ }
+
try
{
Image icon = new Image("/de/deadlocker8/budgetmaster/resources/icon.png");
diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/SplashScreenController.java b/src/de/deadlocker8/budgetmaster/ui/controller/SplashScreenController.java
index 65bea18bd..04920fa91 100644
--- a/src/de/deadlocker8/budgetmaster/ui/controller/SplashScreenController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/controller/SplashScreenController.java
@@ -61,12 +61,7 @@ public class SplashScreenController
}
});
- settings = FileHelper.loadSettings();
- //load correct language
- if(settings.getLanguage() != null)
- {
- Localization.loadLanguage(settings.getLanguage().getLocale());
- }
+ settings = FileHelper.loadSettings();
if(settings == null)
{
--
GitLab