From 5cf7c53e697b2aeafb000a4a4c1f4e401a1f9e67 Mon Sep 17 00:00:00 2001
From: Andreas Ziegler <dev@andreas-ziegler.de>
Date: Wed, 27 Jun 2018 00:11:00 +0200
Subject: [PATCH] gluon-config-mode-geo-location: allow overriding geo location
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/0400-geo-location.lua | 2 +-
6 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/docs/site-example/i18n/de.po b/docs/site-example/i18n/de.po
index 445e48c98..7aa8e3f1e 100644
--- a/docs/site-example/i18n/de.po
+++ b/docs/site-example/i18n/de.po
@@ -85,3 +85,8 @@ msgstr "z.B. E-Mail oder Telefonnummer"
# package/gluon-config-mode-hostname/i18n/
msgid "gluon-config-mode:hostname-help"
msgstr ""
+
+# Leave empty to use the default text, which can be found in:
+# package/gluon-config-mode-geo-location/i18n/
+msgid "gluon-config-mode:geo-location-help"
+msgstr ""
diff --git a/docs/site-example/i18n/en.po b/docs/site-example/i18n/en.po
index 5cb053e65..f7c14084a 100644
--- a/docs/site-example/i18n/en.po
+++ b/docs/site-example/i18n/en.po
@@ -79,3 +79,8 @@ msgstr "e.g. E-mail or phone number"
# package/gluon-config-mode-hostname/i18n/
msgid "gluon-config-mode:hostname-help"
msgstr ""
+
+# Leave empty to use the default text, which can be found in:
+# package/gluon-config-mode-geo-location/i18n/
+msgid "gluon-config-mode:geo-location-help"
+msgstr ""
diff --git a/docs/site-example/i18n/fr.po b/docs/site-example/i18n/fr.po
index 36c35a469..7bd28a3e5 100644
--- a/docs/site-example/i18n/fr.po
+++ b/docs/site-example/i18n/fr.po
@@ -80,3 +80,8 @@ msgstr "Ex : E-mail ou numéro de téléphone"
# package/gluon-config-mode-hostname/i18n/
msgid "gluon-config-mode:hostname-help"
msgstr ""
+
+# Leave empty to use the default text, which can be found in:
+# package/gluon-config-mode-geo-location/i18n/
+msgid "gluon-config-mode:geo-location-help"
+msgstr ""
diff --git a/docs/site-example/i18n/gluon-site.pot b/docs/site-example/i18n/gluon-site.pot
index a0312fe9b..032c6931f 100644
--- a/docs/site-example/i18n/gluon-site.pot
+++ b/docs/site-example/i18n/gluon-site.pot
@@ -33,3 +33,6 @@ msgstr ""
msgid "gluon-config-mode:hostname-help"
msgstr ""
+
+msgid "gluon-config-mode:geo-location-help"
+msgstr ""
diff --git a/docs/user/site.rst b/docs/user/site.rst
index 157541c81..c098b193c 100644
--- a/docs/user/site.rst
+++ b/docs/user/site.rst
@@ -523,6 +523,9 @@ gluon-config-mode:contact-note
gluon-config-mode:hostname-help
Description for the usage of the ``hostname`` field
+gluon-config-mode:geo-location-help
+ Description for the usage of the longitude/latitude fields
+
gluon-config-mode:reboot
General information shown on the reboot page.
diff --git a/package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua b/package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua
index 05d9b6860..718e59eee 100644
--- a/package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua
+++ b/package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua
@@ -14,7 +14,7 @@ return function(form, uci)
return uci:get_bool("gluon-node-info", location, "altitude")
end
- local text = pkg_i18n.translate(
+ local text = site_i18n._translate("gluon-config-mode:geo-location-help") or pkg_i18n.translate(
'If you want the location of your node to ' ..
'be displayed on the map, you can enter its coordinates here.'
)
--
GitLab