captive: Simplify coupon time selection

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2026-04-27 03:07:43 +02:00 · 2017-10-17 15:05:53 +02:00
parent f32174956e
commit af6c5929b0
13 changed files with 153 additions and 140 deletions
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -14,6 +14,7 @@ WARNING: translation string unused: Captive ip
 WARNING: translation string unused: Captive logo_set
 WARNING: translation string unused: Captive logo_upload
 WARNING: translation string unused: Captive logo_upload1
+WARNING: translation string unused: Captive noexpiretime
 WARNING: translation string unused: Captive nr
 WARNING: translation string unused: Captive time
 WARNING: translation string unused: Captive voactive
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -14,6 +14,7 @@ WARNING: translation string unused: Captive invalid logosize
 WARNING: translation string unused: Captive invalid_voucher
 WARNING: translation string unused: Captive ip
 WARNING: translation string unused: Captive logo_set
+WARNING: translation string unused: Captive noexpiretime
 WARNING: translation string unused: Captive nr
 WARNING: translation string unused: Captive please enter a coupon code
 WARNING: translation string unused: Captive time
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -635,12 +635,12 @@ WARNING: untranslated string: Captive config
 WARNING: untranslated string: Captive coupon
 WARNING: untranslated string: Captive expiry time
 WARNING: untranslated string: Captive export coupons
-WARNING: untranslated string: Captive generate coupon
+WARNING: untranslated string: Captive generate coupons
+WARNING: untranslated string: Captive generated coupon no
 WARNING: untranslated string: Captive issued coupons
 WARNING: untranslated string: Captive logo uploaded
 WARNING: untranslated string: Captive mac
 WARNING: untranslated string: Captive menu
-WARNING: untranslated string: Captive noexpiretime
 WARNING: untranslated string: Captive nolimit
 WARNING: untranslated string: Captive please accept the terms and conditions
 WARNING: untranslated string: Captive portal
@@ -813,6 +813,7 @@ WARNING: untranslated string: firewall logs country
 WARNING: untranslated string: firewall rules
 WARNING: untranslated string: first
 WARNING: untranslated string: flag
+WARNING: untranslated string: four hours
 WARNING: untranslated string: fw default drop
 WARNING: untranslated string: fw settings
 WARNING: untranslated string: fw settings color
@@ -1059,6 +1060,7 @@ WARNING: untranslated string: notice
 WARNING: untranslated string: one hour
 WARNING: untranslated string: one month
 WARNING: untranslated string: one week
+WARNING: untranslated string: one year
 WARNING: untranslated string: openvpn default
 WARNING: untranslated string: openvpn destination port used
 WARNING: untranslated string: openvpn fragment allowed with udp
@@ -1180,6 +1182,8 @@ WARNING: untranslated string: tor traffic limit hard
 WARNING: untranslated string: tor traffic limit soft
 WARNING: untranslated string: tor traffic read written
 WARNING: untranslated string: tor use exit nodes
+WARNING: untranslated string: twelve hours
+WARNING: untranslated string: two weeks
 WARNING: untranslated string: unblock
 WARNING: untranslated string: unblock all
 WARNING: untranslated string: uncheck all
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -644,12 +644,12 @@ WARNING: untranslated string: Captive config
 WARNING: untranslated string: Captive coupon
 WARNING: untranslated string: Captive expiry time
 WARNING: untranslated string: Captive export coupons
-WARNING: untranslated string: Captive generate coupon
+WARNING: untranslated string: Captive generate coupons
+WARNING: untranslated string: Captive generated coupon no
 WARNING: untranslated string: Captive issued coupons
 WARNING: untranslated string: Captive logo uploaded
 WARNING: untranslated string: Captive mac
 WARNING: untranslated string: Captive menu
-WARNING: untranslated string: Captive noexpiretime
 WARNING: untranslated string: Captive nolimit
 WARNING: untranslated string: Captive please accept the terms and conditions
 WARNING: untranslated string: Captive portal
@@ -822,6 +822,7 @@ WARNING: untranslated string: firewall logs country
 WARNING: untranslated string: firewall rules
 WARNING: untranslated string: first
 WARNING: untranslated string: flag
+WARNING: untranslated string: four hours
 WARNING: untranslated string: fw default drop
 WARNING: untranslated string: fw settings
 WARNING: untranslated string: fw settings color
@@ -1077,6 +1078,7 @@ WARNING: untranslated string: ntp sync
 WARNING: untranslated string: one hour
 WARNING: untranslated string: one month
 WARNING: untranslated string: one week
+WARNING: untranslated string: one year
 WARNING: untranslated string: openvpn default
 WARNING: untranslated string: openvpn destination port used
 WARNING: untranslated string: openvpn fragment allowed with udp
