From d662f3cff6fe7adda8c699dbb7faa60a2c1f1a7e Mon Sep 17 00:00:00 2001 From: Aaron Tiensivu Date: Mon, 20 Jul 2020 17:38:15 -0400 Subject: [PATCH] luci-app-uhttpd: fix translation for key option Clarify DER support as having DER and PEM support. Issue #4248's request. Signed-off-by: Aaron Tiensivu --- .../luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua b/applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua index eadf9b5722..20929036d7 100644 --- a/applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua +++ b/applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua @@ -91,9 +91,9 @@ o = ucs:taboption("general", Flag, "rfc1918_filter", translate("Ignore private I o.default = o.enabled o.rmempty = false -cert_file = ucs:taboption("general", FileUpload, "cert", translate("HTTPS Certificate (DER Encoded)")) +cert_file = ucs:taboption("general", FileUpload, "cert", translate("HTTPS Certificate (DER or PEM format)")) -key_file = ucs:taboption("general", FileUpload, "key", translate("HTTPS Private Key (DER Encoded)")) +key_file = ucs:taboption("general", FileUpload, "key", translate("HTTPS Private Key (DER or PEM format)")) o = ucs:taboption("general", Button, "remove_old", translate("Remove old certificate and key"), translate("uHTTPd will generate a new self-signed certificate using the configuration shown below.")) -- 2.30.2