From 00325134545e9b9c04ae2af6463e7621e2f02efa Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Fri, 13 Feb 2015 23:37:09 +0100
Subject: [PATCH] UPD: new  sprintf syntax in templates

---
 .../cacert/gigi/output/ClientCSRGenerateIE.templ   |  6 +++---
 src/org/cacert/gigi/pages/LoginPage.templ          |  4 ++--
 src/org/cacert/gigi/pages/MainPage.templ           |  2 +-
 src/org/cacert/gigi/pages/MainPageNotLogin.templ   | 14 +++++++-------
 .../pages/account/certs/CertificateIssueForm.templ |  2 +-
 src/org/cacert/gigi/pages/orga/CreateOrgForm.templ |  2 +-
 src/org/cacert/gigi/pages/wot/AssuranceForm.templ  |  6 +++---
 src/org/cacert/gigi/pages/wot/RequestTTPPage.templ |  2 +-
 8 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/org/cacert/gigi/output/ClientCSRGenerateIE.templ b/src/org/cacert/gigi/output/ClientCSRGenerateIE.templ
index 3f3b6177..75765e12 100644
--- a/src/org/cacert/gigi/output/ClientCSRGenerateIE.templ
+++ b/src/org/cacert/gigi/output/ClientCSRGenerateIE.templ
@@ -6,9 +6,9 @@
 	<div id="noActiveX" style="color:red">
 		<p><?=_Could not initialize ActiveX object required for certificate generation.?></p>
 		<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><?=s,$normalhost,$securehost,Go to "Extras -> Internet Options -> Security -> Trusted Websites",
+		<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 "%s" and "%s" 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"><?=s,$minsize,Please note that RSA key sizes smaller than %d 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/LoginPage.templ b/src/org/cacert/gigi/pages/LoginPage.templ
index c2418cda..7d49607b 100644
--- a/src/org/cacert/gigi/pages/LoginPage.templ
+++ b/src/org/cacert/gigi/pages/LoginPage.templ
@@ -7,5 +7,5 @@
 <a href='https://blah/index.php?id=4'><?=_Password Login?></a> -<!-- TODO -->
 <a href='https://blah/index.php?id=5'><?=_Lost Password?></a> -
 <a href='https://blah/index.php?id=4&amp;noauto=1'><?=_Net Cafe Login?></a><br />
-<p class='smalltext'><?=s,!"<a href='http://wiki.cacert.org/wiki/FAQ/LostPasswordOrAccount' target='_new'>",!"</a>",If you are having trouble with your username or password, please visit our %swiki page%s for more information?></p>
-</div>
\ No newline at end of file
+<p class='smalltext'><?=_If you are having trouble with your username or password, please visit our !'<a href="http://wiki.cacert.org/wiki/FAQ/LostPasswordOrAccount" target="_new">'wiki page!'</a>' for more information?></p>
+</div>
diff --git a/src/org/cacert/gigi/pages/MainPage.templ b/src/org/cacert/gigi/pages/MainPage.templ
index 5dfe0a9f..41c8522b 100644
--- a/src/org/cacert/gigi/pages/MainPage.templ
+++ b/src/org/cacert/gigi/pages/MainPage.templ
@@ -11,4 +11,4 @@
 <p><?=_Once you have verified your company you will see these menu options. They allow you to issue as many certificates as you like without proving individual email accounts as you like, further more you are able to get your company details on the certificate.?></p>
 <h4><?=_CAcert Web of Trust?></h4>
 <p><?=_The Web of Trust system CAcert uses is similar to that many involved with GPG/PGP use, they hold face to face meetings to verify each others photo identities match their GPG/PGP key information. CAcert differs however in that we have modified things to work within the PKI framework, for you to gain trust in the system you must first locate someone already trusted. The trust person depending how many people they've trusted or meet before will determine how many points they can issue to you (the number of points they can issue is listed in the locate assurer section). Once you've met up you can show your ID and you will need to fill out a CAP form which the person assuring your details must retain for verification reasons.?></p>
-<p><b><?=s,!"<a href='//wiki.cacert.org/TTP/TTPuser'>https://wiki.cacert.org/TTP/TTPuser</a>",!"<a href='//wiki.cacert.org/TTP/TTPAL'>https://wiki.cacert.org/TTP/TTPAL</a>",For information about the TTP-assisted-assurance program please read %s and %s.?></b></p>
+<p><b><?=_For information about the TTP-assisted-assurance program please read !'<a href="//wiki.cacert.org/TTP/TTPuser">https://wiki.cacert.org/TTP/TTPuser</a>' and !'<a href="//wiki.cacert.org/TTP/TTPAL">	https://wiki.cacert.org/TTP/TTPAL</a>'.?></b></p>
diff --git a/src/org/cacert/gigi/pages/MainPageNotLogin.templ b/src/org/cacert/gigi/pages/MainPageNotLogin.templ
index 80c5d2bf..c2359c58 100644
--- a/src/org/cacert/gigi/pages/MainPageNotLogin.templ
+++ b/src/org/cacert/gigi/pages/MainPageNotLogin.templ
@@ -4,18 +4,18 @@
 
 <p><?=_CAcert's goal is to promote awareness and education on computer security through the use of encryption, specifically by providing cryptographic certificates. These certificates can be used to digitally sign and encrypt email, authenticate and authorize users connecting to websites and secure data transmission over the internet. Any application that supports the Secure Socket Layer Protocol (SSL or TLS) can make use of certificates signed by CAcert, as can any application that uses X.509 certificates, e.g. for encryption or code signing and document signatures.?></p>
 