@@ -1193,6 +1195,8 @@ WARNING: untranslated string: tor traffic limit hard
 WARNING: untranslated string: tor traffic limit soft
 WARNING: untranslated string: tor traffic read written
 WARNING: untranslated string: tor use exit nodes
+WARNING: untranslated string: twelve hours
+WARNING: untranslated string: two weeks
 WARNING: untranslated string: unblock
 WARNING: untranslated string: unblock all
 WARNING: untranslated string: uncheck all
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -712,12 +712,12 @@ WARNING: untranslated string: Captive config
 WARNING: untranslated string: Captive coupon
 WARNING: untranslated string: Captive expiry time
 WARNING: untranslated string: Captive export coupons
-WARNING: untranslated string: Captive generate coupon
+WARNING: untranslated string: Captive generate coupons
+WARNING: untranslated string: Captive generated coupon no
 WARNING: untranslated string: Captive issued coupons
 WARNING: untranslated string: Captive logo uploaded
 WARNING: untranslated string: Captive mac
 WARNING: untranslated string: Captive menu
-WARNING: untranslated string: Captive noexpiretime
 WARNING: untranslated string: Captive nolimit
 WARNING: untranslated string: Captive please accept the terms and conditions
 WARNING: untranslated string: Captive portal
@@ -774,6 +774,7 @@ WARNING: untranslated string: firewall graph port
 WARNING: untranslated string: firewall log country
 WARNING: untranslated string: firewall log ip
 WARNING: untranslated string: firewall log port
+WARNING: untranslated string: four hours
 WARNING: untranslated string: fwdfw err concon
 WARNING: untranslated string: fwdfw err ratecon
 WARNING: untranslated string: fwdfw limitconcon
@@ -848,6 +849,7 @@ WARNING: untranslated string: none
 WARNING: untranslated string: one hour
 WARNING: untranslated string: one month
 WARNING: untranslated string: one week
+WARNING: untranslated string: one year
 WARNING: untranslated string: outgoing compression in bytes per second
 WARNING: untranslated string: outgoing overhead in bytes per second
 WARNING: untranslated string: ovpn add conf
@@ -862,6 +864,8 @@ WARNING: untranslated string: routing table
 WARNING: untranslated string: samba join a domain
 WARNING: untranslated string: samba join domain
 WARNING: untranslated string: search
+WARNING: untranslated string: twelve hours
+WARNING: untranslated string: two weeks
 WARNING: untranslated string: unblock
 WARNING: untranslated string: unblock all
 WARNING: untranslated string: uncheck all
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -708,12 +708,12 @@ WARNING: untranslated string: Captive config
 WARNING: untranslated string: Captive coupon
 WARNING: untranslated string: Captive expiry time
 WARNING: untranslated string: Captive export coupons
-WARNING: untranslated string: Captive generate coupon
+WARNING: untranslated string: Captive generate coupons
+WARNING: untranslated string: Captive generated coupon no
 WARNING: untranslated string: Captive issued coupons
 WARNING: untranslated string: Captive logo uploaded
 WARNING: untranslated string: Captive mac
 WARNING: untranslated string: Captive menu
-WARNING: untranslated string: Captive noexpiretime
 WARNING: untranslated string: Captive nolimit
 WARNING: untranslated string: Captive please accept the terms and conditions
 WARNING: untranslated string: Captive portal
@@ -787,6 +787,7 @@ WARNING: untranslated string: firewall log country
 WARNING: untranslated string: firewall log ip
 WARNING: untranslated string: firewall log port
 WARNING: untranslated string: firewall logs country
+WARNING: untranslated string: four hours
 WARNING: untranslated string: fwdfw err concon
 WARNING: untranslated string: fwdfw err ratecon
 WARNING: untranslated string: fwdfw limitconcon
@@ -880,6 +881,7 @@ WARNING: untranslated string: not a valid dh key
 WARNING: untranslated string: one hour
 WARNING: untranslated string: one month
 WARNING: untranslated string: one week
+WARNING: untranslated string: one year
 WARNING: untranslated string: outgoing compression in bytes per second
 WARNING: untranslated string: outgoing overhead in bytes per second
 WARNING: untranslated string: ovpn add conf
@@ -908,6 +910,8 @@ WARNING: untranslated string: show tls-auth key
 WARNING: untranslated string: software version
 WARNING: untranslated string: source ip country
 WARNING: untranslated string: ta key
+WARNING: untranslated string: twelve hours
+WARNING: untranslated string: two weeks
 WARNING: untranslated string: unblock
 WARNING: untranslated string: unblock all
 WARNING: untranslated string: uncheck all
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -635,12 +635,12 @@ WARNING: untranslated string: Captive config
 WARNING: untranslated string: Captive coupon
 WARNING: untranslated string: Captive expiry time
 WARNING: untranslated string: Captive export coupons
