gluon-config-mode-mesh-vpn: Move display of key to translations

When rebooting the node in config mode, currently the fastd key is
forcefully displayed in a fixed format. This is confusing in communities
where fastd accepts all keys and no key submission is needed.
Furthermore, some communities might want to personalize the display of
the key (see #387).

This patch moves the displaying <div> from the package's lua file to the
translation files of the sample site configuration and mentiones the
change in the release notes.

docs/index.rst

@@ -57,6 +57,7 @@ Releases
 .. toctree::
    :maxdepth: 1
 
+   releases/v2015.2
    releases/v2015.1.2
    releases/v2015.1.1
    releases/v2015.1

docs/releases/v2015.2.rst

@@ -0,0 +1,37 @@
+Gluon 2015.2 (in development)
+=============================
+
+Added (and removed) hardware support
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+New features
+~~~~~~~~~~~~
+
+
+Bugfixes
+~~~~~~~~
+
+
+Site changes
+~~~~~~~~~~~~
+* ``i18n/``
+
+  - The translations of ``gluon-config-mode:pubkey`` now have to show the fastd
+    public key itself if desired, making its format and whether it is shown at
+    all configurable. To retain the old format, add ``<p>`` to the beginning of
+    your translations and append::
+
+    "</p>"
+    "<div class=\"the-key\">"
+    " # <%= hostname %>"
+    " <br/>"
+    "<%= pubkey %>"
+    "</div>"
+
+Internals
+~~~~~~~~~
+
+
+Known Issues
+~~~~~~~~~~~~

docs/site-example/i18n/de.po

@@ -18,12 +18,18 @@ msgstr ""
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
-"Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Erst nachdem "
+"<p>Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Erst nachdem "
 "er auf den Servern des Entenhausener Freifunk-Projektes eingetragen wurde, "
 "kann sich dein Knoten mit dem Entenhausener Mesh-VPN zu verbinden. Bitte "
 "schicke dazu diesen Schlüssel und den Namen deines Knotens "
 "(<em><%=hostname%></em>) an "
 "<a href=\"mailto:keys@entenhausen.freifunk.net\">keys@entenhausen.freifunk.net</a>."
+"</p>"
+"<div class=\"the-key\">"
+" # <%= hostname %>"
+" <br/>"
+"<%= pubkey %>"
+"</div>"
 
 msgid "gluon-config-mode:reboot"
 msgstr ""

docs/site-example/i18n/en.po

@@ -17,11 +17,17 @@ msgstr ""
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
-"This is your Freifunk node's public key. The node won't be able to "
+"<p>This is your Freifunk node's public key. The node won't be able to "
 "connect to the mesh VPN until the key has been registered on the Freifunk "
 "Duckburg servers. "
 "To register the key send it together with your node's name (<em><%=hostname%></em>) to "
 "<a href=\"mailto:keys@entenhausen.freifunk.net\">keys@entenhausen.freifunk.net</a>."
+"</p>"
+"<div class=\"the-key\">"
+" # <%= hostname %>"
+" <br/>"
+"<%= pubkey %>"
+"</div>"
 
 
 msgid "gluon-config-mode:reboot"

package/gluon-config-mode-mesh-vpn/files/lib/gluon/config-mode/reboot/0100-mesh-vpn.lua

@@ -12,12 +12,7 @@ else
   local pubkey = util.trim(util.exec("/etc/init.d/fastd show_key " .. "mesh_vpn"))
   local hostname = uci:get_first("system", "system", "hostname")
 
-  local msg = [[<p>]] .. i18n.translate('gluon-config-mode:pubkey') .. [[</p>
-               <div class="the-key">
-                 # <%= hostname %>
-                 <br/>
-               <%= pubkey %>
-               </div>]]
+  local msg = i18n.translate('gluon-config-mode:pubkey')
 
   return function ()
            luci.template.render_string(msg, { pubkey=pubkey