diff --git a/src/main/resources/languages/_de.properties b/src/main/resources/languages/_de.properties index 71269633e0ed8875861bb84a18e4479ea67386dc..91356b5b00bf8f653bf1456866ec277d1346a385 100644 --- a/src/main/resources/languages/_de.properties +++ b/src/main/resources/languages/_de.properties @@ -181,6 +181,7 @@ transaction.new.label.date=Datum transaction.new.label.description=Notiz transaction.new.label.tags=Tags transaction.new.label.account=Konto +transaction.new.label.transfer.account=Zielkonto transaction.new.label.repeating=Wiederholung transaction.new.label.repeating.all=Alle diff --git a/src/main/resources/languages/_en.properties b/src/main/resources/languages/_en.properties index 69c38477c861a2c471d0308bd8d22fe65db71dd3..7294a866796519825784c38cecc80d123498a280 100644 --- a/src/main/resources/languages/_en.properties +++ b/src/main/resources/languages/_en.properties @@ -182,6 +182,7 @@ transaction.new.label.date=Date transaction.new.label.description=Description transaction.new.label.tags=Tags transaction.new.label.account=Account +transaction.new.label.transfer.account=Destination Account transaction.new.label.repeating=Repeating transaction.new.label.repeating.all=Every diff --git a/src/main/resources/templates/transactions/newTransactionMacros.ftl b/src/main/resources/templates/transactions/newTransactionMacros.ftl index 6583149e384aa1a4f92a1648c421330287a51e0c..6bbb3dcff8df871962b08cb9a1612a909cd02d10 100644 --- a/src/main/resources/templates/transactions/newTransactionMacros.ftl +++ b/src/main/resources/templates/transactions/newTransactionMacros.ftl @@ -174,7 +174,7 @@ </script> </#macro> -<#macro account accounts selectedAccount id name> +<#macro account accounts selectedAccount id name label> <div class="row"> <div class="input-field col s12 m12 l8 offset-l2"> <select id="${id}" name="${name}" <@validation.validation "account"/>> @@ -191,7 +191,7 @@ <option value="${account.getID()?c}">${account.getName()}</option> </#list> </select> - <label for="${id}">${locale.getString("transaction.new.label.account")}</label> + <label for="${id}">${label}</label> </div> </div> </#macro> diff --git a/src/main/resources/templates/transactions/newTransactionNormal.ftl b/src/main/resources/templates/transactions/newTransactionNormal.ftl index cc09b9163c4941463701c5da14bfd8162ed4862a..f3fab3c24e101eefb1f1e65f9a3070892a6e6fb0 100644 --- a/src/main/resources/templates/transactions/newTransactionNormal.ftl +++ b/src/main/resources/templates/transactions/newTransactionNormal.ftl @@ -50,9 +50,9 @@ <#-- account --> <#if transaction.getAccount()??> - <@newTransactionMacros.account accounts transaction.getAccount() "transaction-account" "account"/> + <@newTransactionMacros.account accounts transaction.getAccount() "transaction-account" "account" locale.getString("transaction.new.label.account")/> <#else> - <@newTransactionMacros.account accounts helpers.getCurrentAccountOrDefault() "transaction-account" "account"/> + <@newTransactionMacros.account accounts helpers.getCurrentAccountOrDefault() "transaction-account" "account" locale.getString("transaction.new.label.account")/> </#if> <br> diff --git a/src/main/resources/templates/transactions/newTransactionRepeating.ftl b/src/main/resources/templates/transactions/newTransactionRepeating.ftl index 2df8d3a7faf7cf02c2c3d2a762d02619a956e79f..7c90a73953788353c11684353786536a9402002a 100644 --- a/src/main/resources/templates/transactions/newTransactionRepeating.ftl +++ b/src/main/resources/templates/transactions/newTransactionRepeating.ftl @@ -51,9 +51,9 @@ <#-- account --> <#if transaction.getAccount()??> - <@newTransactionMacros.account accounts transaction.getAccount() "transaction-account" "account"/> + <@newTransactionMacros.account accounts transaction.getAccount() "transaction-account" "account" locale.getString("transaction.new.label.account")/> <#else> - <@newTransactionMacros.account accounts helpers.getCurrentAccountOrDefault() "transaction-account" "account"/> + <@newTransactionMacros.account accounts helpers.getCurrentAccountOrDefault() "transaction-account" "account" locale.getString("transaction.new.label.account")/> </#if> <#-- repeating options --> diff --git a/src/main/resources/templates/transactions/newTransactionTransfer.ftl b/src/main/resources/templates/transactions/newTransactionTransfer.ftl index ac172a171f07787fdcba6372f855145ad2494f35..dc71a98f65171529a3d7f38717df943ee135176c 100644 --- a/src/main/resources/templates/transactions/newTransactionTransfer.ftl +++ b/src/main/resources/templates/transactions/newTransactionTransfer.ftl @@ -50,16 +50,16 @@ <#-- account --> <#if transaction.getAccount()??> - <@newTransactionMacros.account accounts transaction.getAccount() "transaction-account" "account"/> + <@newTransactionMacros.account accounts transaction.getAccount() "transaction-account" "account" locale.getString("transaction.new.label.account")/> <#else> - <@newTransactionMacros.account accounts helpers.getCurrentAccountOrDefault() "transaction-account" "account"/> + <@newTransactionMacros.account accounts helpers.getCurrentAccountOrDefault() "transaction-account" "account" locale.getString("transaction.new.label.account")/> </#if> <#-- transfer account --> <#if transaction.getTransferAccount()??> - <@newTransactionMacros.account accounts transaction.getTransferAccount() "transaction-transfer-account" "transferAccount"/> + <@newTransactionMacros.account accounts transaction.getTransferAccount() "transaction-transfer-account" "transferAccount" locale.getString("transaction.new.label.transfer.account")/> <#else> - <@newTransactionMacros.account accounts helpers.getCurrentAccountOrDefault() "transaction-transfer-account" "transferAccount"/> + <@newTransactionMacros.account accounts helpers.getCurrentAccountOrDefault() "transaction-transfer-account" "transferAccount" locale.getString("transaction.new.label.transfer.account")/> </#if> <br>