Fix: correct syntax for "$"-Inline Variables.

diff --git a/src/org/cacert/gigi/output/ClientCSRGenerateIE.templ b/src/org/cacert/gigi/output/ClientCSRGenerateIE.templ
index 75765e1257576e93ed0d6323bc79edc003da946b..e4b2ccab4071aa9fa0bd207a5e722366c6120a51 100644 (file)
--- a/src/org/cacert/gigi/output/ClientCSRGenerateIE.templ
+++ b/src/org/cacert/gigi/output/ClientCSRGenerateIE.templ
@@ -8,7 +8,7 @@
                <p><?=_You have to enable ActiveX for this to work. On Windows Vista, Windows 7 and later versions you have to add this website to the list of trusted sites in the internet settings.?></p>
                <p><?=_Go to "Extras -> Internet Options -> Security -> Trusted Websites",
  click on "Custom Level", set "ActiveX control elements that are not marked as safe initialized on start
- in scripts" to "Confirm" and click "OK". Now click "Sites", add "$normalhost" and "$securehost" to your list of trusted
+ in scripts" to "Confirm" and click "OK". Now click "Sites", add "${normalhost}" and "${securehost}" to your list of trusted
  sites and make the changes come into effect by clicking "Close" and "OK".?></p>
        </div>
 
@@ -37,7 +37,7 @@
                                <?=_Minimum Size?>: <span id="keySizeMin"></span>,
                                <?=_Maximum Size?>: <span id="keySizeMax"></span>,
                                <?=_Step?>: <span id="keySizeStep"></span></p>
-                       <p style="color:red"><?=_Please note that RSA key sizes smaller than $minsize bit will not be accepted by CAcert?>
+                       <p style="color:red"><?=_Please note that RSA key sizes smaller than ${minsize} bit will not be accepted by CAcert?>
                        </p>
                </fieldset>
 

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
index ee749ab940f694c619b97326689dae126693c442..dda8ce4fb9094785dfc46638eeb2d1b97c0de97f 100644 (file)
--- a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
@@ -82,7 +82,7 @@
       <input type="checkbox" id="CCA" name="CCA" />
     </td>
     <td align="left">
-      <label for="CCA"><strong><?=_I accept the CAcert Community Agreement ($!CCA).?> </strong><br />
+      <label for="CCA"><strong><?=_I accept the CAcert Community Agreement ($!{CCA}).?> </strong><br />
       <?=_Please note: You need to accept the CCA to proceed.?></label>
     </td>
   </tr>

diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.templ b/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
index 21691e1dbaf02f71327c228577d9b01fbf13fda2..2967515bacaba37083ae6b0d5765273d7895ca9c 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
@@ -3,7 +3,7 @@
 <tr><th colspan="2"><?=_Assurance Confirmation?></th></tr>
 </thead>
 <tbody>
-<tr><td colspan="2"><?=_Please check the following details match against what you witnessed when you met $name in person. You MUST NOT proceed unless you are sure the details are correct. You may be held responsible by the CAcert Arbitrator for any issues with this Assurance.?>
+<tr><td colspan="2"><?=_Please check the following details match against what you witnessed when you met ${name} in person. You MUST NOT proceed unless you are sure the details are correct. You may be held responsible by the CAcert Arbitrator for any issues with this Assurance.?>
 </td></tr>
 
        <tr>
@@ -16,11 +16,11 @@
        </tr>
        <tr>
                <td><input type="checkbox" name="certify" value="1"></td>
-               <td><?=_I certify that $name has appeared in person.?></td>
+               <td><?=_I certify that ${name} has appeared in person.?></td>
        </tr>
        <tr>
                <td><input type="checkbox" name="CCAAgreed" value="1"></td>
-               <td><?=_I verify that $name has accepted the CAcert Community Agreement.?></td>
+               <td><?=_I verify that ${name} has accepted the CAcert Community Agreement.?></td>
        </tr>
        <tr>
                <td><?=_Location?></td>