diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/ReportController.java b/src/main/java/de/deadlocker8/budgetmaster/controller/ReportController.java index 71256d2fafd9e5678cedefdc7f3744ac3360070e..eaf024737e2db976a9b653536f950e51ac4a17dc 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/controller/ReportController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/controller/ReportController.java @@ -91,7 +91,7 @@ public class ReportController extends BaseController try { byte[] dataBytes = reportGeneratorService.generate(reportConfiguration); - String fileName = Localization.getString("report.initial.filename", reportSettings.getDate().toString("MM"), reportSettings.getDate().toString("YYYY")); + String fileName = Localization.getString("report.initial.filename", reportSettings.getDate().toString("YYYY"), reportSettings.getDate().toString("MM"), account.getName()); response.setHeader("Content-Disposition", "attachment; filename=\"" + fileName + "\""); response.setContentType("application/pdf; charset=UTF-8"); diff --git a/src/main/resources/languages/_de.properties b/src/main/resources/languages/_de.properties index 14449f562482aa6cd4d9ee138a3ae9d886716cd7..77a79d38afa0061f0582c7f4de5e01124043ca2f 100644 --- a/src/main/resources/languages/_de.properties +++ b/src/main/resources/languages/_de.properties @@ -229,7 +229,7 @@ report.footer.left=BudgetMaster Monatsbericht report.footer.center=Seite {0} report.repeating.yes=Ja report.repeating.no=Nein -report.initial.filename=BudgetMaster Monatsbericht - {0}_{1}.pdf +report.initial.filename={0}_{1} - BudgetMaster Monatsbericht - {2}.pdf report.budget=Budget report.incomes=Einnahmen: report.expenditures=Ausgaben: diff --git a/src/main/resources/languages/_en.properties b/src/main/resources/languages/_en.properties index c11d823c78ba21285173101725eb3966808f9137..c81e09668265fe0c27294efbfd34b4e26f9ffdc9 100644 --- a/src/main/resources/languages/_en.properties +++ b/src/main/resources/languages/_en.properties @@ -228,7 +228,7 @@ report.footer.left=BudgetMaster Month Report report.footer.center=Page {0} report.repeating.yes=Yes report.repeating.no=No -report.initial.filename=BudgetMaster Month Report - {0}_{1}.pdf +report.initial.filename={0}_{1} - BudgetMaster Month Report - {2}.pdf report.budget=Budget report.incomes=Incomes: report.expenditures=Expenditures: