From 17c03c2e6e0b88545a4ebeb377fff0953e446c93 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Mon, 6 Jun 2016 19:03:37 +0200
Subject: [PATCH] fix: more lang-stuff

Change-Id: Ic78e642eb1a637de1dcc73f1dcc3c261f3ad9fdd
---
 src/org/cacert/gigi/dbObjects/Domain.java     |  2 +-
 .../cacert/gigi/dbObjects/EmailAddress.java   |  2 +-
 src/org/cacert/gigi/dbObjects/Group.java      | 11 ++-
 .../cacert/gigi/output/ClientCSRGenerate.java |  2 -
 .../gigi/output/ClientCSRGenerateIE.templ     | 70 -------------------
 .../org/cacert/gigi/localisation/conf.txt     |  2 +-
 6 files changed, 11 insertions(+), 78 deletions(-)
 delete mode 100644 src/org/cacert/gigi/output/ClientCSRGenerateIE.templ

diff --git a/src/org/cacert/gigi/dbObjects/Domain.java b/src/org/cacert/gigi/dbObjects/Domain.java
index 55ed0f59..58765303 100644
--- a/src/org/cacert/gigi/dbObjects/Domain.java
+++ b/src/org/cacert/gigi/dbObjects/Domain.java
@@ -129,7 +129,7 @@ public class Domain implements IdCachable, Verifyable {
             boolean existed = rs.next();
             rs.close();
             if (existed) {
-                throw new GigiApiException("Domain could not be inserted. Domain is already valid.");
+                throw new GigiApiException("Domain could not be inserted. Domain is already known to the system.");
             }
         }
     }
