improved localization of default charts

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

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

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

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};")}