-WARNING: untranslated string: Captive generate coupon
+WARNING: untranslated string: Captive generate coupons
+WARNING: untranslated string: Captive generated coupon no
 WARNING: untranslated string: Captive issued coupons
 WARNING: untranslated string: Captive logo uploaded
 WARNING: untranslated string: Captive mac
 WARNING: untranslated string: Captive menu
-WARNING: untranslated string: Captive noexpiretime
 WARNING: untranslated string: Captive nolimit
 WARNING: untranslated string: Captive please accept the terms and conditions
 WARNING: untranslated string: Captive portal
@@ -813,6 +813,7 @@ WARNING: untranslated string: firewall logs country
 WARNING: untranslated string: firewall rules
 WARNING: untranslated string: first
 WARNING: untranslated string: flag
+WARNING: untranslated string: four hours
 WARNING: untranslated string: fw default drop
 WARNING: untranslated string: fw settings
 WARNING: untranslated string: fw settings color
@@ -1059,6 +1060,7 @@ WARNING: untranslated string: notice
 WARNING: untranslated string: one hour
 WARNING: untranslated string: one month
 WARNING: untranslated string: one week
+WARNING: untranslated string: one year
 WARNING: untranslated string: openvpn default
 WARNING: untranslated string: openvpn destination port used
 WARNING: untranslated string: openvpn fragment allowed with udp
@@ -1180,6 +1182,8 @@ WARNING: untranslated string: tor traffic limit hard
 WARNING: untranslated string: tor traffic limit soft
 WARNING: untranslated string: tor traffic read written
 WARNING: untranslated string: tor use exit nodes
+WARNING: untranslated string: twelve hours
+WARNING: untranslated string: two weeks
 WARNING: untranslated string: unblock
 WARNING: untranslated string: unblock all
 WARNING: untranslated string: uncheck all
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -637,12 +637,12 @@ WARNING: untranslated string: Captive config
 WARNING: untranslated string: Captive coupon
 WARNING: untranslated string: Captive expiry time
 WARNING: untranslated string: Captive export coupons
-WARNING: untranslated string: Captive generate coupon
+WARNING: untranslated string: Captive generate coupons
+WARNING: untranslated string: Captive generated coupon no
 WARNING: untranslated string: Captive issued coupons
 WARNING: untranslated string: Captive logo uploaded
 WARNING: untranslated string: Captive mac
 WARNING: untranslated string: Captive menu
-WARNING: untranslated string: Captive noexpiretime
 WARNING: untranslated string: Captive nolimit
 WARNING: untranslated string: Captive please accept the terms and conditions
 WARNING: untranslated string: Captive portal
@@ -807,6 +807,7 @@ WARNING: untranslated string: firewall logs country
 WARNING: untranslated string: firewall rules
 WARNING: untranslated string: first
 WARNING: untranslated string: flag
+WARNING: untranslated string: four hours
 WARNING: untranslated string: fw default drop
 WARNING: untranslated string: fw settings
 WARNING: untranslated string: fw settings color
@@ -1061,6 +1062,7 @@ WARNING: untranslated string: notice
 WARNING: untranslated string: one hour
 WARNING: untranslated string: one month
 WARNING: untranslated string: one week
+WARNING: untranslated string: one year
 WARNING: untranslated string: openvpn default
 WARNING: untranslated string: openvpn destination port used
 WARNING: untranslated string: openvpn fragment allowed with udp
@@ -1175,6 +1177,8 @@ WARNING: untranslated string: tor traffic limit hard
 WARNING: untranslated string: tor traffic limit soft
 WARNING: untranslated string: tor traffic read written
 WARNING: untranslated string: tor use exit nodes
+WARNING: untranslated string: twelve hours
+WARNING: untranslated string: two weeks
 WARNING: untranslated string: unblock
 WARNING: untranslated string: unblock all
 WARNING: untranslated string: uncheck all
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -720,12 +720,12 @@ WARNING: untranslated string: Captive config
 WARNING: untranslated string: Captive coupon
 WARNING: untranslated string: Captive expiry time
 WARNING: untranslated string: Captive export coupons
-WARNING: untranslated string: Captive generate coupon
+WARNING: untranslated string: Captive generate coupons
+WARNING: untranslated string: Captive generated coupon no
 WARNING: untranslated string: Captive issued coupons
 WARNING: untranslated string: Captive logo uploaded
 WARNING: untranslated string: Captive mac
 WARNING: untranslated string: Captive menu
