From 64c107d9da26a2f9fb2852bbb513ef089c411847 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Sat, 30 Sep 2017 15:49:50 +0200 Subject: [PATCH] Fixed #204 - Chart Month --> comboboxes in english localization bug --- .../budgetmaster/logic/report/ReportGenerator.java | 2 +- .../budgetmaster/ui/controller/ChartController.java | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java b/src/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java index 87cf2a616..38f7d53bd 100644 --- a/src/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java +++ b/src/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java @@ -211,7 +211,7 @@ public class ReportGenerator if(reportPreferences.isIncludeCategoryBudgets()) { document.add(Chunk.NEWLINE); - document.add(new Paragraph(Localization.getString(Strings.TITLE_CATEGORY_BUDGETS), headerFont)); + document.add(new Paragraph(Localization.getString(Strings.TITLE_CATEGORY_BUDGETS), smallHeaderFont)); document.add(Chunk.NEWLINE); PdfPTable table = generateCategoryBudgets(); diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/ChartController.java b/src/de/deadlocker8/budgetmaster/ui/controller/ChartController.java index bb5b34059..3ac705844 100644 --- a/src/de/deadlocker8/budgetmaster/ui/controller/ChartController.java +++ b/src/de/deadlocker8/budgetmaster/ui/controller/ChartController.java @@ -185,10 +185,10 @@ public class ChartController implements Refreshable, Styleable String endYear = comboBoxEndYear.getValue(); String startDateString = "01-" + startMonth + "-" + startYear; - DateTime startDate = DateTime.parse(startDateString, DateTimeFormat.forPattern("dd-MMMM-YYYY")); + DateTime startDate = DateTime.parse(startDateString, DateTimeFormat.forPattern("dd-MMMM-YYYY").withLocale(controller.getSettings().getLanguage().getLocale())); String endDateString = "01-" + endMonth + "-" + endYear; - DateTime endDate = DateTime.parse(endDateString, DateTimeFormat.forPattern("dd-MMMM-YYYY")); + DateTime endDate = DateTime.parse(endDateString, DateTimeFormat.forPattern("dd-MMMM-YYYY").withLocale(controller.getSettings().getLanguage().getLocale())); if(endDate.isBefore(startDate)) { @@ -257,10 +257,11 @@ public class ChartController implements Refreshable, Styleable datePickerEnd.setValue(endDate); // chart month - comboBoxStartMonth.setValue(controller.getCurrentDate().minusMonths(5).toString("MMMM")); + System.out.println(controller.getCurrentDate().minusMonths(5).monthOfYear().getAsText(controller.getSettings().getLanguage().getLocale())); + comboBoxStartMonth.setValue(controller.getCurrentDate().minusMonths(5).monthOfYear().getAsText(controller.getSettings().getLanguage().getLocale())); comboBoxStartYear.setValue(String.valueOf(controller.getCurrentDate().minusMonths(5).getYear())); - comboBoxEndMonth.setValue(controller.getCurrentDate().plusMonths(6).toString("MMMM")); + comboBoxEndMonth.setValue(controller.getCurrentDate().plusMonths(6).monthOfYear().getAsText(controller.getSettings().getLanguage().getLocale())); comboBoxEndYear.setValue(String.valueOf(controller.getCurrentDate().plusMonths(6).getYear())); Worker.runLater(() -> { -- GitLab