From 5db7ecda2b1d036fb72d12c31c71d39e46fb7a8c Mon Sep 17 00:00:00 2001 From: rubo77 Date: Tue, 13 Sep 2016 22:42:15 +0200 Subject: [PATCH] gluon-config-mode-geo-location: Make the label for altitude definable in the site folder closes https://github.com/freifunk-gluon/gluon/issues/873 --- docs/site-example/i18n/de.po | 8 ++++++++ docs/site-example/i18n/en.po | 9 ++++++++- docs/site-example/i18n/fr.po | 8 ++++++++ docs/site-example/i18n/gluon-site.pot | 6 ++++++ docs/user/site.rst | 6 ++++++ package/gluon-config-mode-geo-location/i18n/de.po | 10 ---------- package/gluon-config-mode-geo-location/i18n/fr.po | 10 ---------- .../i18n/gluon-config-mode-geo-location.pot | 8 -------- .../lib/gluon/config-mode/wizard/0400-geo-location.lua | 5 ++--- 9 files changed, 38 insertions(+), 32 deletions(-) diff --git a/docs/site-example/i18n/de.po b/docs/site-example/i18n/de.po index 30f5c838..c3c763dd 100644 --- a/docs/site-example/i18n/de.po +++ b/docs/site-example/i18n/de.po @@ -42,3 +42,11 @@ msgstr "" "Betrieb für drei Sekunden den Reset-Button. Das Gerät wird dann im Config " "Mode neustarten.

" "

Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!

" + +msgid "gluon-config-mode:altitude-label" +msgstr "Höhe" + +msgid "gluon-config-mode:altitude-help" +msgstr "" +"Die Höhenangabe ist optional und sollte nur gesetzt werden, wenn ein " +"exakter Wert bekannt ist." diff --git a/docs/site-example/i18n/en.po b/docs/site-example/i18n/en.po index e6d1e672..94aa8bc5 100644 --- a/docs/site-example/i18n/en.po +++ b/docs/site-example/i18n/en.po @@ -29,7 +29,6 @@ msgstr "" "<%= pubkey %>" "" - msgid "gluon-config-mode:reboot" msgstr "" "

The node is currently rebooting and will try to connect to other " @@ -40,3 +39,11 @@ msgstr "" "3 seconds during normal operation. The device will then reboot into config " "mode.

" "

Have fun with your node and exploring of the Freifunk network!

" + +msgid "gluon-config-mode:altitude-label" +msgstr "Altitude" + +msgid "gluon-config-mode:altitude-help" +msgstr "" +"Specifying the altitude is optional and should only be done if a proper " +"value is known." diff --git a/docs/site-example/i18n/fr.po b/docs/site-example/i18n/fr.po index 1462fdbf..c38dca6e 100644 --- a/docs/site-example/i18n/fr.po +++ b/docs/site-example/i18n/fr.po @@ -41,3 +41,11 @@ msgstr "" "fonctionement normal pendant 3 Secondes sur le bouton reset. L'appareil va ensuite " "redémarer en mode configuration.

" "

Profitez votre de nœud et amusez vous à découvrir le réseau Freifunk!

