upd: un-localize OpenSSL-command-help

Change-Id: I0c1b92c00b550cf2efb4888666f87481e66d9e5b

diff --git a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java b/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java
index 5a13482f6221e87123745cc44534f48b6cdfed21..80ce8ff2e06bebac61203dcef1a9d9ea1b39a82c 100644 (file)
--- a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java
+++ b/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java
@@ -17,6 +17,7 @@ import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.ping.SSLPinger;
+import org.cacert.gigi.util.HTMLEncoder;
 import org.cacert.gigi.util.RandomToken;
 
 public class PingConfigForm extends Form {
@@ -154,6 +155,7 @@ public class PingConfigForm extends Form {
     protected void outputEmbeddableContent(PrintWriter out, Language l, Map<String, Object> vars) {
         vars.put("tokenName", tokenName);
         vars.put("tokenValue", tokenValue);
+        vars.put("openSSLHelp", "<code>" + HTMLEncoder.encodeHTML("-subj \"/CN=<domain>/OU=" + tokenValue + "\"") + "</code>");
         vars.put("authEmails", new IterableDataset() {
 
             int i = 0;

diff --git a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.templ b/src/org/cacert/gigi/pages/account/domain/PingConfigForm.templ
index 3df9bd2823c0f3cb14e64d2404f643e1583660df..91f3ee53302d8e15813173bc8e80afbd2f9147f7 100644 (file)
--- a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.templ
+++ b/src/org/cacert/gigi/pages/account/domain/PingConfigForm.templ
@@ -49,7 +49,7 @@
     <td></td>
     <td>
         <?=_Please list up to four services using your certificate. You need to have one of them up and using a valid SomeCA certificate or a specific self-signed certificate in order to pass this test?>:
-        <?=_The self-signed certificate needs to contain your domain as CN and ${tokenValue} as organization unit. With -subj "/CN=<domain>/OU=${tokenValue}" OpenSSL command line utilities can generate such a certificate.?>:
+        <?=_The self-signed certificate needs to contain your domain as CN and ${tokenValue} as organization unit. With $!{openSSLHelp} OpenSSL command line utilities can generate such a certificate.?>:
         <table>
         <? foreach($ssl-services){ ?>
         <tr><td><select name='ssl-type-<?=$i?>'>