From de49a10a5d6717d7667b50a5e8295ceeae6e5e8a Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Sun, 20 Jan 2019 10:57:59 +0100 Subject: [PATCH] #268 - improved report file name --- .../deadlocker8/budgetmaster/controller/ReportController.java | 2 +- src/main/resources/languages/_de.properties | 2 +- src/main/resources/languages/_en.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/ReportController.java b/src/main/java/de/deadlocker8/budgetmaster/controller/ReportController.java index 71256d2fa..eaf024737 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 14449f562..77a79d38a 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 c11d823c7..c81e09668 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: -- GitLab