Skip to content
Snippets Groups Projects
Commit 1ca011d5 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

loaded language correctly on start

parent d68912b1
Branches
Tags
1 merge request!160merge v1_4_0 into master
......@@ -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");
......
......@@ -62,11 +62,6 @@ public class SplashScreenController
});
settings = FileHelper.loadSettings();
//load correct language
if(settings.getLanguage() != null)
{
Localization.loadLanguage(settings.getLanguage().getLocale());
}
if(settings == null)
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment