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

Fixed #204 - Chart Month --> comboboxes in english localization bug

parent 6008676a
No related branches found
No related tags found
1 merge request!213merge v1_6_0 into master
...@@ -211,7 +211,7 @@ public class ReportGenerator ...@@ -211,7 +211,7 @@ public class ReportGenerator
if(reportPreferences.isIncludeCategoryBudgets()) if(reportPreferences.isIncludeCategoryBudgets())
{ {
document.add(Chunk.NEWLINE); 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); document.add(Chunk.NEWLINE);
PdfPTable table = generateCategoryBudgets(); PdfPTable table = generateCategoryBudgets();
......
...@@ -185,10 +185,10 @@ public class ChartController implements Refreshable, Styleable ...@@ -185,10 +185,10 @@ public class ChartController implements Refreshable, Styleable
String endYear = comboBoxEndYear.getValue(); String endYear = comboBoxEndYear.getValue();
String startDateString = "01-" + startMonth + "-" + startYear; 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; 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)) if(endDate.isBefore(startDate))
{ {
...@@ -257,10 +257,11 @@ public class ChartController implements Refreshable, Styleable ...@@ -257,10 +257,11 @@ public class ChartController implements Refreshable, Styleable
datePickerEnd.setValue(endDate); datePickerEnd.setValue(endDate);
// chart month // 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())); 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())); comboBoxEndYear.setValue(String.valueOf(controller.getCurrentDate().plusMonths(6).getYear()));
Worker.runLater(() -> { Worker.runLater(() -> {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment