From 533ea986ad412c15e82a2c374fb63f050ecb926d Mon Sep 17 00:00:00 2001
From: Andreas Ziegler <dev@andreas-ziegler.de>
Date: Wed, 27 Jun 2018 00:36:59 +0200
Subject: [PATCH] gluon-config-mode-hostname: allow overriding hostname
description text
---
docs/site-example/i18n/de.po | 5 +++++
docs/site-example/i18n/en.po | 5 +++++
docs/site-example/i18n/fr.po | 5 +++++
docs/site-example/i18n/gluon-site.pot | 3 +++
docs/user/site.rst | 3 +++
.../lib/gluon/config-mode/wizard/0100-hostname.lua | 10 ++++++----
6 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/docs/site-example/i18n/de.po b/docs/site-example/i18n/de.po
index e4f59ecf5..445e48c98 100644
--- a/docs/site-example/i18n/de.po
+++ b/docs/site-example/i18n/de.po
@@ -80,3 +80,8 @@ msgstr ""
msgid "gluon-config-mode:contact-note"
msgstr "z.B. E-Mail oder Telefonnummer"
+
+# Leave empty to use the default text, which can be found in:
+# package/gluon-config-mode-hostname/i18n/
+msgid "gluon-config-mode:hostname-help"
+msgstr ""
diff --git a/docs/site-example/i18n/en.po b/docs/site-example/i18n/en.po
index 02d7f822a..5cb053e65 100644
--- a/docs/site-example/i18n/en.po
+++ b/docs/site-example/i18n/en.po
@@ -74,3 +74,8 @@ msgstr ""
msgid "gluon-config-mode:contact-note"
msgstr "e.g. E-mail or phone number"
+
+# Leave empty to use the default text, which can be found in:
+# package/gluon-config-mode-hostname/i18n/
+msgid "gluon-config-mode:hostname-help"
+msgstr ""
diff --git a/docs/site-example/i18n/fr.po b/docs/site-example/i18n/fr.po
index aed423e17..36c35a469 100644
--- a/docs/site-example/i18n/fr.po
+++ b/docs/site-example/i18n/fr.po
@@ -75,3 +75,8 @@ msgstr ""
msgid "gluon-config-mode:contact-note"
msgstr "Ex : E-mail ou numéro de téléphone"
+
+# Leave empty to use the default text, which can be found in:
+# package/gluon-config-mode-hostname/i18n/
+msgid "gluon-config-mode:hostname-help"
+msgstr ""
diff --git a/docs/site-example/i18n/gluon-site.pot b/docs/site-example/i18n/gluon-site.pot
index 3fb5c98bd..a0312fe9b 100644
--- a/docs/site-example/i18n/gluon-site.pot
+++ b/docs/site-example/i18n/gluon-site.pot
@@ -30,3 +30,6 @@ msgstr ""
msgid "gluon-config-mode:contact-note"
msgstr ""
+
+msgid "gluon-config-mode:hostname-help"
+msgstr ""
diff --git a/docs/user/site.rst b/docs/user/site.rst
index fd205d134..157541c81 100644
--- a/docs/user/site.rst
+++ b/docs/user/site.rst
@@ -520,6 +520,9 @@ gluon-config-mode:contact-help
gluon-config-mode:contact-note
Note shown (in small font) below the ``contact`` field
+gluon-config-mode:hostname-help
+ Description for the usage of the ``hostname`` field
+
gluon-config-mode:reboot
General information shown on the reboot page.
diff --git a/package/gluon-config-mode-hostname/luasrc/lib/gluon/config-mode/wizard/0100-hostname.lua b/package/gluon-config-mode-hostname/luasrc/lib/gluon/config-mode/wizard/0100-hostname.lua
index 4155e8f48..d078b4de8 100644
--- a/package/gluon-config-mode-hostname/luasrc/lib/gluon/config-mode/wizard/0100-hostname.lua
+++ b/package/gluon-config-mode-hostname/luasrc/lib/gluon/config-mode/wizard/0100-hostname.lua
@@ -1,14 +1,16 @@
return function(form, uci)
local pkg_i18n = i18n 'gluon-config-mode-hostname'
+ local site_i18n = i18n 'gluon-site'
local pretty_hostname = require 'pretty_hostname'
local site = require 'gluon.site'
local util = require 'gluon.util'
- form:section(Section, nil, pkg_i18n.translate(
- "The node name is used solely for identification of your node, e.g. on a "
- .. "node map. It does not affect the name (SSID) of the broadcasted WLAN."
- ))
+ local help = site_i18n._translate("gluon-config-mode:hostname-help") or pkg_i18n.translate(
+ 'The node name is used solely for identification of your node, e.g. on a '
+ .. 'node map. It does not affect the name (SSID) of the broadcasted WLAN.'
+ )
+ form:section(Section, nil, help)
local current_hostname = pretty_hostname.get(uci)
local default_hostname = util.default_hostname()
--
GitLab