From 8dd89c34d1af530ac56e3a42f04b0c1f239a1e67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Berthaud-M=C3=BCller?= Date: Tue, 27 Feb 2024 11:04:55 +0100 Subject: [PATCH 1/6] translate severity levels and module names --- .../components/result/result.component.html | 8 +- src/app/components/result/result.component.ts | 21 +++- src/locale/messages.fr.xlf | 62 +++++++++- src/locale/messages.xlf | 117 +++++++++++++++++- 4 files changed, 196 insertions(+), 12 deletions(-) diff --git a/src/app/components/result/result.component.html b/src/app/components/result/result.component.html index 14b5bb09..c7df0071 100644 --- a/src/app/components/result/result.component.html +++ b/src/app/components/result/result.component.html @@ -176,9 +176,9 @@

> - {{module.name}}: + {{moduleNames[module.name.toLowerCase()]}}: - + @@ -200,7 +200,7 @@

- {{ testcase.level | titlecase }}: {{ testCaseDescriptions[testcase.id] }} + {{ severityLevelNames[testcase.level] }}: {{ testCaseDescriptions[testcase.id] }}

@@ -210,7 +210,7 @@

    -
  • {{entry.level | titlecase}}

    {{entry.message}}

    • +
  • {{ severityLevelNames[entry.level] }}

    {{entry.message}}

diff --git a/src/app/components/result/result.component.ts b/src/app/components/result/result.component.ts index f034572d..f9d5ad72 100644 --- a/src/app/components/result/result.component.ts +++ b/src/app/components/result/result.component.ts @@ -32,7 +32,26 @@ export class ResultComponent implements OnInit, OnDestroy { 'warning': 'fa-exclamation-triangle', 'error': 'fa-times-circle', 'critical': 'fa-times-circle' - } + }; + public severityLevelNames = { + 'info': $localize `Info`, + 'notice': $localize `Notice`, + 'warning': $localize `Warning`, + 'error': $localize `Error`, + 'critical': $localize `Critical`, + }; + public moduleNames = { + 'system': $localize `System`, + 'basic': $localize `Basic`, + 'address': $localize `Address`, + 'connectivity': $localize `Connectivity`, + 'consistency': $localize `Consistency`, + 'delegation': $localize `Delegation`, + 'dnssec': $localize `DNSSEC`, + 'nameserver': $localize `Nameserver`, + 'syntax': $localize `Syntax`, + 'zone': $localize `Zone`, + }; public searchQueryLength = 0; public test: any = {params: {ipv4: false, ipv6: false}}; public isCollapsed = []; diff --git a/src/locale/messages.fr.xlf b/src/locale/messages.fr.xlf index e16a5e91..67fdb93b 100644 --- a/src/locale/messages.fr.xlf +++ b/src/locale/messages.fr.xlf @@ -878,6 +878,66 @@ Si le résultat du test ne comporte aucune erreur ni avertissement, on peut être relativement certain que le nouvel emplacement du domaine fonctionne bien. Mais cela n'exclut pas l'existence d'autres problèmes dans les données elles-mêmes de la zone que ce test n'aurait pas décelés. faq answer + + Info + Info + + + Notice + Note + + + Warning + Avertissement + + + Error + Erreur + + + Critical + Critique + + + System + Système + + + Basic + Basique + + + Address + Adresse + + + Connectivity + Connectivité + + + Consistency + Cohérence + + + Delegation + Délégation + + + DNSSEC + DNSSEC + + + Nameserver + Serveur de nom + + + Syntax + Syntaxe + + + Zone + Zone + - + \ No newline at end of file diff --git a/src/locale/messages.xlf b/src/locale/messages.xlf index 8191273e..59df91fa 100644 --- a/src/locale/messages.xlf +++ b/src/locale/messages.xlf @@ -360,35 +360,35 @@ No data for this test. src/app/components/result/result.component.ts - 169 + 188 History information request is in progress. src/app/components/result/result.component.ts - 256 + 275 Module src/app/components/result/result.component.ts - 340 + 359 Level src/app/components/result/result.component.ts - 341 + 360 Message src/app/components/result/result.component.ts - 342 + 361 @@ -511,7 +511,7 @@ No previous tests found for this domain. src/app/components/result/result.component.ts - 261 + 280 @@ -1467,6 +1467,111 @@ faq answer + + Error + + src/app/components/result/result.component.ts + 40 + + + + Critical + + src/app/components/result/result.component.ts + 41 + + + + Notice + + src/app/components/result/result.component.ts + 38 + + + + Info + + src/app/components/result/result.component.ts + 37 + + + + Warning + + src/app/components/result/result.component.ts + 39 + + + + Connectivity + + src/app/components/result/result.component.ts + 47 + + + + System + + src/app/components/result/result.component.ts + 44 + + + + Consistency + + src/app/components/result/result.component.ts + 48 + + + + Zone + + src/app/components/result/result.component.ts + 53 + + + + Delegation + + src/app/components/result/result.component.ts + 49 + + + + Syntax + + src/app/components/result/result.component.ts + 52 + + + + Address + + src/app/components/result/result.component.ts + 46 + + + + DNSSEC + + src/app/components/result/result.component.ts + 50 + + + + Nameserver + + src/app/components/result/result.component.ts + 51 + + + + Basic + + src/app/components/result/result.component.ts + 45 + + \ No newline at end of file From ff759f62c3d7dc6b846b2aa6413c16f1f1839a0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Berthaud-M=C3=BCller?= Date: Tue, 27 Feb 2024 12:06:05 +0100 Subject: [PATCH 2/6] add lang attribute for test case id --- src/app/components/result/result.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/result/result.component.html b/src/app/components/result/result.component.html index c7df0071..93143ad1 100644 --- a/src/app/components/result/result.component.html +++ b/src/app/components/result/result.component.html @@ -204,7 +204,7 @@

