From 810198110e60d29c6ca9e73b622ab350ae9f9f82 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 28 Apr 2017 14:41:57 +0100 Subject: [PATCH] captive: Cleanup logo upload Signed-off-by: Michael Tremer --- doc/language_issues.de | 4 ++++ doc/language_issues.es | 4 ++-- doc/language_issues.fr | 4 ++-- doc/language_issues.it | 4 ++-- doc/language_issues.nl | 4 ++-- doc/language_issues.pl | 4 ++-- doc/language_issues.ru | 4 ++-- doc/language_issues.tr | 4 ++-- doc/language_missings | 2 ++ html/cgi-bin/captive.cgi | 9 ++------- langs/en/cgi-bin/en.pl | 4 ++-- 11 files changed, 24 insertions(+), 23 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index d45948ec7f..c6de391955 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -10,6 +10,8 @@ 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 logo_upload +WARNING: translation string unused: Captive logo_upload1 WARNING: translation string unused: Captive nr WARNING: translation string unused: Captive time WARNING: translation string unused: Captive voucher @@ -686,6 +688,8 @@ WARNING: untranslated string: Captive branding WARNING: untranslated string: Captive client session expiry time WARNING: untranslated string: Captive logo uploaded WARNING: untranslated string: Captive terms +WARNING: untranslated string: Captive upload logo +WARNING: untranslated string: Captive upload logo recommendations WARNING: untranslated string: Scan for Songs WARNING: untranslated string: addons WARNING: untranslated string: bytes diff --git a/doc/language_issues.es b/doc/language_issues.es index 6f82813f39..307e09b3ea 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -634,14 +634,14 @@ WARNING: untranslated string: Captive err doublevoucher WARNING: untranslated string: Captive expire WARNING: untranslated string: Captive generate coupon WARNING: untranslated string: Captive logo uploaded -WARNING: untranslated string: Captive logo_upload -WARNING: untranslated string: Captive logo_upload1 WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive terms WARNING: untranslated string: Captive title +WARNING: untranslated string: Captive upload logo +WARNING: untranslated string: Captive upload logo recommendations WARNING: untranslated string: Captive voactive WARNING: untranslated string: Captive vouchervalid WARNING: untranslated string: Captive vout diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 31a1b4c2bf..b0cd0f3caa 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -644,14 +644,14 @@ WARNING: untranslated string: Captive err doublevoucher WARNING: untranslated string: Captive expire WARNING: untranslated string: Captive generate coupon WARNING: untranslated string: Captive logo uploaded -WARNING: untranslated string: Captive logo_upload -WARNING: untranslated string: Captive logo_upload1 WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive terms WARNING: untranslated string: Captive title +WARNING: untranslated string: Captive upload logo +WARNING: untranslated string: Captive upload logo recommendations WARNING: untranslated string: Captive voactive WARNING: untranslated string: Captive vouchervalid WARNING: untranslated string: Captive vout diff --git a/doc/language_issues.it b/doc/language_issues.it index 4dad12cc1b..b517978165 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -711,14 +711,14 @@ WARNING: untranslated string: Captive err doublevoucher WARNING: untranslated string: Captive expire WARNING: untranslated string: Captive generate coupon WARNING: untranslated string: Captive logo uploaded -WARNING: untranslated string: Captive logo_upload -WARNING: untranslated string: Captive logo_upload1 WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive terms WARNING: untranslated string: Captive title +WARNING: untranslated string: Captive upload logo +WARNING: untranslated string: Captive upload logo recommendations WARNING: untranslated string: Captive voactive WARNING: untranslated string: Captive vouchervalid WARNING: untranslated string: Captive vout diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 805d928096..101b6eb6dc 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -707,14 +707,14 @@ WARNING: untranslated string: Captive err doublevoucher WARNING: untranslated string: Captive expire WARNING: untranslated string: Captive generate coupon WARNING: untranslated string: Captive logo uploaded -WARNING: untranslated string: Captive logo_upload -WARNING: untranslated string: Captive logo_upload1 WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive terms WARNING: untranslated string: Captive title +WARNING: untranslated string: Captive upload logo +WARNING: untranslated string: Captive upload logo recommendations WARNING: untranslated string: Captive voactive WARNING: untranslated string: Captive vouchervalid WARNING: untranslated string: Captive vout diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 6f82813f39..307e09b3ea 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -634,14 +634,14 @@ WARNING: untranslated string: Captive err doublevoucher WARNING: untranslated string: Captive expire WARNING: untranslated string: Captive generate coupon WARNING: untranslated string: Captive logo uploaded -WARNING: untranslated string: Captive logo_upload -WARNING: untranslated string: Captive logo_upload1 WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive terms WARNING: untranslated string: Captive title +WARNING: untranslated string: Captive upload logo +WARNING: untranslated string: Captive upload logo recommendations WARNING: untranslated string: Captive voactive WARNING: untranslated string: Captive vouchervalid WARNING: untranslated string: Captive vout diff --git a/doc/language_issues.ru b/doc/language_issues.ru index b10a7aca67..30973d0b7c 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -636,14 +636,14 @@ WARNING: untranslated string: Captive err doublevoucher WARNING: untranslated string: Captive expire WARNING: untranslated string: Captive generate coupon WARNING: untranslated string: Captive logo uploaded -WARNING: untranslated string: Captive logo_upload -WARNING: untranslated string: Captive logo_upload1 WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive terms WARNING: untranslated string: Captive title +WARNING: untranslated string: Captive upload logo +WARNING: untranslated string: Captive upload logo recommendations WARNING: untranslated string: Captive voactive WARNING: untranslated string: Captive vouchervalid WARNING: untranslated string: Captive vout diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 75574de50e..3654219baa 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -719,14 +719,14 @@ WARNING: untranslated string: Captive err doublevoucher WARNING: untranslated string: Captive expire WARNING: untranslated string: Captive generate coupon WARNING: untranslated string: Captive logo uploaded -WARNING: untranslated string: Captive logo_upload -WARNING: untranslated string: Captive logo_upload1 WARNING: untranslated string: Captive mac WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive noexpiretime WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive terms WARNING: untranslated string: Captive title +WARNING: untranslated string: Captive upload logo +WARNING: untranslated string: Captive upload logo recommendations WARNING: untranslated string: Captive voactive WARNING: untranslated string: Captive vouchervalid WARNING: untranslated string: Captive vout diff --git a/doc/language_missings b/doc/language_missings index dc02710dd9..3637342759 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -3,6 +3,8 @@ ############################################################################ < addon < Captive genvoucher +< Captive logo_upload +< Captive logo_upload1 < ccd maxclients < ovpn_fragment ############################################################################ diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi index 99412074ad..6a1467752b 100755 --- a/html/cgi-bin/captive.cgi +++ b/html/cgi-bin/captive.cgi @@ -326,18 +326,13 @@ print< -END - -# Logo Upload -print < - $Lang::tr{'Captive logo_upload'} -
- $Lang::tr{'Captive logo_upload1'} + $Lang::tr{'Captive upload logo'} +
$Lang::tr{'Captive upload logo recommendations'} END diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 86f84b48d3..0ad852cb94 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -35,8 +35,6 @@ 'Captive ip' => 'IP Address', 'Captive logo uploaded' => 'Logo uploaded', 'Captive logo_set' => 'Current Logo', -'Captive logo_upload' => 'Upload Logo', -'Captive logo_upload1' => '(PNG, min. 1280x400, max. 1920x800)', 'Captive mac' => 'MAC Address', 'Captive menu' => 'Captive Portal', 'Captive noexpiretime' => 'No valid connection time range given', @@ -45,6 +43,8 @@ 'Captive terms' => 'Terms & Conditions', 'Captive time' => 'Access time post activation (hours)', 'Captive title' => 'Title of Login Page', +'Captive upload logo' => 'Upload Logo', +'Captive upload logo recommendations' => '(PNG or JPEG, recommended 1280x720 pixels)', 'Captive voactive' => 'Active Vouchers', 'Captive voucher' => 'Voucher', 'Captive vouchervalid' => 'Allowed time for this voucher', -- 2.39.2