From 47b5eea4f0784d1e67a2fade09c71e905c6b11ac Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Wed, 4 Oct 2017 16:32:20 +0200
Subject: [PATCH] Fixed #215 - english month report --> pdf --> income and
payment not localized
---
.../de/deadlocker8/budgetmaster/languages/_de.properties | 4 ++++
.../de/deadlocker8/budgetmaster/languages/_en.properties | 4 ++++
.../budgetmaster/logic/report/ReportGenerator.java | 8 ++++----
.../de/deadlocker8/budgetmaster/logic/utils/Strings.java | 4 ++++
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties
index 5a19c4b0a..2fe54cb38 100644
--- a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties
+++ b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties
@@ -84,6 +84,10 @@ report.footer.center=Seite {0}
report.repeating.yes=Ja
report.repeating.no=Nein
report.initial.filename=BudgetMaster Monatsbericht - {0}_{1}.pdf
+report.budget=Budget
+report.incomes=Einnahmen:
+report.payments=Ausgaben:
+report.budget.rest=Restbudget:
# MONTH
month.january=Januar
diff --git a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties
index 0214f27fd..6938be4de 100644
--- a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties
+++ b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties
@@ -84,6 +84,10 @@ report.footer.center=Page {0}
report.repeating.yes=Yes
report.repeating.no=No
report.initial.filename=BudgetMaster Month Report - {0}_{1}.pdf
+report.budget=Budget
+report.incomes=Incomes:
+report.payments=Payments:
+report.budget.rest=Remaining Budget:
# MONTH
month.january=January
diff --git a/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java b/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java
index 38f7d53bd..780c74199 100644
--- a/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java
+++ b/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java
@@ -167,11 +167,11 @@ public class ReportGenerator
Font fontRed = FontFactory.getFont(FONT, BaseFont.IDENTITY_H, BaseFont.EMBEDDED, 12, Font.NORMAL, BaseColor.RED);
Font fontBlack = FontFactory.getFont(FONT, BaseFont.IDENTITY_H, BaseFont.EMBEDDED, 12, Font.BOLD, BaseColor.BLACK);
- document.add(new Paragraph("Budget", headerFont));
+ document.add(new Paragraph(Localization.getString(Strings.REPORT_BUDGET), headerFont));
document.add(Chunk.NEWLINE);
- document.add(new Paragraph("Einnahmen: " + Helpers.getCurrencyString(budget.getIncomeSum(), currency), fontGreen));
- document.add(new Paragraph("Ausgaben: " + Helpers.getCurrencyString(budget.getPaymentSum(), currency), fontRed));
- document.add(new Paragraph("Restbudget: " + Helpers.getCurrencyString(budget.getIncomeSum() + budget.getPaymentSum(), currency), fontBlack));
+ document.add(new Paragraph(Localization.getString(Strings.REPORT_INCOMES) + Helpers.getCurrencyString(budget.getIncomeSum(), currency), fontGreen));
+ document.add(new Paragraph(Localization.getString(Strings.REPORT_PAYMENTS) + Helpers.getCurrencyString(budget.getPaymentSum(), currency), fontRed));
+ document.add(new Paragraph(Localization.getString(Strings.REPORT_BUDGET_REST) + Helpers.getCurrencyString(budget.getIncomeSum() + budget.getPaymentSum(), currency), fontBlack));
document.add(Chunk.NEWLINE);
}
diff --git a/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/utils/Strings.java b/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/utils/Strings.java
index 9ab0bee58..c4351c81c 100644
--- a/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/utils/Strings.java
+++ b/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/utils/Strings.java
@@ -87,6 +87,10 @@ public class Strings
public static final String REPORT_REPEATING_YES ="report.repeating.yes";
public static final String REPORT_REPEATING_NO ="report.repeating.no";
public static final String REPORT_INITIAL_FILENAME ="report.initial.filename";
+ public static final String REPORT_BUDGET = "report.budget";
+ public static final String REPORT_INCOMES = "report.incomes";
+ public static final String REPORT_PAYMENTS = "report.payments";
+ public static final String REPORT_BUDGET_REST = "report.budget.rest";
//MONTH_NAMES
public static final String MONTH_JANUARY ="month.january";
--
GitLab