From 48a29da1ed6b6e7a5122ed58fc9ca999f0f9895f Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 12 Aug 2017 20:27:24 +0200
Subject: [PATCH] bugfixes, cleanup
---
src/de/deadlocker8/budgetmaster/logic/report/ColumnType.java | 2 +-
.../budgetmaster/logic/report/ReportGenerator.java | 1 -
src/de/deadlocker8/budgetmaster/main/_de.properties | 4 ++--
src/de/deadlocker8/budgetmasterserver/main/Main.java | 4 ++++
src/de/deadlocker8/budgetmasterserver/main/_de.properties | 4 ++--
5 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/de/deadlocker8/budgetmaster/logic/report/ColumnType.java b/src/de/deadlocker8/budgetmaster/logic/report/ColumnType.java
index ae7521809..313f400ce 100644
--- a/src/de/deadlocker8/budgetmaster/logic/report/ColumnType.java
+++ b/src/de/deadlocker8/budgetmaster/logic/report/ColumnType.java
@@ -11,7 +11,7 @@ public enum ColumnType
CATEGORY(Strings.REPORT_CATEGORY, 3),
NAME(Strings.REPORT_NAME, 3),
DESCRIPTION(Strings.REPORT_DESCRIPTION, 3),
- RATING((Strings.REPORT_RATING, 1),
+ RATING(Strings.REPORT_RATING, 1),
AMOUNT(Strings.REPORT_AMOUNT, 2);
private String name;
diff --git a/src/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java b/src/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java
index a3bf8ba21..aafddccf9 100644
--- a/src/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java
+++ b/src/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java
@@ -160,7 +160,6 @@ public class ReportGenerator
document.setMargins(50, 45, 50, 70);
Font headerFont = new Font(FontFamily.HELVETICA, 14, Font.BOLD);
Font smallHeaderFont = new Font(FontFamily.HELVETICA, 12, Font.BOLD);
- Font paragraphFont = new Font(FontFamily.HELVETICA, 12, Font.NORMAL);
document.add(generateHeader());
document.add(Chunk.NEWLINE);
diff --git a/src/de/deadlocker8/budgetmaster/main/_de.properties b/src/de/deadlocker8/budgetmaster/main/_de.properties
index 060e0c53b..00b7f4f6f 100644
--- a/src/de/deadlocker8/budgetmaster/main/_de.properties
+++ b/src/de/deadlocker8/budgetmaster/main/_de.properties
@@ -1,7 +1,7 @@
# DEFAULT
app.name=BudgetMaster
-version.code=5
-version.name=1.3.1
+version.code=6
+version.name=1.4.0_alpha
version.date=12.08.17
author=Robert Goldmann
diff --git a/src/de/deadlocker8/budgetmasterserver/main/Main.java b/src/de/deadlocker8/budgetmasterserver/main/Main.java
index 38a523850..f78018848 100644
--- a/src/de/deadlocker8/budgetmasterserver/main/Main.java
+++ b/src/de/deadlocker8/budgetmasterserver/main/Main.java
@@ -15,6 +15,7 @@ import de.deadlocker8.budgetmasterserver.server.SparkServer;
import logger.FileOutputMode;
import logger.LogLevel;
import logger.Logger;
+import tools.Localization;
public class Main
{
@@ -22,6 +23,9 @@ public class Main
public static void main(String[] args)
{
+ Localization.init("de/deadlocker8/budgetmaster/main/");
+ Localization.loadLanguage(Locale.GERMANY);
+
Logger.setLevel(LogLevel.ALL);
Logger.appInfo(bundle.getString("app.name"), bundle.getString("version.name"), bundle.getString("version.code"), bundle.getString("version.date"));
try
diff --git a/src/de/deadlocker8/budgetmasterserver/main/_de.properties b/src/de/deadlocker8/budgetmasterserver/main/_de.properties
index cc0a0ccf4..9eb890aca 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=5
-version.name=1.3.1
+version.code=6
+version.name=1.4.0_alpha
version.date=12.08.17
author=Robert Goldmann
\ No newline at end of file
--
GitLab