diff --git a/src/main/resources/charts/AccountSumPerDay.js b/src/main/resources/charts/AccountSumPerDay.js index 13359ee9a3221c7662b2764f2af5f844f3e6e933..c23aaead696429a7cddeed0ef1c2973051b3023d 100644 --- a/src/main/resources/charts/AccountSumPerDay.js +++ b/src/main/resources/charts/AccountSumPerDay.js @@ -6,6 +6,8 @@ */ var transactionData = []; +// Note: All variables starting with "localized" are only available inside default charts. + // group transactions by date var groups = transactionData.reverse().reduce((groups, transaction) => { var date = transaction.date; @@ -52,13 +54,12 @@ var plotlyData = [ ]; // Add your Plotly layout settings here (optional) -// Note: All variables starting with "localized" are only available inside default charts. var plotlyLayout = { title: { text: localizedTitle, }, yaxis: { - title: localizedAxisY + localizedCurrency, + title: localizedData['axisY'] + localizedCurrency, rangemode: 'tozero', tickformat: '.2f', showline: true diff --git a/src/main/resources/languages/_de.properties b/src/main/resources/languages/_de.properties index 284d541101f484d21751216f26e304935b2f2807..4e0d0b0dc60225f27cb0e3576111c1b7510563ff 100644 --- a/src/main/resources/languages/_de.properties +++ b/src/main/resources/languages/_de.properties @@ -325,8 +325,8 @@ hotkeys.search=Suchen hotkeys.search.key=s # charts -charts.default.accountsum=Kontostand pro Tag -charts.default.accountsum.axis.x=Summe in +charts.default.accountSumPerDay=Kontostand pro Tag +charts.default.accountSumPerDay.localization='{"axisY": "Summe in "'} charts.default.categories=Eingaben/Ausgaben nach Kategorien charts.default.month=Eingaben/Ausgaben pro Monat charts.default.categoryBudget=Verbrauch nach Kategorien diff --git a/src/main/resources/languages/_en.properties b/src/main/resources/languages/_en.properties index 6f0345a62341bf9470b719eca87384a0e27231e3..a6a9d46d97607f445de2408a6f04f5c97d94d78b 100644 --- a/src/main/resources/languages/_en.properties +++ b/src/main/resources/languages/_en.properties @@ -325,8 +325,8 @@ hotkeys.search=Search hotkeys.search.key=s # charts -charts.default.accountsum=Account sum per day -charts.default.accountsum.axis.x=Sum in +charts.default.accountSumPerDay=Account sum per day +charts.default.accountSumPerDay.localization='{"axisY": "Sum in "'} charts.default.categories=Incomes/Expenditures per category charts.default.month=Income/Expenditures per month charts.default.categoryBudget=Consumption by categories diff --git a/src/main/resources/templates/charts/charts.ftl b/src/main/resources/templates/charts/charts.ftl index 4ed5e9e03bd1947a731e03e83c0182182aae4b50..94667bbd8fcba4c625350672d1c3b8eda8f1a0a0 100644 --- a/src/main/resources/templates/charts/charts.ftl +++ b/src/main/resources/templates/charts/charts.ftl @@ -164,9 +164,10 @@ <#if chart??> <script> <#if chart.getType().name() == "DEFAULT"> - localizedTitle = "${locale.getString(chart.getName())}"; - localizedAxisY = "${locale.getString(chart.getName() + ".axis.x")}"; - localizedCurrency = "${settings.getCurrency()}"; + localizedLocale = '${locale.getString("locale")}'; + localizedTitle = '${locale.getString(chart.getName())}'; + localizedCurrency = '${settings.getCurrency()}'; + localizedData = JSON.parse('${locale.getString(chart.getName() + ".localization")}'); </#if> ${chart.getScript()?replace("var transactionData = []", "var transactionData = ${transactionData};")}