diff --git a/docs/index.rst b/docs/index.rst index b311b2fd..703fcae8 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -53,7 +53,6 @@ Several Freifunk communities in Germany use Gluon as the foundation of their Fre :maxdepth: 1 package/gluon-client-bridge - package/gluon-config-mode-contact-info package/gluon-config-mode-geo-location package/gluon-ebtables-filter-multicast package/gluon-ebtables-filter-ra-dhcp diff --git a/docs/package/gluon-config-mode-contact-info.rst b/docs/package/gluon-config-mode-contact-info.rst deleted file mode 100644 index 6072aa5a..00000000 --- a/docs/package/gluon-config-mode-contact-info.rst +++ /dev/null @@ -1,21 +0,0 @@ -gluon-config-mode-contact-info -============================== - -This package allows the user to provide contact information within config mode to be -distributed in the mesh. You can define whether the owner contact field is -obligatory or not in your site.conf. - -site.conf ---------- - -config_mode.owner.obligatory \: optional (defaults to false) - If ``obligatory`` is set to ``true``, the contact info field must be supplied - and may not be left empty. - -Example:: - - config_mode = { - owner = { - obligatory = true - } - } diff --git a/package/gluon-config-mode-contact-info/Makefile b/package/gluon-config-mode-contact-info/Makefile index 7a3780a6..602490de 100644 --- a/package/gluon-config-mode-contact-info/Makefile +++ b/package/gluon-config-mode-contact-info/Makefile @@ -39,9 +39,4 @@ define Package/gluon-config-mode-contact-info/install $(call GluonInstallI18N,gluon-config-mode-contact-info,$(1)) endef -define Package/gluon-config-mode-contact-info/postinst -#!/bin/sh -$(call GluonCheckSite,check_site.lua) -endef - $(eval $(call BuildPackage,gluon-config-mode-contact-info)) diff --git a/package/gluon-config-mode-contact-info/check_site.lua b/package/gluon-config-mode-contact-info/check_site.lua index fe818616..e69de29b 100644 --- a/package/gluon-config-mode-contact-info/check_site.lua +++ b/package/gluon-config-mode-contact-info/check_site.lua @@ -1,3 +0,0 @@ -if need_table('config_mode', nil, false) and need_table('config_mode.owner', nil, false) then - need_boolean('config_mode.owner.obligatory', false) -end diff --git a/package/gluon-config-mode-contact-info/i18n/de.po b/package/gluon-config-mode-contact-info/i18n/de.po index 35f0ee95..651fdde4 100644 --- a/package/gluon-config-mode-contact-info/i18n/de.po +++ b/package/gluon-config-mode-contact-info/i18n/de.po @@ -16,12 +16,18 @@ msgstr "Kontakt" msgid "" "Please provide your contact information here to allow others to contact " "you. Note that this information will be visible publicly on " -"the internet together with your node's coordinates." +"the internet together with your node's coordinates. This means it can " +"be downloaded and processed by anyone. This information is " +"not required to operate a node. If you chose to enter data, it will be " +"stored on this node and can be deleted by yourself at any time." msgstr "" "Bitte hinterlege hier einen Hinweis, um anderen zu ermöglichen, " "Kontakt mit dir aufzunehmen. Beachte, dass dieser Hinweis auch " "öffentlich im Internet, zusammen mit den Koordinaten " -"deines Knotens, einsehbar sein wird." +"deines Knotens, einsehbar sein wird. Das bedeutet, dass diese Informationen " +"von jedem heruntergeladen und verarbeitet werden können. Für den Betrieb sind diese " +"Informationen nicht erforderlich. Eine Speicherung erfolgt auf diesem Knoten. " +"Die Daten können durch dich in diesem Menü eigenständig gelöscht werden." msgid "e.g. E-mail or phone number" msgstr "z.B. E-Mail oder Telefonnummer" diff --git a/package/gluon-config-mode-contact-info/i18n/fr.po b/package/gluon-config-mode-contact-info/i18n/fr.po index 624b1864..f20e06cb 100644 --- a/package/gluon-config-mode-contact-info/i18n/fr.po +++ b/package/gluon-config-mode-contact-info/i18n/fr.po @@ -16,11 +16,18 @@ msgstr "Informations de Contact" msgid "" "Please provide your contact information here to allow others to contact " "you. Note that this information will be visible publicly on " -"the internet together with your node's coordinates." +"the internet together with your node's coordinates. This means it can " +"be downloaded and processed by anyone. This information is " +"not required to operate a node. If you chose to enter data, it will be " +"stored on this node and can be deleted by yourself at any time." msgstr "" -"S'il vous plaît entrez ici des informations publiques pour " -"permettre aux autres de vous contacter. " -"Ces informations seront affichées en ligne, avec les coordonnées du nœud." +"Entrez vos coordonnées ici si vous souhaitez permettre à d'autres " +"personnes de communiquer avec vous. Ces informations seront affichées " +"en ligne avec les coordonnées du nœud. Il peut être téléchargé " +"et traité par tous. Il n'est pas obligatoire " +"de fournir ces informations pour pouvoir opérer un nœud. Si vous avez " +"choisi d'entrer des données, elles seront stockées sur ce nœud et vous " +"pourrez les effacer par vous-même à tout moment." msgid "e.g. E-mail or phone number" msgstr "Ex : E-mail ou numéro de téléphone" diff --git a/package/gluon-config-mode-contact-info/i18n/gluon-config-mode-contact-info.pot b/package/gluon-config-mode-contact-info/i18n/gluon-config-mode-contact-info.pot index 9dcaf9ec..913f38a5 100644 --- a/package/gluon-config-mode-contact-info/i18n/gluon-config-mode-contact-info.pot +++ b/package/gluon-config-mode-contact-info/i18n/gluon-config-mode-contact-info.pot @@ -7,7 +7,10 @@ msgstr "" msgid "" "Please provide your contact information here to allow others to contact " "you. Note that this information will be visible publicly on " -"the internet together with your node's coordinates." +"the internet together with your node's coordinates. This means it can be " +"downloaded and processed by anyone. This information is " +"not required to operate a node. If you chose to enter data, it will be " +"stored on this node and can be deleted by yourself at any time." msgstr "" msgid "e.g. E-mail or phone number" diff --git a/package/gluon-config-mode-contact-info/luasrc/lib/gluon/config-mode/wizard/0500-contact-info.lua b/package/gluon-config-mode-contact-info/luasrc/lib/gluon/config-mode/wizard/0500-contact-info.lua index 1ef5deaf..fcfb559e 100644 --- a/package/gluon-config-mode-contact-info/luasrc/lib/gluon/config-mode/wizard/0500-contact-info.lua +++ b/package/gluon-config-mode-contact-info/luasrc/lib/gluon/config-mode/wizard/0500-contact-info.lua @@ -4,17 +4,18 @@ return function(form, uci) local owner = uci:get_first("gluon-node-info", "owner") local s = form:section(Section, nil, translate( - 'Please provide your contact information here to ' - .. 'allow others to contact you. Note that ' - .. 'this information will be visible publicly ' - .. 'on the internet together with your node\'s coordinates.' + 'Please provide your contact information here to allow others to contact ' + .. 'you. Note that this information will be visible publicly on ' + .. 'the internet together with your node\'s coordinates. This means it can ' + .. 'be downloaded and processed by anyone. This information is ' + .. 'not required to operate a node. If you chose to enter data, it will be ' + .. 'stored on this node and can be deleted by yourself at any time.' )) local o = s:option(Value, "contact", translate("Contact info"), translate("e.g. E-mail or phone number")) o.default = uci:get("gluon-node-info", owner, "contact") - o.optional = not ((site.config_mode or {}).owner or {}).obligatory - -- without a minimal length, an empty string will be accepted even with "optional = false" - o.datatype = "minlength(1)" + o.datatype = 'minlength(1)' + o.optional = true function o:write(data) if data then uci:set("gluon-node-info", owner, "contact", data)