nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

manman-sync: adjust wizard to use names instead

Browse Source
This commit is contained in:
Maciej Krüger 2022-04-13 18:28:16 +02:00 committed by Alexander List
parent 53e13cc30e
commit 7a600a4378
3 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
package/gluon-config-mode-manman-sync/i18n/de.po
View File

@ -15,18 +15,22 @@ msgstr ""
msgid "Enable ManMan sync" msgid "Enable ManMan sync"
msgstr "ManMan synchronisierung aktivieren" msgstr "ManMan synchronisierung aktivieren"
msgid "ManMan location ID" msgid "ManMan location"
msgstr "ManMan Standort-ID" msgstr "ManMan Standort"
msgid "ManMan node (optional)" msgid "ManMan node (optional)"
msgstr "ManMan Knoten (optional)" msgstr "ManMan Knoten (optional)"
msgid "Required if multiple nodes in location"
msgstr "Erforderlich wenn mehrere Knoten am Standort"
msgid "" msgid ""
"Sync configuration from ManMan by entering ManMan location id here.\n" "Sync configuration from ManMan "
"This will automatically keep name, location and ips in sync with the values " "by entering ManMan location and node name here.<br>"
"specified in ManMan." "This will automatically keep name, location and ips "
"in sync with the values specified in ManMan."
msgstr "" msgstr ""
"Synchronisiere die Konfiguration aus ManMan, indem du hier die ManMan " "Synchronisiere die Konfiguration aus ManMan, indem du hier den ManMan "
"Standort-ID eingibst.\n" "Standort-Namen und, optional, Knoten-Namen eingibst.\n"
"Dadurch werden Name, Standort und IP-Addressen automatisch mit den in " "Dadurch werden Name, Standort und IP-Addressen automatisch mit den in "
"ManMan angegebenen Werten synchronisiert." "ManMan angegebenen Werten synchronisiert."

7
package/gluon-config-mode-manman-sync/i18n/gluon-config-mode-manman-sync.pot
View File

@ -4,15 +4,18 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
msgid "Enable ManMan sync" msgid "Enable ManMan sync"
msgstr "" msgstr ""
msgid "ManMan location ID" msgid "ManMan location"
msgstr "" msgstr ""
msgid "ManMan node (optional)" msgid "ManMan node (optional)"
msgstr "" msgstr ""
msgid "Required if multiple nodes in location"
msgstr ""
msgid "" msgid ""
"Sync configuration from ManMan " "Sync configuration from ManMan "
"by entering ManMan location id here.\n" "by entering ManMan location and node name here.<br>"
"This will automatically keep name, location and ips " "This will automatically keep name, location and ips "
"in sync with the values specified in ManMan." "in sync with the values specified in ManMan."
msgstr "" msgstr ""

17
package/gluon-config-mode-manman-sync/luasrc/lib/gluon/config-mode/wizard/0100-manman-sync.lua
View File

@ -3,7 +3,7 @@ return function(form, uci)
local msg = pkg_i18n.translate( local msg = pkg_i18n.translate(
'Sync configuration from ManMan ' .. 'Sync configuration from ManMan ' ..
'by entering ManMan location id here.\n' .. 'by entering ManMan location and node name here.<br>' ..
'This will automatically keep name, location and ips ' .. 'This will automatically keep name, location and ips ' ..
'in sync with the values specified in ManMan.' 'in sync with the values specified in ManMan.'
) )
@ -18,20 +18,23 @@ return function(form, uci)
uci:set('gluon-manman-sync', 'sync', 'enabled', data) uci:set('gluon-manman-sync', 'sync', 'enabled', data)
end end
local id = s:option(Value, 'manman_id', pkg_i18n.translate('ManMan location ID')) local id = s:option(Value, 'manman_location', pkg_i18n.translate('ManMan location'))
id:depends(manman, true) id:depends(manman, true)
id.default = uci:get('gluon-manman-sync', 'sync', 'location_id') id.default = uci:get('gluon-manman-sync', 'sync', 'location')
id.datatype = 'uinteger' id.datatype = 'maxlength(16)'
function id:write(data) function id:write(data)
uci:set('gluon-manman-sync', 'sync', 'location_id', data) -- clear ID, gets fetched from manman-sync
uci:set('gluon-manman-sync', 'sync', 'location_id', nil)
uci:set('gluon-manman-sync', 'sync', 'location', data)
end end
local id = s:option(Value, 'manman_node', pkg_i18n.translate('ManMan node (optional)')) local id = s:option(Value, 'manman_node', pkg_i18n.translate('ManMan node (optional)'), pkg_i18n.translate('Required if multiple nodes in location'))
id:depends(manman, true) id:depends(manman, true)
id.default = uci:get('gluon-manman-sync', 'sync', 'node') id.default = uci:get('gluon-manman-sync', 'sync', 'node')
id.datatype = 'maxlength(16)' id.datatype = 'maxlength(16)'
function id:write(data) function id:write(data)
-- so ID gets fetched from manman-sync again -- clear ID, gets fetched from manman-sync
uci:set('gluon-manman-sync', 'sync', 'node_id', nil) uci:set('gluon-manman-sync', 'sync', 'node_id', nil)
uci:set('gluon-manman-sync', 'sync', 'node', data) uci:set('gluon-manman-sync', 'sync', 'node', data)