diff --git a/src/org/cacert/gigi/dbObjects/EmailAddress.java b/src/org/cacert/gigi/dbObjects/EmailAddress.java
index cf007312..7a053201 100644
--- a/src/org/cacert/gigi/dbObjects/EmailAddress.java
+++ b/src/org/cacert/gigi/dbObjects/EmailAddress.java
@@ -59,7 +59,7 @@ public class EmailAddress implements IdCachable, Verifyable {
                     psCheck.setString(1, address);
                     GigiResultSet res = psCheck.executeQuery();
                     if (res.next()) {
-                        throw new GigiApiException("The email is currently valid");
+                        throw new GigiApiException("The email address is already known to the system.");
                     }
                     ps.execute();
                     id = ps.lastInsertId();
diff --git a/src/org/cacert/gigi/dbObjects/Group.java b/src/org/cacert/gigi/dbObjects/Group.java
index 48445ffc..16cde6c1 100644
--- a/src/org/cacert/gigi/dbObjects/Group.java
+++ b/src/org/cacert/gigi/dbObjects/Group.java
@@ -6,15 +6,20 @@ import org.cacert.gigi.output.template.Outputable;
 import org.cacert.gigi.output.template.TranslateCommand;
 
 public enum Group {
-    SUPPORTER("supporter"), ARBITRATOR("arbitrator"), BLOCKEDASSURER("blockedassurer"), BLOCKEDASSUREE("blockedassuree"), BLOCKEDLOGIN("blockedlogin"), BLOCKEDCERT("blockedcert"), TTP_ASSURER("ttp-assurer"), TTP_APPLICANT("ttp-applicant"), CODESIGNING("codesigning"), ORGASSURER("orgassurer"), NUCLEUS_ASSURER("nucleus-assurer");
+    SUPPORTER("supporter", "supporter"), ARBITRATOR("arbitrator", "arbitrator"), //
+    BLOCKEDASSURER("blockedassurer", "may not assure"), BLOCKEDASSUREE("blockedassuree", "may not be assured"), //
+    BLOCKEDLOGIN("blockedlogin", "may not login"), BLOCKEDCERT("blockedcert", "may not issue certificates"), //
+    TTP_ASSURER("ttp-assurer", "may assure via TTP"), TTP_APPLICANT("ttp-applicant", "requests to be assured via ttp"), //
+    CODESIGNING("codesigning", "may issue codesigning certificates"), ORGASSURER("orgassurer", "may assure organisations"), //
+    NUCLEUS_ASSURER("nucleus-assurer", "may issue nucleus assurances");
 
     private final String dbName;
 
     private final TranslateCommand tc;
 
-    private Group(String name) {
+    private Group(String name, String display) {
         dbName = name;
-        tc = new TranslateCommand(name);
+        tc = new TranslateCommand(display);
     }
 
     public static Group getByString(String name) {
diff --git a/src/org/cacert/gigi/output/ClientCSRGenerate.java b/src/org/cacert/gigi/output/ClientCSRGenerate.java
index 6146066b..440d2b0c 100644
--- a/src/org/cacert/gigi/output/ClientCSRGenerate.java
+++ b/src/org/cacert/gigi/output/ClientCSRGenerate.java
@@ -14,10 +14,8 @@ public class ClientCSRGenerate {
 
     private static Template normal;
 
-    private static Template IE;
     static {
         normal = new Template(ClientCSRGenerate.class.getResource("ClientCSRGenerate.templ"));
-        IE = new Template(ClientCSRGenerate.class.getResource("ClientCSRGenerateIE.templ"));
     }
 
     public static void output(HttpServletRequest req, HttpServletResponse resp) {
diff --git a/src/org/cacert/gigi/output/ClientCSRGenerateIE.templ b/src/org/cacert/gigi/output/ClientCSRGenerateIE.templ
deleted file mode 100644
index 164169f1..00000000
--- a/src/org/cacert/gigi/output/ClientCSRGenerateIE.templ
+++ /dev/null
@@ -1,70 +0,0 @@
-	<noscript>
-		<p><?=_You have to enable JavaScript to generate certificates in the browser.?></p>
-		<p><?=_If you don't want to do that for any reason, you can use manually created certificate requests instead.?></p>
-	</noscript>
-
-	<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><?=_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
- sites and make the changes come into effect by clicking "Close" and "OK".?></p>
-	</div>
-
-	<form method="post" style="display:none" action="account.php"
-			id="CertReqForm">
-		<input type="hidden" id="CSR" name="CSR" />
-		<input type="hidden" name="keytype" value="MS" />
-
-		<p><?=_Security level?>:
-			<select id="SecurityLevel">
-				<option value="high" selected="selected"><?=_High?></option>
-				<option value="medium"><?=_Medium?></option>
-				<option value="custom"><?=_Custom?>&hellip;</option>
-			</select>
-		</p>
-
-		<fieldset id="customSettings" style="display:none">
-			<legend><?=_Custom Parameters?></legend>
-
-			<p><?=_Cryptography Provider?>:
-				<select id="CspProvider"></select>
-			</p>
-			<p><?=_Algorithm?>: <select id="algorithm"></select></p>
-			<p><?=_Keysize?>:
-				<input id="keySize" type="number" />
-				<?=_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 SomeCA?>
-			</p>
-		</fieldset>
-
-		<p><input type="submit" id="GenReq" name="GenReq" value="<?=_Create Certificate?>" /></p>
-		<p id="generatingKeyNotice" style="display:none">
-			<?=_Generating your key. Please wait?>&hellip;</p>
-	</form>
-
-	<!-- Error messages used in the JavaScript. Defined here so they can be
-	translated without passing the JavaScript code through PHP -->
-	<p id="createRequestErrorChooseAlgorithm" style="display:none">
-		<?=_Could not generate certificate request. Probably you need to choose a different algorithm.?>
-	</p>
-	<p id="createRequestErrorConfirmDialogue" style="display:none">
-		<?=_Could not generate certificate request. Please confirm the dialogue if you are asked if you want to generate the key.?>
-	</p>
-	<p id="createRequestErrorConnectDevice" style="display:none">
-		<?=_Could not generate certificate request. Please make sure the cryptography device (e.g. the smartcard) is connected.?>
-	</p>
-	<p id="createRequestError" style="display:none">
-		<?=_Could not generate certificate request.?>
-	</p>
-	<p id="invalidKeySizeError" style="display:none">
-		<?=_You have specified an invalid key size?>
-	</p>
-	<p id="unsupportedPlatformError" style="display:none">
-		<?=_Could not initialize the cryptographic module for your platform. Currently we support Microsoft Windows XP, Vista and 7. If you're using one of these platforms and see this error message anyway you might have to enable ActiveX as described in the red explanation text and accept loading of the module.?>
-	</p>
-
-	<script type="text/javascript" src="<?=$statichost?>/keygenIE.js"></script>
diff --git a/util-testing/org/cacert/gigi/localisation/conf.txt b/util-testing/org/cacert/gigi/localisation/conf.txt
index f185e20f..e661604d 100644
--- a/util-testing/org/cacert/gigi/localisation/conf.txt
+++ b/util-testing/org/cacert/gigi/localisation/conf.txt
@@ -15,5 +15,5 @@ org.cacert.gigi.output.template SprintfCommand.SprintfCommand(String, List),0=>o
 org.cacert.gigi.output.template SprintfCom---invalid---mand.SprintfCommand(String),0=>org.cacert.gigi.output.template Template.parseCommand(String),0
 org.cacert.gigi.output.template TranslateCommand.TranslateCommand(String),0=>org.cacert.gigi.output.template TranslateCommand.output(PrintWriter, Language, Map),0
 org.cacert.gigi.pages.account.domain DomainOverview.DomainOverview(String),0
-org.cacert.gigi.dbObjects Group.Group(String),0
+org.cacert.gigi.dbObjects Group.Group(String, String),1
 org.cacert.gigi.output.template SprintfCommand.createSimple(String, String[]),0
-- 
2.39.2