Merge "upd: small changes for consistent wording and better translation"

diff --git a/src/club/wpia/gigi/ping/PingerDaemon.java b/src/club/wpia/gigi/ping/PingerDaemon.java
index 895e8c831f099de7758efd1f3b590e604291e2bc..dee4e90c8d47f18278e7cbfde4c219647fa2c173 100644 (file)
--- a/src/club/wpia/gigi/ping/PingerDaemon.java
+++ b/src/club/wpia/gigi/ping/PingerDaemon.java
@@ -201,7 +201,7 @@ public class PingerDaemon extends Thread {
                         HashMap<String, Object> vars = new HashMap<>();
                         vars.put("valid", target.isVerified());
                         vars.put("domain", target.getSuffix());
-                        vars.put("domainLink", "https://" + ServerConstants.getHostNamePortSecure(Host.WWW) + "/" + EditDomain.PATH + target.getId());
+                        vars.put("domainLink", "https://" + ServerConstants.getHostNamePortSecure(Host.WWW) + EditDomain.PATH + target.getId());
                         vars.put("certs", new ArrayIterable<Certificate>(cs) {
 
                             @Override

diff --git a/tests/club/wpia/gigi/ping/TestTiming.java b/tests/club/wpia/gigi/ping/TestTiming.java
index f2b6fe100f4b31fd73ed06318249a432fe4881b0..2c36b03b3e3ba2bcbe849c808a51c5ddef69ab26 100644 (file)
--- a/tests/club/wpia/gigi/ping/TestTiming.java
+++ b/tests/club/wpia/gigi/ping/TestTiming.java
@@ -23,10 +23,13 @@ import club.wpia.gigi.dbObjects.Domain;
 import club.wpia.gigi.dbObjects.DomainPingConfiguration;
 import club.wpia.gigi.dbObjects.DomainPingExecution;
 import club.wpia.gigi.dbObjects.DomainPingType;
+import club.wpia.gigi.pages.account.domain.EditDomain;
 import club.wpia.gigi.ping.DomainPinger.PingState;
 import club.wpia.gigi.testUtils.PingTest;
 import club.wpia.gigi.testUtils.TestEmailReceiver.TestMail;
 import club.wpia.gigi.util.RandomToken;
+import club.wpia.gigi.util.ServerConstants;
+import club.wpia.gigi.util.ServerConstants.Host;
 import club.wpia.gigi.util.SimpleSigner;
 
 public class TestTiming extends PingTest {
@@ -109,6 +112,7 @@ public class TestTiming extends PingTest {
                 pd.executeNeededPings(new Date(System.currentTimeMillis() + 15 * 24 * 60 * 60L * 1000));
                 // The user receives another warning mail.
                 mail = getMailReceiver().receive(u.getEmail());
+                assertThat(mail.getMessage(), CoreMatchers.containsString("https://" + ServerConstants.getHostNamePortSecure(Host.WWW) + EditDomain.PATH + d.getId()));
                 assertThat(mail.getMessage(), CoreMatchers.containsString(d.getSuffix()));
                 assertThat(mail.getMessage(), CoreMatchers.containsString(c.getSerial()));
                 // And when the revocation is carried out