From 6fdaa05e2fc9f65211d3c8c5bda894b3c1906d2c Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Wed, 27 Jul 2016 06:33:06 +0200 Subject: [PATCH] upd: replace assure, assurance, assurer etc in output to user Change-Id: I6a0d357c0af4a718bef357f6db7fbfb2ec8dda47 --- src/org/cacert/gigi/database/tableStructure.sql | 6 +++--- src/org/cacert/gigi/dbObjects/Group.java | 6 +++--- src/org/cacert/gigi/dbObjects/Name.java | 2 +- src/org/cacert/gigi/output/AssurancesDisplay.templ | 2 +- src/org/cacert/gigi/pages/MainPage.templ | 2 +- src/org/cacert/gigi/pages/account/FindAgentAccess.templ | 4 ++-- src/org/cacert/gigi/util/Notary.java | 4 ++-- tests/org/cacert/gigi/pages/orga/TestOrgManagement.java | 4 ++-- tests/org/cacert/gigi/testUtils/ManagedTest.java | 4 ++-- tests/org/cacert/gigi/util/TestNotary.java | 4 ++-- util-testing/org/cacert/gigi/pages/Manager.java | 4 ++-- util-testing/org/cacert/gigi/pages/Manager.templ | 6 +++--- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/org/cacert/gigi/database/tableStructure.sql b/src/org/cacert/gigi/database/tableStructure.sql index 883adf76..9bd231e8 100644 --- a/src/org/cacert/gigi/database/tableStructure.sql +++ b/src/org/cacert/gigi/database/tableStructure.sql @@ -261,17 +261,17 @@ CREATE TABLE "notary" ( "points" int NOT NULL DEFAULT '0', # awarded and the "experience points" are calculated virtually # Face to Face is default, TOPUP is for the remaining 30Points after two TTP -# TTP is default ttp assurance +# TTP is default ttp verification "method" "notaryType" NOT NULL DEFAULT 'Face to Face Meeting', "location" varchar(255) NOT NULL DEFAULT '', "date" varchar(255) NOT NULL DEFAULT '', -# date when assurance was entered +# date when verification was entered "when" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, #? "expire" timestamp NULL DEFAULT NULL, #????????????????? "sponsor" int NOT NULL DEFAULT '0', -# date when assurance was deleted (or 0) +# date when verification was deleted (or 0) "deleted" timestamp NULL DEFAULT NULL, PRIMARY KEY ("id") ); diff --git a/src/org/cacert/gigi/dbObjects/Group.java b/src/org/cacert/gigi/dbObjects/Group.java index d5d38efd..dd6767ef 100644 --- a/src/org/cacert/gigi/dbObjects/Group.java +++ b/src/org/cacert/gigi/dbObjects/Group.java @@ -7,10 +7,10 @@ import org.cacert.gigi.output.template.TranslateCommand; public enum Group { SUPPORTER("supporter", "supporter"), ARBITRATOR("arbitrator", "arbitrator"), // - BLOCKEDASSURER("blockedassurer", "may not assure"), BLOCKEDASSUREE("blockedassuree", "may not be assured"), // + BLOCKEDASSURER("blockedassurer", "may not verify"), BLOCKEDASSUREE("blockedassuree", "may not be verified"), // 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"), // + TTP_ASSURER("ttp-assurer", "may verify via TTP"), TTP_APPLICANT("ttp-applicant", "requests to be verified via ttp"), // + CODESIGNING("codesigning", "may issue codesigning certificates"), ORGASSURER("orgassurer", "may verify organisations"), // NUCLEUS_ASSURER("nucleus-assurer", "may issue nucleus assurances"), LOCATE_AGENT("locate-agent", "wants access to the locate agent system"); private final String dbName; diff --git a/src/org/cacert/gigi/dbObjects/Name.java b/src/org/cacert/gigi/dbObjects/Name.java index 8289293d..eb4c7afb 100644 --- a/src/org/cacert/gigi/dbObjects/Name.java +++ b/src/org/cacert/gigi/dbObjects/Name.java @@ -226,7 +226,7 @@ public class Name implements Outputable, IdCachable { private SchemedName scheme; /** - * This name should not get assured anymore and therefore not be displayed + * This name should not get verifed anymore and therefore not be displayed * to the RA-Agent. This state is irrevocable. */ private boolean deprecated; diff --git a/src/org/cacert/gigi/output/AssurancesDisplay.templ b/src/org/cacert/gigi/output/AssurancesDisplay.templ index ab851632..1a552f06 100644 --- a/src/org/cacert/gigi/output/AssurancesDisplay.templ +++ b/src/org/cacert/gigi/output/AssurancesDisplay.templ @@ -1,6 +1,6 @@ - + diff --git a/src/org/cacert/gigi/pages/MainPage.templ b/src/org/cacert/gigi/pages/MainPage.templ index 3acd4b9e..fb87cf5b 100644 --- a/src/org/cacert/gigi/pages/MainPage.templ +++ b/src/org/cacert/gigi/pages/MainPage.templ @@ -10,5 +10,5 @@

-

+

https://wiki.cacert.org/TTP/TTPuser' and !' https://wiki.cacert.org/TTP/TTPAL'.?>

diff --git a/src/org/cacert/gigi/pages/account/FindAgentAccess.templ b/src/org/cacert/gigi/pages/account/FindAgentAccess.templ index 41456363..f2dbfad3 100644 --- a/src/org/cacert/gigi/pages/account/FindAgentAccess.templ +++ b/src/org/cacert/gigi/pages/account/FindAgentAccess.templ @@ -1,2 +1,2 @@ - - + + diff --git a/src/org/cacert/gigi/util/Notary.java b/src/org/cacert/gigi/util/Notary.java index 280bce39..e1c903e8 100644 --- a/src/org/cacert/gigi/util/Notary.java +++ b/src/org/cacert/gigi/util/Notary.java @@ -87,7 +87,7 @@ public class Notary { throw gae; } if (date == null || date.equals("")) { - gae.mergeInto(new GigiApiException("You must enter the date when you met the assuree.")); + gae.mergeInto(new GigiApiException("You must enter the date when you met the applicant.")); } else { try { Date d = DateSelector.getDateFormat().parse(date); @@ -128,7 +128,7 @@ public class Notary { } if ( !assuree.getDoB().equals(dob)) { - gae.mergeInto(new GigiApiException("The person you are assuring changed his personal details.")); + gae.mergeInto(new GigiApiException("The person you are verifying changed his personal details.")); } if (awarded < 0) { diff --git a/tests/org/cacert/gigi/pages/orga/TestOrgManagement.java b/tests/org/cacert/gigi/pages/orga/TestOrgManagement.java index 4e606ae7..c17b9abb 100644 --- a/tests/org/cacert/gigi/pages/orga/TestOrgManagement.java +++ b/tests/org/cacert/gigi/pages/orga/TestOrgManagement.java @@ -118,7 +118,7 @@ public class TestOrgManagement extends OrgTest { Organisation o1 = createUniqueOrg(); o1.addAdmin(u3, u, true); try { - // must fail because u4 is no assurer + // must fail because u4 is no RA-Agent o1.addAdmin(u4_dummy, u3, false); fail("No exception!"); } catch (GigiApiException e) { @@ -131,7 +131,7 @@ public class TestOrgManagement extends OrgTest { } catch (GigiApiException e) { } try { - // must fail because u4 is no assurer + // must fail because u4 is no RA-Agent o1.addAdmin(u4_dummy, u, false); fail("No exception!"); } catch (GigiApiException e) { diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java index b8758522..036adc92 100644 --- a/tests/org/cacert/gigi/testUtils/ManagedTest.java +++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java @@ -297,8 +297,8 @@ public class ManagedTest extends ConfiguredTest { } /** - * Creates a new user with 100 Assurance points given by an (invalid) - * assurance. + * Creates a new user with 100 Verification Points given by an (invalid) + * verification. * * @param firstName * the first name diff --git a/tests/org/cacert/gigi/util/TestNotary.java b/tests/org/cacert/gigi/util/TestNotary.java index 862e7bfe..37451573 100644 --- a/tests/org/cacert/gigi/util/TestNotary.java +++ b/tests/org/cacert/gigi/util/TestNotary.java @@ -107,7 +107,7 @@ public class TestNotary extends BusinessTest { // points too high assuranceFail(assuranceUser, assuree, 11, "notary-junit-test", validVerificationDateString()); - // assure oneself + // verify oneself assuranceFail(assuranceUser, assuranceUser, 10, "notary-junit-test", validVerificationDateString()); // not an assurer assuranceFail(assuree, assuranceUser, 10, "notary-junit-test", validVerificationDateString()); @@ -115,7 +115,7 @@ public class TestNotary extends BusinessTest { // valid Notary.assure(assuranceUser, assuree, assuree.getPreferredName(), assuree.getDoB(), 10, "notary-junit-test", validVerificationDateString(), AssuranceType.FACE_TO_FACE); - // assure double + // verify double assuranceFail(assuranceUser, assuree, 10, "notary-junit-test", validVerificationDateString()); } diff --git a/util-testing/org/cacert/gigi/pages/Manager.java b/util-testing/org/cacert/gigi/pages/Manager.java index c5b3c257..21b7e432 100644 --- a/util-testing/org/cacert/gigi/pages/Manager.java +++ b/util-testing/org/cacert/gigi/pages/Manager.java @@ -106,7 +106,7 @@ public class Manager extends Page { String mail = "test-assurer" + i + "@example.com"; User u = User.getByEmail(mail); if (u == null) { - System.out.println("Creating assurer"); + System.out.println("Creating RA-Agent"); createUser(mail); u = User.getByEmail(mail); passCATS(u, CATSType.ASSURER_CHALLENGE); @@ -293,7 +293,7 @@ public class Manager extends Page { if (vp < 10) { currentVP = vp; } - Notary.assure(getAssurer(agentNumber), byEmail, byEmail.getPreferredName(), byEmail.getDoB(), currentVP, "Testmanager Assure up code", "2014-11-06", AssuranceType.FACE_TO_FACE); + Notary.assure(getAssurer(agentNumber), byEmail, byEmail.getPreferredName(), byEmail.getDoB(), currentVP, "Testmanager Verify up code", "2014-11-06", AssuranceType.FACE_TO_FACE); agentNumber += 1; vp -= currentVP; } diff --git a/util-testing/org/cacert/gigi/pages/Manager.templ b/util-testing/org/cacert/gigi/pages/Manager.templ index 83ae72b0..3e929e98 100644 --- a/util-testing/org/cacert/gigi/pages/Manager.templ +++ b/util-testing/org/cacert/gigi/pages/Manager.templ @@ -53,7 +53,7 @@ Email:
-Add 100 Assurance points: +Add 100 Verification Points: Email: @@ -62,11 +62,11 @@ Verification Points to issue:
-Assure 25 others (get 25 experience points) : +Verify 25 others (get 25 Experience Points) : Email: - +
-- 2.39.2