gluon-config-mode-contact-info: provide enhancements for german, english and french translation to comply with DSGVO (#1394)

* do not allow to obligatorily require contact information
* add remark that the data is provided voluntarily
* mention how to delete the data
* be very clear about the fact that the data being entered is public and
  can be downloaded and processed by anyone.
This commit is contained in:
Christof Schulze 2018-05-19 19:26:33 +02:00 committed by Andreas Ziegler
parent 1be49d1326
commit ab7f1acd0c
6 changed files with 30 additions and 21 deletions

View File

@ -387,9 +387,6 @@ config_mode \: optional
and *gluon-config-mode:altitude-help* strings must be provided in the site i18n and *gluon-config-mode:altitude-help* strings must be provided in the site i18n
data as well. data as well.
The *owner.optional* option can be set to *false* to make the contact
information field mandatory.
The remote login page only shows SSH key configuration by default. A The remote login page only shows SSH key configuration by default. A
password form can be displayed by setting *remote_login.show_password_form* password form can be displayed by setting *remote_login.show_password_form*
to true; in this case, *remote_login.min_password_length* defines the to true; in this case, *remote_login.min_password_length* defines the
@ -403,9 +400,6 @@ config_mode \: optional
geo_location = { geo_location = {
show_altitude = true, show_altitude = true,
}, },
owner = {
optional = false,
},
remote_login = { remote_login = {
show_password_form = true, show_password_form = true,
min_password_length = 10, min_password_length = 10,

View File

@ -1 +0,0 @@
need_boolean(in_site({'config_mode', 'owner', 'optional'}), false)

View File

@ -16,12 +16,18 @@ msgstr "Kontakt"
msgid "" msgid ""
"Please provide your contact information here to allow others to contact " "Please provide your contact information here to allow others to contact "
"you. Note that this information will be visible <em>publicly</em> on " "you. Note that this information will be visible <em>publicly</em> 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 "" msgstr ""
"Bitte hinterlege hier einen Hinweis, um anderen zu ermöglichen, " "Bitte hinterlege hier einen Hinweis, um anderen zu ermöglichen, "
"Kontakt mit dir aufzunehmen. Beachte, dass dieser Hinweis auch " "Kontakt mit dir aufzunehmen. Beachte, dass dieser Hinweis auch "
"<em>öffentlich</em> im Internet, zusammen mit den Koordinaten " "<em>öffentlich</em> 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" msgid "e.g. E-mail or phone number"
msgstr "z.B. E-Mail oder Telefonnummer" msgstr "z.B. E-Mail oder Telefonnummer"

View File

@ -16,11 +16,18 @@ msgstr "Informations de Contact"
msgid "" msgid ""
"Please provide your contact information here to allow others to contact " "Please provide your contact information here to allow others to contact "
"you. Note that this information will be visible <em>publicly</em> on " "you. Note that this information will be visible <em>publicly</em> 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 "" msgstr ""
"S'il vous plaît entrez ici des informations <em>publiques</em> pour " "Entrez vos coordonnées ici si vous souhaitez permettre à d'autres "
"permettre aux autres de vous contacter. " "personnes de communiquer avec vous. Ces informations seront affichées "
"Ces informations seront affichées en ligne, avec les coordonnées du nœud." "<em>en ligne</em> 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" msgid "e.g. E-mail or phone number"
msgstr "Ex : E-mail ou numéro de téléphone" msgstr "Ex : E-mail ou numéro de téléphone"

View File

@ -7,7 +7,10 @@ msgstr ""
msgid "" msgid ""
"Please provide your contact information here to allow others to contact " "Please provide your contact information here to allow others to contact "
"you. Note that this information will be visible <em>publicly</em> on " "you. Note that this information will be visible <em>publicly</em> 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 "" msgstr ""
msgid "e.g. E-mail or phone number" msgid "e.g. E-mail or phone number"

View File

@ -6,17 +6,17 @@ return function(form, uci)
local owner = uci:get_first("gluon-node-info", "owner") local owner = uci:get_first("gluon-node-info", "owner")
local s = form:section(Section, nil, pkg_i18n.translate( local s = form:section(Section, nil, pkg_i18n.translate(
'Please provide your contact information here to ' 'Please provide your contact information here to allow others to contact '
.. 'allow others to contact you. Note that ' .. 'you. Note that this information will be visible <em>publicly</em> on '
.. 'this information will be visible <em>publicly</em> ' .. 'the internet together with your node\'s coordinates. This means it can '
.. 'on the internet together with your node\'s coordinates.' .. '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", pkg_i18n.translate("Contact info"), pkg_i18n.translate("e.g. E-mail or phone number")) local o = s:option(Value, "contact", pkg_i18n.translate("Contact info"), pkg_i18n.translate("e.g. E-mail or phone number"))
o.default = uci:get("gluon-node-info", owner, "contact") o.default = uci:get("gluon-node-info", owner, "contact")
o.optional = site.config_mode.owner.optional(true) o.optional = true
-- without a minimal length, an empty string will be accepted even with "optional = false"
o.datatype = "minlength(1)"
function o:write(data) function o:write(data)
uci:set("gluon-node-info", owner, "contact", data) uci:set("gluon-node-info", owner, "contact", data)
end end