From cc16f488bd32f17da845279800e06f237884829e Mon Sep 17 00:00:00 2001
From: rubo77 <github@r.z11.de>
Date: Tue, 20 Jun 2017 22:37:02 +0200
Subject: [PATCH] DE-CAPITALIZE OFFLINE
---
README.md | 6 +++---
.../files/lib/gluon/ssid-changer/ssid-changer.sh | 4 ++--
gluon-ssid-changer/i18n/de.po | 4 ++--
gluon-ssid-changer/i18n/gluon-ssid-changer.pot | 2 +-
.../luasrc/lib/gluon/upgrade/500-ssid-changer | 2 +-
.../luasrc/lib/gluon/web/model/admin/ssid-changer.lua | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/README.md b/README.md
index 67ffcb7..6bd0e20 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ selected two algorithms to analyze if a gateway is reacheable:
Depending on the connectivity, it will be decided if a change of the SSID is
necessary: There is a variable `switch_timeframe` (for ex. 1440 = 24h) that
defines a time interval after which a successful check that detects an offline
-state will result in a single change of the SSID to "FF_OFFLINE_$node_hostname".
+state will result in a single change of the SSID to "FF_Offline_$node_hostname".
Only the first few minutes (also definable in a variable `first`) the
OFFLINE_SSID may also be set. All other minutes a checks will just be counted
and reported in the log and whenever an online state is detected the SSID will
@@ -40,11 +40,11 @@ Adapt and add this block to your site.conf:
```
ssid_changer = {
- switch_timeframe = 30, -- only once every timeframe (in minutes) the SSID will change to OFFLINE
+ switch_timeframe = 30, -- only once every timeframe (in minutes) the SSID will change to the Offline-SSID
-- set to 1440 to change once a day
-- set to 1 minute to change every time the router gets offline
first = 5, -- the first few minutes directly after reboot within which an Offline-SSID always may be activated (must be <= switch_timeframe)
- prefix = 'FF_OFFLINE_', -- use something short to leave space for the nodename (no '~' allowed!)
+ prefix = 'FF_Offline_', -- use something short to leave space for the nodename (no '~' allowed!)
suffix = 'nodename', -- generate the SSID with either 'nodename', 'mac' or to use only the prefix: 'none'
tq_limit_enabled = 0, -- if false, the offline SSID will only be set if there is no gateway reacheable
diff --git a/gluon-ssid-changer/files/lib/gluon/ssid-changer/ssid-changer.sh b/gluon-ssid-changer/files/lib/gluon/ssid-changer/ssid-changer.sh
index bab5484..e6cef87 100755
--- a/gluon-ssid-changer/files/lib/gluon/ssid-changer/ssid-changer.sh
+++ b/gluon-ssid-changer/files/lib/gluon/ssid-changer/ssid-changer.sh
@@ -11,7 +11,7 @@ pgrep -f autoupdater >/dev/null && safety_exit 'autoupdater running'
[ $(cat /proc/uptime | sed 's/\..*//g') -gt 60 ] || safety_exit 'less than one minute'
[ $(find /var/run -name hostapd-phy* | wc -l) -gt 0 ] || safety_exit 'no hostapd-phy*'
-# only once every timeframe minutes the SSID will change to OFFLINE
+# only once every timeframe minutes the SSID will change to the Offline-SSID
# (set to 1 minute to change immediately every time the router gets offline)
MINUTES="$(uci -q get ssid-changer.settings.switch_timeframe)"
: ${MINUTES:=30}
@@ -24,7 +24,7 @@ FIRST="$(uci -q get ssid-changer.settings.first)"
# the Offline-SSID will start with this prefix use something short to leave space for the nodename
# (no '~' allowed!)
PREFIX="$(uci -q get ssid-changer.settings.prefix)"
-: ${PREFIX:='FF_OFFLINE_'}
+: ${PREFIX:='FF_Offline_'}
if [ "$(uci -q get ssid-changer.settings.enabled)" = '0' ]; then
DISABLED='1'
diff --git a/gluon-ssid-changer/i18n/de.po b/gluon-ssid-changer/i18n/de.po
index 7823947..d9eb420 100644
--- a/gluon-ssid-changer/i18n/de.po
+++ b/gluon-ssid-changer/i18n/de.po
@@ -14,8 +14,8 @@ msgid "Enabled"
msgstr "Aktiviert"
msgid ""
-"Here you can enable to automatically change the SSID to the OFFLINE-SSID "
+"Here you can enable to automatically change the SSID to the Offline-SSID "
"when the node has no connection to the selected Gateway."
msgstr ""
"Hier kannst du aktivieren, dass dein Knoten automatisch die SSID auf die "
-"OFFLINE-SSID ändert, wenn keine Verbindung zum Freifunk Server besteht."
+"Offline-SSID ändert, wenn keine Verbindung zum Freifunk Server besteht."
diff --git a/gluon-ssid-changer/i18n/gluon-ssid-changer.pot b/gluon-ssid-changer/i18n/gluon-ssid-changer.pot
index 933de85..16db87d 100644
--- a/gluon-ssid-changer/i18n/gluon-ssid-changer.pot
+++ b/gluon-ssid-changer/i18n/gluon-ssid-changer.pot
@@ -5,6 +5,6 @@ msgid "Enabled"
msgstr ""
msgid ""
-"Here you can enable to automatically change the SSID to the OFFLINE-SSID "
+"Here you can enable to automatically change the SSID to the Offline-SSID "
"when the node has no connection to the selected Gateway."
msgstr ""
diff --git a/gluon-ssid-changer/luasrc/lib/gluon/upgrade/500-ssid-changer b/gluon-ssid-changer/luasrc/lib/gluon/upgrade/500-ssid-changer
index 88a5806..f98ff82 100755
--- a/gluon-ssid-changer/luasrc/lib/gluon/upgrade/500-ssid-changer
+++ b/gluon-ssid-changer/luasrc/lib/gluon/upgrade/500-ssid-changer
@@ -11,7 +11,7 @@ elseif not uci:get('ssid-changer', 'settings', 'enabled') then
enabled = '1',
switch_timeframe = site.ssid_changer.switch_timeframe or '30',
first = site.ssid_changer.first or '5',
- prefix = site.ssid_changer.prefix or 'FF_OFFLINE_',
+ prefix = site.ssid_changer.prefix or 'FF_Offline_',
suffix = site.ssid_changer.suffix or 'nodename',
tq_limit_enabled = site.ssid_changer.tq_limit_enabled or '0',
tq_limit_max = site.ssid_changer.tq_limit_max or '45',
diff --git a/gluon-ssid-changer/luasrc/lib/gluon/web/model/admin/ssid-changer.lua b/gluon-ssid-changer/luasrc/lib/gluon/web/model/admin/ssid-changer.lua
index d053b46..491cfbb 100644
--- a/gluon-ssid-changer/luasrc/lib/gluon/web/model/admin/ssid-changer.lua
+++ b/gluon-ssid-changer/luasrc/lib/gluon/web/model/admin/ssid-changer.lua
@@ -4,7 +4,7 @@ local util = require 'gluon.util'
local f = Form(translate('Offline-SSID'))
local s = f:section(Section, nil, translate(
- 'Here you can enable to automatically change the SSID to the OFFLINE-SSID '
+ 'Here you can enable to automatically change the SSID to the Offline-SSID '
.. 'when the node has no connection to the selected Gateway.'
))
@@ -24,7 +24,7 @@ function f:write()
-- switch_timeframe = switch_timeframe.data or '1440'
-- tq_limit_max = tq_limit_max.data or '55'
-- first = first.data or '5'
- -- prefix = prefix.data or 'FF_OFFLINE_'
+ -- prefix = prefix.data or 'FF_Offline_'
-- suffix = suffix.data or 'nodename'
-- tq_limit_min = tq_limit_min.data or '45'
-- tq_limit_enabled = tq_limit_enabled.data or '0'
--
GitLab