Merge pull request #4200 from zhanhb/luci-app-acme

luci-app-acme: convert to client side rendering

1 files changed, 52 insertions, 32 deletions

diff --git a/applications/luci-app-acme/po/he/acme.po b/applications/luci-app-acme/po/he/acme.po
index ee1ff38658..7495081830 100644
--- a/applications/luci-app-acme/po/he/acme.po
+++ b/applications/luci-app-acme/po/he/acme.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
 msgid "ACME certificates"
 msgstr ""
 
@@ -12,58 +12,66 @@ msgstr ""
 msgid "ACME certs"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:27
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid "ACME global config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:35
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
 msgid "Account email"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:43
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
 msgid "Certificate config"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:106
 msgid "Challenge Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:93
 msgid "DNS API"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:101
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
 msgid "DNS API credentials"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:112
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:111
 msgid "Domain Alias"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:88
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "Domain names"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:89
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
 "must point at the router in the global DNS."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:36
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+msgid "ECC 256 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+msgid "ECC 384 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:35
 msgid "Email address to associate with account key."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:40
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Enable debug logging"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:47
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:51
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -73,26 +81,38 @@ msgstr ""
 msgid "Grant UCI access for luci-app-acme"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:55
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "Key size"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
 msgid "Key size (and type) for the generated certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "RSA 2048 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+msgid "RSA 3072 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+msgid "RSA 4096 bits"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
 msgid "State directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge alias per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:102
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:101
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -100,14 +120,14 @@ msgid ""
 "supply multiple credential variables."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:113
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:112
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
 "only supports one challenge domain per certificate."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:19
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -117,7 +137,7 @@ msgid ""
 "logs for progress and any errors."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -127,43 +147,43 @@ msgid ""
 "package to be installed."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:75
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid ""
 "Update the nginx config with this certificate once issued (only select this "
-"for one certificate).Nginx must support ssl, if not it won't start as it "
+"for one certificate). Nginx must support ssl, if not it won't start as it "
 "needs to be compiled with ssl support to use cert options"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:67
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
 msgid ""
 "Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate).Is also available luci-app-uhttpd to configure uhttpd "
+"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
 "form the LuCI interface."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:74
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Use for nginx"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
 msgid "Use for uhttpd"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Use staging server"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:82
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
 msgid "Webroot directory"
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:83
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
 "port 80."
 msgstr ""
 
-#: applications/luci-app-acme/luasrc/model/cbi/acme.lua:31
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
 msgid "Where certs and other state files are kept."
 msgstr ""