fix localisation on user page

3 files changed, 15 insertions, 12 deletions

diff --git a/abrechenbarkeit.lua b/abrechenbarkeit.lua
index a7f969b..2b3f9ea 100755
--- a/abrechenbarkeit.lua
+++ b/abrechenbarkeit.lua
@@ -490,29 +490,31 @@ local function r_user(username)
 		print(format([[
             <form class="transaction box backgroundbox {disable_class}" action="" method="POST">
                 <h3>{+user.form.transfer}</h3>
-                <label for="user_dst">Destination: </label>
+                <label for="user_dst">{+field.destination}: </label>
                 <select name="user_dst">]], {
                 	username = username,
                 }))
 		local users = get_active_users();
 		for _, u in ipairs(users) do
-			print(format("<option value={!name}>{name}</option>", { name = u.name }))
+			if u.name ~= username then
+				print(format("<option value={!name}>{name}</option>", { name = u.name }))
+			end
 		end
         print(format([[
                 </select>
                 <input type="text" name="user_src" value="{!username}" hidden />
-                <label for="amount">Amount (ct): </label>
+                <label for="amount">{+field.amount}: </label>
                 <input type="number" name="amount" id="amount" />
-                <label for="comment">Comment: </label>
+                <label for="comment">{+field.comment}: </label>
                 <input type="text" name="comment" id="comment" />
                 <input type="submit" value="{+user.form.transfer.submit}" class="amount-ntr button" />
             </form>
             <form class="transaction box backgroundbox {disable_class}" action="" method="POST">
                 <h3>{+user.form.transaction}</h3>
                 <input type="text" name="user_dst" value="{!username}" hidden />
-                <label for="amount">Amount (ct): </label>
+                <label for="amount">{+field.amount}: </label>
                 <input type="number" name="amount" id="amount" />
-                <label for="comment">Comment: </label>
+                <label for="comment">{+field.comment}: </label>
                 <input type="text" name="comment" id="comment" />
                 <input type="submit" value="{+user.form.transaction.submit}" class="amount-ntr button" />
             </form>
@@ -520,7 +522,7 @@ local function r_user(username)
                 <h3>{+user.form.buy}</h3>
                 <input type="text" name="user_dst" value="{!username}" hidden />
                 <input type="text" name="negate_pcount" value="1" hidden />
-                <label for="pcount">Count: </label>
+                <label for="pcount">{+field.count}: </label>
                 <input type="number" name="pcount" id="pcount" value="1" />
                 <label for="pcode">{+field.barcode}: </label>
                 <input type="text" name="pcode" id="pcode" />
diff --git a/locale/de.ini b/locale/de.ini
index 04c58f4..ac89608 100644
--- a/locale/de.ini
+++ b/locale/de.ini
@@ -1,6 +1,7 @@
 [abrechenbarkeit]
 appname=Abrechenbarkeit
 about=Über
+field.destination=Ziel
 field.amount=Menge
 field.barcode=Barcode
 field.comment=Kommentar
@@ -29,12 +30,12 @@ time.second=Sekunde
 time.seconds=Sekunden
 user.balance=Kontostand
 user.form.buy.submit=Kaufen
-user.form.buy=Produkt Kaufen
+user.form.buy=Produkt kaufen
 user.form.restock.submit=Wiederauffüllen
 user.form.restock=Produkt wiederauffüllen
 user.form.transaction.submit=Aktualisieren
 user.form.transaction=Transaktion erstellen
-user.form.transfer=Geld Überweisen
+user.form.transfer=Geld überweisen
 user.form.transfer.submit=Senden
 user.last_txn=Letzte Transaktion {time}.
 user.view_log=Benutzerprotokoll einsehen
diff --git a/locale/en.ini b/locale/en.ini
index a292be5..a2cdb16 100644
--- a/locale/en.ini
+++ b/locale/en.ini
@@ -6,11 +6,11 @@ about.thanks=Thanks for choosing Abrechenbarkeit.
 about.title=About Abrechenbarkeit
 about=About
 appname=Abrechenbarkeit
-field.amount=Amount
-field.barcode=Barcode
+field.destination=Destination
+field.amount=Amount (ct)
 field.comment=Comment
 field.count=Count
-field.name=Name
+field.barcode=Barcode
 field.price=Price
 field.time=Time
 field.upstream_price=Upstream Price