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 78df3ee914d2ab97fde0c04b8f00b08599e4c387..4c55b3e5f96542ec1bdf242bd0266ce018989b39 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 4e87a20dc8a80601eb6fc74a588d81043e0a6ef5..b52ac4746275c3cf3a657c7cae52b0d6431b03b4 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>