-<p><?=s,!"<a href='/register'>",!"</a>",If you want to have free certificates issued to you, %s join the CAcert Community %s.?></p>
+<p><?=_If you want to have free certificates issued to you, !'<a href="/register">'join the CAcert Community!'</a>'.?></p>
 
-<p><?=s,!"<a href='/policy/RootDistributionLicense.html'>",!"</a>",If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s.?>
-<?=s,!"<a href='/roots'>",!"</a>",This license applies to using the CAcert %s root keys %s.?></p>
+<p><?=_If you want to use certificates issued by CAcert, read the CAcert !'<a href="/policy/RootDistributionLicense.html">'Root Distribution License!'</a>'.?>
+<?=_This license applies to using the CAcert !'<a href="/roots">'root keys!'</a>'.?></p>
 
 <hr/>
 
 <h3><?=_For CAcert Community Members?></h3>
 
-<p><?=s,!"<a href='http://wiki.cacert.org/wiki/AssurerChallenge'>",!"</a>",Have you passed the CAcert %s Assurer Challenge %s yet??></p>
+<p><?=_Have you passed the CAcert !'<a href="http://wiki.cacert.org/wiki/AssurerChallenge">'Assurer Challenge!'</a>' yet??></p>
 
-<p><?=s,!"<a href='/policy/CAcertCommunityAgreement.html'>",!"</a>",Have you read the CAcert %sCommunity Agreement%s yet??></p>
+<p><?=_Have you read the CAcert !'<a href="/policy/CAcertCommunityAgreement.html">'Community Agreement!'</a>' yet??></p>
 
-<p><?=s,!"<a href='http://wiki.CAcert.org'>",!"</a>",For general documentation and help, please visit the CAcert %sWiki Documentation site %s.?>
-<?=s,!"<a href='/policy/'>",!"</a>",For specific policies, see the CAcert %sApproved Policies page%s.?></p>
+<p><?=_For general documentation and help, please visit the CAcert !'<a href="http://wiki.CAcert.org">'Wiki Documentation site!'</a>'.?>
+<?=_For specific policies, see the CAcert !'<a href="/policy/">'Approved Policies page!'</a>'.?></p>
diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
index 3be5737c..ee749ab9 100644
--- 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><?=s,$!CCA,I accept the CAcert Community Agreement (%s).?> </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/orga/CreateOrgForm.templ b/src/org/cacert/gigi/pages/orga/CreateOrgForm.templ
index a2d1c436..fc94fe3a 100644
--- a/src/org/cacert/gigi/pages/orga/CreateOrgForm.templ
+++ b/src/org/cacert/gigi/pages/orga/CreateOrgForm.templ
@@ -26,7 +26,7 @@
   <tr>
     <td><?=_Country?>:</td>
     <td><input type="text" name="C" value="<?=$C?>" maxlength="2" size="5">
-        <?=s,!"<a href='http://www.iso.org/iso/home/standards/country_codes/iso-3166-1_decoding_table.htm'>",!"</a>",(2 letter %s ISO code %s )?>
+        <?=_(2 letter !'<a href="http://www.iso.org/iso/home/standards/country_codes/iso-3166-1_decoding_table.htm">'ISO code!'</a>')?>
     </td>
   </tr>
   <tr>
diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.templ b/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
index 580b1896..21691e1d 100644
--- 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"><?=s,$name,Please check the following details match against what you witnessed when you met %s 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><?=s,$name,I certify that %s 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><?=s,$name,I verify that %s has accepted the CAcert Community Agreement.?></td>
+		<td><?=_I verify that $name has accepted the CAcert Community Agreement.?></td>
 	</tr>
 	<tr>
 		<td><?=_Location?></td>
diff --git a/src/org/cacert/gigi/pages/wot/RequestTTPPage.templ b/src/org/cacert/gigi/pages/wot/RequestTTPPage.templ
index 9ff6114b..a6898fec 100644
--- a/src/org/cacert/gigi/pages/wot/RequestTTPPage.templ
+++ b/src/org/cacert/gigi/pages/wot/RequestTTPPage.templ
@@ -12,7 +12,7 @@
 
 <p><?=_In the meanwhile you would need to close this gap with face to face assurances with CAcert Assurers. Think not only travelling to populated countries, but also remember that assurers may occasionally visit your country or area.?></p>
 
-<p><?=s,!"<a href='//wiki.cacert.org/TTP/TTPuser'>https://wiki.cacert.org/TTP/TTPuser</a>",!"<a href='//wiki.cacert.org/TTP/TTPAL'>https://wiki.cacert.org/TTP/TTPAL</a>",If you are interested in the TTP programme, read the pages %s for the basic way how the TTP programme works for you, and %s whether the TTP programme affects the country where you are located.?> </p>
+<p><?=_If you are interested in the TTP programme, read the pages !'<a href="//wiki.cacert.org/TTP/TTPuser">https://wiki.cacert.org/TTP/TTPuser</a>' for the basic way how the TTP programme works for you, and !'<a href="//wiki.cacert.org/TTP/TTPAL">https://wiki.cacert.org/TTP/TTPAL</a>' whether the TTP programme affects the country where you are located.?> </p>
 
 <? if($ttp) { ?>
 <p><?=_If you want to ask for TTP assurances fill out the missing data and send the request to support@cacert.org to start the process. CAcert will then inform you about the next steps.?></p>
-- 
2.39.2