* luci/modules/freifunk: fix translation of contact page

diff --git a/modules/freifunk/luasrc/i18n/freifunk.de.lua b/modules/freifunk/luasrc/i18n/freifunk.de.lua
index de25a77..27382b3 100644 (file)
--- a/modules/freifunk/luasrc/i18n/freifunk.de.lua
+++ b/modules/freifunk/luasrc/i18n/freifunk.de.lua
@@ -9,6 +9,7 @@ ff_location = 'Standort'
 ff_mail = 'E-Mail'
 ff_mail1 = 'Bitte unbedingt angeben!'
 ff_nickname = 'Pseudonym'
 ff_mail = 'E-Mail'
 ff_mail1 = 'Bitte unbedingt angeben!'
 ff_nickname = 'Pseudonym'

+ff_name = 'Name'

 ff_node = 'Knoten'
 ff_note = 'Notiz'
 ff_phone = 'Telefon'
 ff_node = 'Knoten'
 ff_note = 'Notiz'
 ff_phone = 'Telefon'

diff --git a/modules/freifunk/luasrc/i18n/freifunk.de.xml b/modules/freifunk/luasrc/i18n/freifunk.de.xml
index bd6ac3d..426454d 100644 (file)
--- a/modules/freifunk/luasrc/i18n/freifunk.de.xml
+++ b/modules/freifunk/luasrc/i18n/freifunk.de.xml
@@ -14,6 +14,7 @@
 <i18n:msg xml:id="ff_mail">E-Mail</i18n:msg>
 <i18n:msg xml:id="ff_mail1">Bitte unbedingt angeben!</i18n:msg>
 <i18n:msg xml:id="ff_nickname">Pseudonym</i18n:msg>
 <i18n:msg xml:id="ff_mail">E-Mail</i18n:msg>
 <i18n:msg xml:id="ff_mail1">Bitte unbedingt angeben!</i18n:msg>
 <i18n:msg xml:id="ff_nickname">Pseudonym</i18n:msg>

+<i18n:msg xml:id="ff_name">Name</i18n:msg>

 <i18n:msg xml:id="ff_node">Knoten</i18n:msg>
 <i18n:msg xml:id="ff_note">Notiz</i18n:msg>
 <i18n:msg xml:id="ff_phone">Telefon</i18n:msg>
 <i18n:msg xml:id="ff_node">Knoten</i18n:msg>
 <i18n:msg xml:id="ff_note">Notiz</i18n:msg>
 <i18n:msg xml:id="ff_phone">Telefon</i18n:msg>

diff --git a/modules/freifunk/luasrc/i18n/freifunk.en.lua b/modules/freifunk/luasrc/i18n/freifunk.en.lua
index 173ccaf..cf3ae4d 100644 (file)
--- a/modules/freifunk/luasrc/i18n/freifunk.en.lua
+++ b/modules/freifunk/luasrc/i18n/freifunk.en.lua
@@ -9,6 +9,7 @@ ff_location = 'Location'
 ff_mail = 'E-Mail'
 ff_mail1 = 'You really should provide your address here!'
 ff_nickname = 'Nickname'
 ff_mail = 'E-Mail'
 ff_mail1 = 'You really should provide your address here!'
 ff_nickname = 'Nickname'

+ff_name = 'Realname'

 ff_node = 'Node'
 ff_note = 'Notice'
 ff_phone = 'Phone'
 ff_node = 'Node'
 ff_note = 'Notice'
 ff_phone = 'Phone'

diff --git a/modules/freifunk/luasrc/i18n/freifunk.en.xml b/modules/freifunk/luasrc/i18n/freifunk.en.xml
index 5664ba6..ce519ad 100644 (file)
--- a/modules/freifunk/luasrc/i18n/freifunk.en.xml
+++ b/modules/freifunk/luasrc/i18n/freifunk.en.xml
@@ -14,6 +14,7 @@
 <i18n:msg xml:id="ff_mail">E-Mail</i18n:msg>
 <i18n:msg xml:id="ff_mail1">You really should provide your address here!</i18n:msg>
 <i18n:msg xml:id="ff_nickname">Nickname</i18n:msg>
 <i18n:msg xml:id="ff_mail">E-Mail</i18n:msg>
 <i18n:msg xml:id="ff_mail1">You really should provide your address here!</i18n:msg>
 <i18n:msg xml:id="ff_nickname">Nickname</i18n:msg>

+<i18n:msg xml:id="ff_name">Realname</i18n:msg>

 <i18n:msg xml:id="ff_node">Node</i18n:msg>
 <i18n:msg xml:id="ff_note">Notice</i18n:msg>
 <i18n:msg xml:id="ff_phone">Phone</i18n:msg>
 <i18n:msg xml:id="ff_node">Node</i18n:msg>
 <i18n:msg xml:id="ff_note">Notice</i18n:msg>
 <i18n:msg xml:id="ff_phone">Phone</i18n:msg>

diff --git a/modules/freifunk/luasrc/view/freifunk/contact.htm b/modules/freifunk/luasrc/view/freifunk/contact.htm
index 12b072c..3596827 100644 (file)
--- a/modules/freifunk/luasrc/view/freifunk/contact.htm
+++ b/modules/freifunk/luasrc/view/freifunk/contact.htm
@@ -16,12 +16,12 @@ $Id$
 <% local contact = luci.model.uci.cursor():get_all("freifunk", "contact") %>
 <h1><%:contact%></h1>
 <table cellspacing="0" cellpadding="6">
 <% local contact = luci.model.uci.cursor():get_all("freifunk", "contact") %>
 <h1><%:contact%></h1>
 <table cellspacing="0" cellpadding="6">

-       <tr><th><%:nickname%>:</th><td><%=contact.nickname%></td></tr>
-       <tr><th><%:name%>:</th><td><%=contact.name%></td></tr>
-       <tr><th><%:mail%>:</th><td><%=contact.mail%></td></tr>
-       <tr><th><%:phone%>:</th><td><%=contact.phone%></td></tr>
-       <tr><th><%:location%>:</th><td><%=contact.location%></td></tr>
-       <tr><th><%:geocoord%>:</th><td><%=contact.geo%></td></tr>
-       <tr><th><%:note%>:</th><td><%=contact.note%></td></tr>
+       <tr><th><%:ff_nickname%>:</th><td><%=contact.nickname%></td></tr>
+       <tr><th><%:ff_name%>:</th><td><%=contact.name%></td></tr>
+       <tr><th><%:ff_mail%>:</th><td><%=contact.mail%></td></tr>
+       <tr><th><%:ff_phone%>:</th><td><%=contact.phone%></td></tr>
+       <tr><th><%:ff_location%>:</th><td><%=contact.location%></td></tr>
+       <tr><th><%:ff_geocoord%>:</th><td><%=contact.geo%></td></tr>
+       <tr><th><%:ff_note%>:</th><td><%=contact.note%></td></tr>

 </table>
 </table>

-<%+footer%>
\ No newline at end of file
+<%+footer%>