- + {{testcase.id}} From bbd2dbf86dc14dbb28ac432aebe90ad794802d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Berthaud-M=C3=BCller?= Date: Tue, 27 Feb 2024 13:36:24 +0100 Subject: [PATCH 3/6] translate forgotten severity level --- src/app/components/result/result.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/result/result.component.html b/src/app/components/result/result.component.html index 93143ad1..bf211d40 100644 --- a/src/app/components/result/result.component.html +++ b/src/app/components/result/result.component.html @@ -182,7 +182,7 @@

- {{ count.name }} ({{ count.value }}), + {{ severityLevelNames[count.name] | lowercase }} ({{ count.value }}),

From d3fc5752a89259940a9879e4b90b5f42d3a9aeb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Berthaud-M=C3=BCller?= Date: Tue, 27 Feb 2024 13:36:54 +0100 Subject: [PATCH 4/6] fix tests --- e2e/FR22.e2e-spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/FR22.e2e-spec.ts b/e2e/FR22.e2e-spec.ts index 80a44bcc..822ed1d7 100644 --- a/e2e/FR22.e2e-spec.ts +++ b/e2e/FR22.e2e-spec.ts @@ -25,7 +25,7 @@ test.describe('Zonemaster test FR22 - [Provide the possibility to see more infor const basic02Messages = page.locator('#testcase-entries-BASIC02 li'); await expect(basicHeader).toBeVisible({ timeout: 10000 }); - await expect(basicHeader).toHaveText(/BASIC/); + await expect(basicHeader).toHaveText(/Basic/i); await expect(basicTestcases).toHaveCount(3); From 98c5a685549ddbd280c7c5d5f7d49ccb532c8814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Berthaud-M=C3=BCller?= Date: Mon, 4 Mar 2024 11:37:38 +0100 Subject: [PATCH 5/6] fix visual bug on narrow screen --- src/app/components/result/result.component.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/result/result.component.css b/src/app/components/result/result.component.css index b2412653..70f39409 100644 --- a/src/app/components/result/result.component.css +++ b/src/app/components/result/result.component.css @@ -373,7 +373,7 @@ } .result section.testcase header { - flex-direction: column; + flex-wrap: wrap; } .result section.testcase header .test-case-id { From cee19dc7e4936f3136948b424d7a751f2bbb055a Mon Sep 17 00:00:00 2001 From: Hannaeko Date: Thu, 30 May 2024 15:56:08 +0200 Subject: [PATCH 6/6] don't translate unknown module names --- src/app/components/result/result.component.html | 2 +- src/app/components/result/result.component.ts | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/app/components/result/result.component.html b/src/app/components/result/result.component.html index bf211d40..cfd22d3d 100644 --- a/src/app/components/result/result.component.html +++ b/src/app/components/result/result.component.html @@ -176,7 +176,7 @@

> - {{moduleNames[module.name.toLowerCase()]}}: + {{getModuleName(module.name)}}: