Commit 1de5dbe4 authored by chrissi^'s avatar chrissi^

Patches to modify texts inside the config wizzard

Some texts are not available via the site-translation feature. But we still want to change them.
Before v2017.1 we used forked gluon-packages to do so. But those did not get any love.
Now we are trying patches that are likey to break if the modules change. This way we can react to problems arising from our patches.
parent 1ec21a56
......@@ -22,7 +22,7 @@ msgstr ""
"er auf den Servern des Braunschweig Freifunk-Projektes eingetragen wurde, "
"kann sich dein Knoten mit dem Braunschweig Mesh-VPN zu verbinden. Bitte "
"trage diesen Schlüssel in dieses <a href=\"http://freifunk-bs.de/eintragen.html\">Formular</a> ein. "
"Die Eintragung ist einmalig, wenn du später den Namen, Koordinaten oder Kontakt änderst, "
"Die Eintragung ist einmalig. Wenn du später den Namen, Koordinaten oder Kontakt änderst "
"muss der Key nicht erneut eingetragen werden."
"<div class=\"the-key\">"
" # <%= hostname %>"
......@@ -46,3 +46,9 @@ msgstr ""
"die Reset-Taste des Routers gedrückt und lasse los, sobald "
"alle LEDs aufleuchten, etwa 10s. Der Router startet dann "
"in das Konfigurationsmenü."
msgid "gluon-config-mode:altitude-help"
msgstr "Die Angabe Höhe über Grund ist optional."
msgid "gluon-config-mode:altitude-label"
msgstr "(Optional) Höhe über Grund"
......@@ -21,8 +21,7 @@ msgstr ""
"connect to the mesh VPN until the key has been registered on the Freifunk "
"Braunschweig servers. "
"To register the key please fill it into this <a href=\"http://freifunk-bs.de/eintragen.html\">form</a>. "
"You have to register the key only once, you do not have to redo this after you changed the coordinates, "
"name, or contact."
"You have to register the key only once. You do not have to redo this after you changed the coordinates."
"<div class=\"the-key\">"
" # <%= hostname %>"
" # <%= contact %>"
......@@ -37,3 +36,9 @@ msgstr ""
"Your can find lots of information on the Freifunk Braunschweig community on "
"<a href=\"https://www.freifunk-bs.de/\">our homepage</a>."
"<p>Have fun with your node and exploring the Freifunk network!</p>"
msgid "gluon-config-mode:altitude-help"
msgstr "Height above ground is optional."
msgid "gluon-config-mode:altitude-label"
msgstr "(Optional) Height above ground"
From e2f0d74d284b12c63c66425b8749e4a7b4b6810a Mon Sep 17 00:00:00 2001
From: Chris Fiege <c.fiege@pengutronix.de>
Date: Wed, 21 Jun 2017 21:29:45 +0200
Subject: [PATCH] Modifying the config-mode-contact-package to match the FFBS
texts
---
package/gluon-config-mode-contact-info/i18n/de.po | 13 +++++------
package/gluon-config-mode-contact-info/i18n/fr.po | 26 ----------------------
.../i18n/gluon-config-mode-contact-info.pot | 5 ++---
.../gluon/config-mode/wizard/0500-contact-info.lua | 6 ++---
4 files changed, 10 insertions(+), 40 deletions(-)
delete mode 100644 package/gluon-config-mode-contact-info/i18n/fr.po
diff --git a/package/gluon-config-mode-contact-info/i18n/de.po b/package/gluon-config-mode-contact-info/i18n/de.po
index 35f0ee95..a4ef972a 100644
--- a/package/gluon-config-mode-contact-info/i18n/de.po
+++ b/package/gluon-config-mode-contact-info/i18n/de.po
@@ -14,14 +14,13 @@ msgid "Contact info"
msgstr "Kontakt"
msgid ""
-"Please provide your contact information here to allow others to contact "
-"you. Note that this information will be visible <em>publicly</em> on "
-"the internet together with your node's coordinates."
+"Please provide your contact information here to allow us to contact "
+"you. We will not publish this information."
+
msgstr ""
-"Bitte hinterlege hier einen Hinweis, um anderen zu ermöglichen, "
-"Kontakt mit dir aufzunehmen. Beachte, dass dieser Hinweis auch "
-"<em>öffentlich</em> im Internet, zusammen mit den Koordinaten "
-"deines Knotens, einsehbar sein wird."
+"Bitte hinterlege hier einen Hinweis, um uns zu ermöglichen, "
+"Kontakt mit dir aufzunehmen. Wir werden diese Information nicht "
+"mit anderen teilen."
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
deleted file mode 100644
index 624b1864..00000000
--- a/package/gluon-config-mode-contact-info/i18n/fr.po
+++ /dev/null
@@ -1,26 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2015-08-12 23:30+0100\n"
-"Last-Translator:Tobias Bernot <tqbs@airmail.cc>\n"
-"Language-Team: French\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "Contact info"
-msgstr "Informations de Contact"
-
-msgid ""
-"Please provide your contact information here to allow others to contact "
-"you. Note that this information will be visible <em>publicly</em> on "
-"the internet together with your node's coordinates."
-msgstr ""
-"S'il vous plaît entrez ici des informations <em>publiques</em> pour "
-"permettre aux autres de vous contacter. "
-"Ces informations seront affichées en ligne, avec les coordonnées du nœud."
-
-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..933d5d0c 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
@@ -5,9 +5,8 @@ msgid "Contact info"
msgstr ""
msgid ""
-"Please provide your contact information here to allow others to contact "
-"you. Note that this information will be visible <em>publicly</em> on "
-"the internet together with your node's coordinates."
+"Please provide your contact information here to allow us to contact "
+"you. We will not publish this information."
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..47775fb9 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,10 +4,8 @@ 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 <em>publicly</em> '
- .. 'on the internet together with your node\'s coordinates.'
+ "Please provide your contact information here to allow us to contact "
+ .. "you. We will not publish this information."
))
local o = s:option(Value, "contact", translate("Contact info"), translate("e.g. E-mail or phone number"))
--
2.11.0
From 2203b50642b4d46ad6a23b1f4e00399e811b2674 Mon Sep 17 00:00:00 2001
From: Chris Fiege <c.fiege@pengutronix.de>
Date: Wed, 21 Jun 2017 22:04:41 +0200
Subject: [PATCH] Setting example coordinates to the brunswick lion
Well, we don't actually need this. But let's try some patriotism.
---
.../luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 4d7fec01..38cd8604 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
@@ -29,7 +29,7 @@ return function(form, uci)
uci:set("gluon-node-info", location, "share_location", data)
end
- o = s:option(Value, "latitude", translate("Latitude"), translatef("e.g. %s", "53.873621"))
+ o = s:option(Value, "latitude", translate("Latitude"), translatef("e.g. %s", "52.26469"))
o.default = uci:get("gluon-node-info", location, "latitude")
o:depends(share_location, true)
o.datatype = "float"
@@ -37,7 +37,7 @@ return function(form, uci)
uci:set("gluon-node-info", location, "latitude", data)
end
- o = s:option(Value, "longitude", translate("Longitude"), translatef("e.g. %s", "10.689901"))
+ o = s:option(Value, "longitude", translate("Longitude"), translatef("e.g. %s", "10.52378"))
o.default = uci:get("gluon-node-info", location, "longitude")
o:depends(share_location, true)
o.datatype = "float"
--
2.11.0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment