From d9b0b12a9a13675c2bfa83e0f152965939fe2605 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Mon, 22 Apr 2019 15:08:10 +0200
Subject: [PATCH] #385 - improved localization
---
src/main/resources/languages/_de.properties | 1 +
src/main/resources/languages/_en.properties | 1 +
.../templates/transactions/newTransactionMacros.ftl | 4 ++--
.../templates/transactions/newTransactionNormal.ftl | 4 ++--
.../templates/transactions/newTransactionRepeating.ftl | 4 ++--
.../templates/transactions/newTransactionTransfer.ftl | 8 ++++----
6 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/languages/_de.properties b/src/main/resources/languages/_de.properties
index 71269633e..91356b5b0 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 69c38477c..7294a8667 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 6583149e3..6bbb3dcff 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 cc09b9163..f3fab3c24 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 2df8d3a7f..7c90a7395 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 ac172a171..dc71a98f6 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>
--
GitLab