-WARNING: untranslated string: Captive noexpiretime
 WARNING: untranslated string: Captive nolimit
 WARNING: untranslated string: Captive please accept the terms and conditions
 WARNING: untranslated string: Captive portal
@@ -750,6 +750,7 @@ WARNING: untranslated string: firewall graph port
 WARNING: untranslated string: firewall log country
 WARNING: untranslated string: firewall log ip
 WARNING: untranslated string: firewall log port
+WARNING: untranslated string: four hours
 WARNING: untranslated string: fwhost cust geoipgrp
 WARNING: untranslated string: fwhost err hostip
 WARNING: untranslated string: guardian
@@ -795,10 +796,13 @@ WARNING: untranslated string: no data
 WARNING: untranslated string: one hour
 WARNING: untranslated string: one month
 WARNING: untranslated string: one week
+WARNING: untranslated string: one year
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
+WARNING: untranslated string: twelve hours
+WARNING: untranslated string: two weeks
 WARNING: untranslated string: unlimited
 WARNING: untranslated string: uplink bit rate
 WARNING: untranslated string: vpn broken
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -58,7 +58,8 @@
 < Captive expiry time
 < Captive export coupons
 < Captive GAIN ACCESS
-< Captive generate coupon
+< Captive generate coupons
+< Captive generated coupon no
 < Captive genvoucher
 < Captive invalid logosize
 < Captive invalid_voucher
@@ -230,6 +231,7 @@
 < first
 < flag
 < forward firewall
+< four hours
 < fw default drop
 < fwdfw ACCEPT
 < fwdfw action
@@ -490,6 +492,7 @@
 < ntp common settings
 < ntp sync
 < Number of Countries for the pie chart
+< one year
 < openvpn default
 < openvpn destination port used
 < openvpn disabled
@@ -610,6 +613,8 @@
 < tor traffic limit soft
 < tor traffic read written
 < tor use exit nodes
+< twelve hours
+< two weeks
 < unblock
 < unblock all
 < uncheck all
@@ -755,7 +760,8 @@
 < Captive expiry time
 < Captive export coupons
 < Captive GAIN ACCESS
-< Captive generate coupon
+< Captive generate coupons
+< Captive generated coupon no
 < Captive genvoucher
 < Captive invalid logosize
 < Captive invalid_voucher
@@ -926,6 +932,7 @@
 < first
 < flag
 < forward firewall
+< four hours
 < fw default drop
 < fwdfw ACCEPT
 < fwdfw action
@@ -1174,6 +1181,7 @@
 < not a valid dh key
 < notice
 < Number of Countries for the pie chart
+< one year
 < openvpn default
 < openvpn destination port used
 < openvpn disabled
@@ -1312,6 +1320,8 @@
 < tor traffic limit soft
 < tor traffic read written
 < tor use exit nodes
+< twelve hours
+< two weeks
 < unblock
 < unblock all
 < uncheck all
@@ -1434,7 +1444,8 @@
 < Captive expiry time
 < Captive export coupons
 < Captive GAIN ACCESS
-< Captive generate coupon
+< Captive generate coupons
+< Captive generated coupon no
 < Captive genvoucher
 < Captive invalid logosize
 < Captive invalid_voucher
@@ -1597,6 +1608,7 @@
 < first
 < flag
 < forward firewall
+< four hours
 < fw default drop
 < fwdfw ACCEPT
 < fwdfw action
@@ -1855,6 +1867,7 @@
 < not a valid dh key
 < notice
 < Number of Countries for the pie chart
+< one year
 < openvpn default
 < openvpn destination port used
 < openvpn disabled
@@ -1977,6 +1990,8 @@
 < tor traffic limit soft
 < tor traffic read written
 < tor use exit nodes
+< twelve hours
+< two weeks
 < unblock
 < unblock all
 < uncheck all
@@ -2100,7 +2115,8 @@
 < Captive expiry time
 < Captive export coupons
 < Captive GAIN ACCESS
-< Captive generate coupon
+< Captive generate coupons
+< Captive generated coupon no
 < Captive genvoucher
 < Captive invalid logosize
 < Captive invalid_voucher
@@ -2266,6 +2282,7 @@
 < first
 < flag
 < forward firewall
+< four hours
 < frequency
 < fw default drop
 < fwdfw ACCEPT
@@ -2528,6 +2545,7 @@
 < not a valid dh key
 < notice
 < Number of Countries for the pie chart
+< one year
 < openvpn default
 < openvpn destination port used
 < openvpn disabled
@@ -2647,6 +2665,8 @@
 < tor traffic limit soft
 < tor traffic read written
 < tor use exit nodes
+< twelve hours
+< two weeks
 < unblock
 < unblock all
 < uncheck all