Skip to content

Commit

Permalink
Improve some local strings
Browse files Browse the repository at this point in the history
  • Loading branch information
lieser committed Mar 2, 2023
1 parent 2774c5e commit e632335
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
10 changes: 6 additions & 4 deletions _locales/de/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
"message": "Signatur-Zeitstempel-Tag hat falsches Format"
},
"DKIM_SIGERROR_TIMESTAMPS": {
"message": "Signatur-Ablaufdatum ist vor dem Signatur-Zeitstempel"
"message": "Ablaufdatum der Signatur liegt vor dem Zeitstempel der Signatur"
},
"DKIM_SIGERROR_ILLFORMED_X": {
"message": "Signatur-Ablaufdatum-Tag hat falsches Format"
Expand Down Expand Up @@ -262,7 +262,8 @@
},
// DKIM_SIGERROR - POLICY
"DKIM_POLICYERROR_MISSING_SIG": {
"message": "Sollte durch $1 signiert sein"
"message": "Keine Signatur, sollte durch $1 signiert sein",
"description": "Error if a message has no signature, but the sign rules state that it should be signed"
},
"DKIM_POLICYERROR_KEYMISMATCH": {
"message": "Gespeicherter DKIM-Schlüssel stimmt nicht mit dem aktuellen überein"
Expand Down Expand Up @@ -369,7 +370,8 @@
"message": "DNS-Server (EBNF-Syntax: host[\":\"port]{\";\"host[\":\"port]} )"
},
"options_dns.timeout_connect": {
"message": "Timeout für DNS-Verbindungsaufbau (in Sekunden)"
"message": "DNS-Verbindungs-Timeout (in Sekunden)",
"description": "Timeout for the connection to the DNS servers (both establishing the connection and sending/receiving data)"
},
"options_dns.proxy.enable": {
"message": "Proxy für die Verbindung zu den DNS-Servern benutzen"
Expand Down Expand Up @@ -436,7 +438,7 @@
"message": "DMARC benutzen, um heuristisch zu bestimmen, ob eine E-Mail signiert sein sollte"
},
"options_policy.dkim.unsignedHeadersWarning.mode": {
"message": "Warne vor unsignierten Kopfzeilen, die signiert sein sollten: ",
"message": "Warne vor unsignierten Kopfzeilen, die signiert sein sollten:",
"description": "Description for the setting of the unsigned headers warning mode."
},
"options_policy.dkim.unsignedHeadersWarning.mode.relaxed": {
Expand Down
6 changes: 4 additions & 2 deletions _locales/en_US/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,8 @@
},
// DKIM_SIGERROR - POLICY
"DKIM_POLICYERROR_MISSING_SIG": {
"message": "Should be signed by $1"
"message": "No Signature, should be signed by $1",
"description": "Error if a message has no signature, but the sign rules state that it should be signed"
},
"DKIM_POLICYERROR_KEYMISMATCH": {
"message": "Stored DKIM key is different from the current one"
Expand Down Expand Up @@ -369,7 +370,8 @@
"message": "DNS servers (Syntax (EBNF): host[\":\"port]{\";\"host[\":\"port]} )"
},
"options_dns.timeout_connect": {
"message": "DNS connect timeout (in seconds)"
"message": "DNS connection timeout (in seconds)",
"description": "Timeout for the connection to the DNS servers (both establishing the connection and sending/receiving data)"
},
"options_dns.proxy.enable": {
"message": "Use a Proxy to connect to the DNS servers"
Expand Down
6 changes: 3 additions & 3 deletions test/unittest/authVerifierSpec.mjs.js
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ describe("AuthVerifier [unittest]", function () {

res = await authVerifier.verify(fakePayPalMessage);
expect(res.dkim[0]?.result).to.be.equal("PERMFAIL");
expect(res.dkim[0]?.result_str).to.be.equal("Invalid (Should be signed by paypal.com)");
expect(res.dkim[0]?.result_str).to.be.equal("Invalid (No Signature, should be signed by paypal.com)");
});

it("outgoing mail", async function () {
Expand All @@ -229,7 +229,7 @@ describe("AuthVerifier [unittest]", function () {

let res = await authVerifier.verify(fakePayPalMessage);
expect(res.dkim[0]?.result).to.be.equal("PERMFAIL");
expect(res.dkim[0]?.result_str).to.be.equal("Invalid (Should be signed by paypal.com)");
expect(res.dkim[0]?.result_str).to.be.equal("Invalid (No Signature, should be signed by paypal.com)");

if (!fakePayPalMessage.folder) {
throw new Error("Expect faked message to be in a fake folder");
Expand All @@ -253,7 +253,7 @@ describe("AuthVerifier [unittest]", function () {

res = await verifier.verify(fakePayPalMessage);
expect(res.dkim[0]?.result).to.be.equal("PERMFAIL");
expect(res.dkim[0]?.result_str).to.be.equal("Invalid (Should be signed by paypal.com)");
expect(res.dkim[0]?.result_str).to.be.equal("Invalid (No Signature, should be signed by paypal.com)");
});
});

Expand Down

0 comments on commit e632335

Please sign in to comment.