" + +msgid "gluon-config-mode:altitude-label" +msgstr "Hauteur" + +msgid "gluon-config-mode:altitude-help" +msgstr "" +"La altitude est optionelle et ne devrait que être ajoutée si la valeur " +"exacte est connue." diff --git a/docs/site-example/i18n/gluon-site.pot b/docs/site-example/i18n/gluon-site.pot index 670de410..a161a12b 100644 --- a/docs/site-example/i18n/gluon-site.pot +++ b/docs/site-example/i18n/gluon-site.pot @@ -9,3 +9,9 @@ msgstr "" msgid "gluon-config-mode:reboot" msgstr "" + +msgid "gluon-config-mode:altitude-label" +msgstr "" + +msgid "gluon-config-mode:altitude-help" +msgstr "" diff --git a/docs/user/site.rst b/docs/user/site.rst index b1f00c69..f58738c4 100644 --- a/docs/user/site.rst +++ b/docs/user/site.rst @@ -360,6 +360,12 @@ gluon-config-mode:welcome gluon-config-mode:pubkey Information about the public VPN key on the reboot page. +gluon-config-mode:altitude-label + Label for the ``altitude`` field + +gluon-config-mode:altitude-help + Description for the usage of the ``altitude`` field + gluon-config-mode:reboot General information shown on the reboot page. diff --git a/package/gluon-config-mode-geo-location/i18n/de.po b/package/gluon-config-mode-geo-location/i18n/de.po index 3580732b..c8bc906a 100644 --- a/package/gluon-config-mode-geo-location/i18n/de.po +++ b/package/gluon-config-mode-geo-location/i18n/de.po @@ -17,22 +17,12 @@ msgstr "" "Um deinen Knoten auf der Karte anzeigen zu können, benötigen wir seine " "Koordinaten. Hier hast du die Möglichkeit, diese zu hinterlegen." -msgid "" -"Specifying the altitude is optional and should only be done if a proper " -"value is known." -msgstr "" -"Die Höhenangabe ist optional und sollte nur gesetzt werden, wenn ein " -"exakter Wert bekannt ist." - msgid "Latitude" msgstr "Breitengrad" msgid "Longitude" msgstr "Längengrad" -msgid "Altitude" -msgstr "Höhe" - msgid "Show node on the map" msgstr "Knoten auf der Karte anzeigen" diff --git a/package/gluon-config-mode-geo-location/i18n/fr.po b/package/gluon-config-mode-geo-location/i18n/fr.po index b239c84c..d3d7c6e8 100644 --- a/package/gluon-config-mode-geo-location/i18n/fr.po +++ b/package/gluon-config-mode-geo-location/i18n/fr.po @@ -17,22 +17,12 @@ msgstr "" "Pour Afficher votre nœud sur la Carte nous avons besoin de ses coordonnées. " "Ici vous pouvez entrer sa position." -msgid "" -"Specifying the altitude is optional and should only be done if a proper " -"value is known." -msgstr "" -"La altitude est optionelle et ne devrait que être ajoutée si la valeur " -"exacte est connue." - msgid "Latitude" msgstr "Latitude" msgid "Longitude" msgstr "Longitude" -msgid "Altitude" -msgstr "Hauteur" - msgid "Show node on the map" msgstr "Afficher le nœud sur la carte" diff --git a/package/gluon-config-mode-geo-location/i18n/gluon-config-mode-geo-location.pot b/package/gluon-config-mode-geo-location/i18n/gluon-config-mode-geo-location.pot index 48f26f70..7acf7f28 100644 --- a/package/gluon-config-mode-geo-location/i18n/gluon-config-mode-geo-location.pot +++ b/package/gluon-config-mode-geo-location/i18n/gluon-config-mode-geo-location.pot @@ -6,20 +6,12 @@ msgid "" "enter its coordinates here." msgstr "" -msgid "" -"Specifying the altitude is optional and should only be done if a proper " -"value is known." -msgstr "" - msgid "Latitude" msgstr "" msgid "Longitude" msgstr "" -msgid "Altitude" -msgstr "" - msgid "Show node on the map" msgstr "" 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 9bc70301..04e9b144 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 @@ -19,8 +19,7 @@ function M.section(form) local text = i18n.translate('If you want the location of your node to ' .. 'be displayed on the map, you can enter its coordinates here.') if show_altitude() then - text = text .. ' ' .. i18n.translate('Specifying the altitude is ' - .. 'optional and should only be done if a proper value is known.') + text = text .. ' ' .. i18n.translate("gluon-config-mode:altitude-help") end local s = form:section(cbi.SimpleSection, nil, text) @@ -46,7 +45,7 @@ function M.section(form) o.description = i18n.translatef("e.g. %s", "10.689901") if show_altitude() then - o = s:option(cbi.Value, "_altitude", i18n.translate("Altitude")) + o = s:option(cbi.Value, "_altitude", i18n.translate("gluon-config-mode:altitude-label")) o.default = uci:get_first("gluon-node-info", "location", "altitude") o:depends("_location", "1") o.rmempty = true