usability improvements (updated localization; new payment switch now defaults to expenditure)

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

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

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>

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">