diff --git a/src/de/deadlocker8/budgetmaster/logic/utils/Strings.java b/src/de/deadlocker8/budgetmaster/logic/utils/Strings.java index b0b1939bf35d461331d72e07786d8591f53d46d4..bf70bfde8d3298020ee8d4940d1d4e87df09b5aa 100644 --- a/src/de/deadlocker8/budgetmaster/logic/utils/Strings.java +++ b/src/de/deadlocker8/budgetmaster/logic/utils/Strings.java @@ -60,6 +60,7 @@ public class Strings public static final String CURRENCY_PLACEHOLDER = "currency.placeholder"; public static final String TRUSTED_HOSTS_PLACEHOLDER = "trusted.hosts.placeholder"; public static final String VERSION = "version"; + public static final String UNDEFINED = "undefined"; //REPORT public static final String REPORT_POSITION = "report.position"; diff --git a/src/de/deadlocker8/budgetmaster/resources/languages/_de.properties b/src/de/deadlocker8/budgetmaster/resources/languages/_de.properties index 3b4859f07da5ea942278daf2b7e132c337e318cd..9dc5a1fdac8f18eaaecf1ed781a77d7f8bb1c87e 100644 --- a/src/de/deadlocker8/budgetmaster/resources/languages/_de.properties +++ b/src/de/deadlocker8/budgetmaster/resources/languages/_de.properties @@ -1,8 +1,8 @@ # DEFAULT app.name=BudgetMaster version.code=9 -version.name=1.5.0_alpha -version.date=23.08.17 +version.name=1.5.0 +version.date=31.08.17 author=Robert Goldmann credits=L�nderflaggen von Freepik auf https://www.flaticon.com @@ -57,6 +57,7 @@ payments.placeholder=Keine Daten verf url.placeholder=z.B. https://yourdomain.de currency.placeholder=z.B. \u20AC, CHF, $ trusted.hosts.placeholder=z.B. localhost +undefined=unbekannt # REPORT report.position=Nr. diff --git a/src/de/deadlocker8/budgetmaster/resources/languages/_en.properties b/src/de/deadlocker8/budgetmaster/resources/languages/_en.properties index 16a50847fd91a816d8312d9272dd6059fdf79757..13aab3aba1bbcd7f5a96c406ab6ba2292276cf58 100644 --- a/src/de/deadlocker8/budgetmaster/resources/languages/_en.properties +++ b/src/de/deadlocker8/budgetmaster/resources/languages/_en.properties @@ -1,8 +1,8 @@ # DEFAULT app.name=BudgetMaster version.code=9 -version.name=1.5.0_alpha -version.date=23.08.17 +version.name=1.5.0 +version.date=31.08.17 author=Robert Goldmann credits=Flags by Freepik on https://www.flaticon.com @@ -57,6 +57,7 @@ payments.placeholder=No data available url.placeholder=e.g. https://yourdomain.de currency.placeholder=e.g. \u20AC, CHF, $ trusted.hosts.placeholder=e.g. localhost +undefined=undefined # REPORT report.position=No. diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/Controller.java b/src/de/deadlocker8/budgetmaster/ui/controller/Controller.java index 26d87665025619f522a0fb8cb1219df7834557f5..ef7f808a8b42116582f815d867617cc789a46608 100644 --- a/src/de/deadlocker8/budgetmaster/ui/controller/Controller.java +++ b/src/de/deadlocker8/budgetmaster/ui/controller/Controller.java @@ -448,26 +448,48 @@ public class Controller ServerConnection connection = new ServerConnection(settings); //check if server is compatible with client - VersionInformation serverVersion = connection.getServerVersion(); - if(serverVersion.getVersionCode() < Integer.parseInt(Localization.getString(Strings.VERSION_CODE))) + try { - Platform.runLater(()->{; + VersionInformation serverVersion = connection.getServerVersion(); + if(serverVersion.getVersionCode() < Integer.parseInt(Localization.getString(Strings.VERSION_CODE))) + { + Platform.runLater(()->{ + AlertGenerator.showAlert(AlertType.WARNING, + Localization.getString(Strings.TITLE_WARNING), + "", + Localization.getString(Strings.WARNING_SERVER_VERSION, serverVersion.getVersionName(), Localization.getString(Strings.VERSION_NAME)), + icon, stage, null, false); + + if(modalStage != null) + { + modalStage.close(); + }; + categoryHandler = new CategoryHandler(null); + toggleAllTabsExceptSettings(true); + tabPane.getSelectionModel().select(tabSettings); + }); + return; + } + } + catch(Exception e1) + { + Platform.runLater(()->{ AlertGenerator.showAlert(AlertType.WARNING, - Localization.getString(Strings.TITLE_WARNING), - "", - Localization.getString(Strings.WARNING_SERVER_VERSION, serverVersion.getVersionName(), Localization.getString(Strings.VERSION_NAME)), - icon, stage, null, false); - + Localization.getString(Strings.TITLE_WARNING), + "", + Localization.getString(Strings.WARNING_SERVER_VERSION, Localization.getString(Strings.UNDEFINED), Localization.getString(Strings.VERSION_NAME)), + icon, stage, null, false); + if(modalStage != null) { modalStage.close(); }; categoryHandler = new CategoryHandler(null); toggleAllTabsExceptSettings(true); - tabPane.getSelectionModel().select(tabSettings); + tabPane.getSelectionModel().select(tabSettings); }); - return; - } + } + paymentHandler = new PaymentHandler(); paymentHandler.getPayments().addAll(connection.getPayments(currentDate.getYear(), currentDate.getMonthOfYear())); diff --git a/src/de/deadlocker8/budgetmasterserver/main/_de.properties b/src/de/deadlocker8/budgetmasterserver/main/_de.properties index d07f4b6f92dad9256a366afff5e4eafd225cae67..09cd0df883b038404cbaf06e332e895c5349c342 100644 --- a/src/de/deadlocker8/budgetmasterserver/main/_de.properties +++ b/src/de/deadlocker8/budgetmasterserver/main/_de.properties @@ -1,5 +1,5 @@ app.name=BudgetMasterServer version.code=9 -version.name=1.5.0_alpha -version.date=23.08.17 +version.name=1.5.0 +version.date=31.08.17 author=Robert Goldmann \ No newline at end of file