diff --git a/src/main/resources/languages/_de.properties b/src/main/resources/languages/_de.properties index aba0c79432545355380f444c1562d359928b31c9..ac5facd876f3a587ee19c751e3b150797dea4146 100644 --- a/src/main/resources/languages/_de.properties +++ b/src/main/resources/languages/_de.properties @@ -25,8 +25,8 @@ error.database.import.unknown.version=Die hochgeladene JSON Datei enth # TITLE title.incomes=Einnahmen title.income=Einnahme -title.transactions=Ausgaben -title.transaction=Ausgabe +title.expenditures=Expenditures +title.expenditure=Expenditure title.rest=Rest title.category=Kategorie title.amount=Betrag diff --git a/src/main/resources/languages/_en.properties b/src/main/resources/languages/_en.properties index 6e1831d7ad20911e50395e6d5769f4b0f0f63ab4..f1f6fd06116ac64e28889b59a9f4c5aad3cb7302 100644 --- a/src/main/resources/languages/_en.properties +++ b/src/main/resources/languages/_en.properties @@ -25,8 +25,8 @@ error.database.import.unknown.version=The uploaded JSON File does not contain a # TITLE title.incomes=Incomes title.income=Income -title.transactions=Transactions -title.transaction=Transaction +title.expenditures=Expenditures +title.expenditure=Expenditure title.rest=Rest title.category=Category title.amount=Amount diff --git a/src/main/resources/templates/transactions/newTransaction.ftl b/src/main/resources/templates/transactions/newTransaction.ftl index 556226c34fd5b44c75a4c3f9ebbd392d32a1ad8d..b17d301c046e4ba2753fd0bcf35996d4f664cb15 100644 --- a/src/main/resources/templates/transactions/newTransaction.ftl +++ b/src/main/resources/templates/transactions/newTransaction.ftl @@ -29,9 +29,13 @@ <div class="switch"> <label> ${locale.getString("title.income")} - <input type="checkbox" name="isPayment" <#if transaction.getAmount()?? && transaction.getAmount() < 0>checked</#if>> + <#if transaction.getAmount()??> + <input type="checkbox" name="isPayment" <#if transaction.getAmount() < 0>checked</#if>> + <#else> + <input type="checkbox" name="isPayment" checked> + </#if> <span class="lever"></span> - ${locale.getString("title.transaction")} + ${locale.getString("title.expenditure")} </label> </div> </div> diff --git a/src/main/resources/templates/transactions/transactions.ftl b/src/main/resources/templates/transactions/transactions.ftl index 139b7875147108fffebbed9817c59836da04fc8f..7765f8d33c406d657077569a883e2283ffb4dccc 100644 --- a/src/main/resources/templates/transactions/transactions.ftl +++ b/src/main/resources/templates/transactions/transactions.ftl @@ -25,7 +25,7 @@ <div class="icon-block"> <h1 class="center ${redTextColor} budget-headline-icon"><i class="material-icons icon-budget">file_upload</i></h1> <h5 class="center budget">${helpers.getCurrencyString(paymentSum)}</h5> - <h5 class="center budget-headline">${locale.getString("title.transactions")}</h5> + <h5 class="center budget-headline">${locale.getString("title.expenditures")}</h5> </div> </div> <div class="col s4">