From 29a273cbd3b517f31f3c3330c3511a0c273af716 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Mon, 13 Feb 2023 23:38:22 +0100
Subject: [PATCH] #731 - prefill inputs with values depending on locale
---
.../budgetmaster/services/HelpersService.java | 11 +++++++++++
.../templates/transactions/transactionImport.ftl | 4 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
index 78df3ee91..4c55b3e5f 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
@@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import java.text.DecimalFormatSymbols;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Arrays;
@@ -218,4 +219,14 @@ public class HelpersService
{
return hintService.findByLocalizationKey(localizationKey);
}
+
+ public char getDecimalSeparator()
+ {
+ return new DecimalFormatSymbols(settingsService.getSettings().getLanguage().getLocale()).getDecimalSeparator();
+ }
+
+ public char getGroupingSeparator()
+ {
+ return new DecimalFormatSymbols(settingsService.getSettings().getLanguage().getLocale()).getGroupingSeparator();
+ }
}
\ No newline at end of file
diff --git a/BudgetMasterServer/src/main/resources/templates/transactions/transactionImport.ftl b/BudgetMasterServer/src/main/resources/templates/transactions/transactionImport.ftl
index 4e87a20dc..b52ac4746 100644
--- a/BudgetMasterServer/src/main/resources/templates/transactions/transactionImport.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/transactions/transactionImport.ftl
@@ -172,12 +172,12 @@
</div>
<div class="row">
<div class="input-field col s3 offset-s6 m3 offset-m6 l2 offset-l6 no-margin-top no-margin-bottom">
- <input id="decimalSeparator" type="text" required name="decimalSeparator" <@validation.validation "decimalSeparator"/> value="<#if csvColumnSettings??>${csvColumnSettings.decimalSeparator()}<#else>.</#if>">
+ <input id="decimalSeparator" type="text" required name="decimalSeparator" <@validation.validation "decimalSeparator"/> value="<#if csvColumnSettings??>${csvColumnSettings.decimalSeparator()}<#else>${helpers.getDecimalSeparator()}</#if>">
<label class="input-label" for="decimalSeparator">${locale.getString("transactions.import.decimalSeparator")}</label>
</div>
<div class="input-field col s3 m3 l2 no-margin-top no-margin-bottom">
- <input id="groupingSeparator" type="text" required name="groupingSeparator" <@validation.validation "groupingSeparator"/> value="<#if csvColumnSettings??>${csvColumnSettings.groupingSeparator()}<#else>,</#if>">
+ <input id="groupingSeparator" type="text" required name="groupingSeparator" <@validation.validation "groupingSeparator"/> value="<#if csvColumnSettings??>${csvColumnSettings.groupingSeparator()}<#else>${helpers.getGroupingSeparator()}</#if>">
<label class="input-label" for="groupingSeparator">${locale.getString("transactions.import.groupingSeparator")}</label>
</div>
</div>
--
GitLab