From 3d2d08e1fccb4a25ff1babb9d1f004db84546665 Mon Sep 17 00:00:00 2001 From: dcoutadeur Date: Sun, 18 Oct 2020 14:35:51 +0200 Subject: [PATCH] fix previous commit: RGAA 5.4 requires arrays to have defined captions (#2356) --- lemonldap-ng-portal/site/htdocs/static/languages/ar.json | 4 ++-- lemonldap-ng-portal/site/htdocs/static/languages/de.json | 4 ++-- lemonldap-ng-portal/site/htdocs/static/languages/en.json | 4 ++-- lemonldap-ng-portal/site/htdocs/static/languages/es.json | 4 ++-- lemonldap-ng-portal/site/htdocs/static/languages/fi.json | 4 ++-- lemonldap-ng-portal/site/htdocs/static/languages/fr.json | 4 ++-- lemonldap-ng-portal/site/htdocs/static/languages/it.json | 4 ++-- lemonldap-ng-portal/site/htdocs/static/languages/nl.json | 4 ++-- lemonldap-ng-portal/site/htdocs/static/languages/pl.json | 4 ++-- lemonldap-ng-portal/site/htdocs/static/languages/pt.json | 4 ++-- lemonldap-ng-portal/site/htdocs/static/languages/ro.json | 4 ++-- lemonldap-ng-portal/site/htdocs/static/languages/tr.json | 4 ++-- lemonldap-ng-portal/site/htdocs/static/languages/vi.json | 4 ++-- lemonldap-ng-portal/site/htdocs/static/languages/zh.json | 4 ++-- lemonldap-ng-portal/site/templates/bootstrap/sessionArray.tpl | 4 ++-- lemonldap-ng-portal/t/63-History.t | 3 +++ 16 files changed, 33 insertions(+), 30 deletions(-) diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/ar.json b/lemonldap-ng-portal/site/htdocs/static/languages/ar.json index 3a41ad923..3b41e2e11 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/ar.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/ar.json @@ -178,10 +178,10 @@ "info":"معلومات", "ipAddr":"عنوان الأي بي", "key":"المفتاح", -"lastConnexionLabel":"Last connections", -"lastFailedConnexionLabel":"Last failed connections", "lastFailedLogins":"عمليات تسجيل الدخول الأخيرة الغير الناجحة", +"lastFailedLoginsCaptionLabel":"Last failed logins", "lastLogins":"آخر تسجيلات دخول", +"lastLoginsCaptionLabel":"Last logins", "lastName":"اسم العائلة", "linkValidUntil":"تحتوي هذه الرسالة على رابط لإعادة تعيين كلمة المرور، وهذا الرابط صالح حتى", "linkValidUntilCertif":"This message contains a link to reset your certificate, this link is valid until ", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/de.json b/lemonldap-ng-portal/site/htdocs/static/languages/de.json index 2d6504ea2..cfb7ce472 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/de.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/de.json @@ -178,10 +178,10 @@ "info":"Information", "ipAddr":"IP address", "key":"Key", -"lastConnexionLabel":"Last connections", -"lastFailedConnexionLabel":"Last failed connections", "lastFailedLogins":"Letzte fehlgeschlagene Anmeldungen", +"lastFailedLoginsCaptionLabel":"Last failed logins", "lastLogins":"Letzte Anmeldungen", +"lastLoginsCaptionLabel":"Last logins", "lastName":"Nachname", "linkValidUntil":"Diese Nachricht enthält einen Link zum Zurücksetzen deines Passworts. Dieser Link ist gültig bis", "linkValidUntilCertif":"This message contains a link to reset your certificate, this link is valid until ", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/en.json b/lemonldap-ng-portal/site/htdocs/static/languages/en.json index 2deb568b0..99f1a25b2 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/en.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/en.json @@ -178,10 +178,10 @@ "info":"Information", "ipAddr":"IP address", "key":"Key", -"lastConnexionLabel":"Last connections", -"lastFailedConnexionLabel":"Last failed connections", "lastFailedLogins":"Last failed logins", +"lastFailedLoginsCaptionLabel":"Last failed logins", "lastLogins":"Last logins", +"lastLoginsCaptionLabel":"Last logins", "lastName":"Last name", "linkValidUntil":"This message contains a link to reset your password, this link is valid until ", "linkValidUntilCertif":"This message contains a link to reset your certificate, this link is valid until ", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/es.json b/lemonldap-ng-portal/site/htdocs/static/languages/es.json index 5704b0f41..927a303df 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/es.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/es.json @@ -178,10 +178,10 @@ "info":"Información", "ipAddr":"Dirección IP", "key":"Llave", -"lastConnexionLabel":"Last connections", -"lastFailedConnexionLabel":"Last failed connections", "lastFailedLogins":"Últimas conexiones fallidas", +"lastFailedLoginsCaptionLabel":"Last failed logins", "lastLogins":"Últimas conexiones", +"lastLoginsCaptionLabel":"Last logins", "lastName":"Apellido(s)", "linkValidUntil":"Este mensaje contiene un enlace para reiniciar su contraseña, este enlace es válido hasta", "linkValidUntilCertif":"Este mensaje contiene un link para reiniciar su certificado. Este link is válido hasta", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/fi.json b/lemonldap-ng-portal/site/htdocs/static/languages/fi.json index c49bce5b2..144e98065 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/fi.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/fi.json @@ -178,10 +178,10 @@ "info":"Information", "ipAddr":"IP-osoite", "key":"Key", -"lastConnexionLabel":"Last connections", -"lastFailedConnexionLabel":"Last failed connections", "lastFailedLogins":"Viimeiset virheelliset kirjautumiset", +"lastFailedLoginsCaptionLabel":"Last failed logins", "lastLogins":"Viimeisimmät kirjautumiset", +"lastLoginsCaptionLabel":"Last logins", "lastName":"Sukunimi", "linkValidUntil":"Tämä viesti sisältää linkin salasanan nollaamiseen, linkki on voimassa", "linkValidUntilCertif":"This message contains a link to reset your certificate, this link is valid until ", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/fr.json b/lemonldap-ng-portal/site/htdocs/static/languages/fr.json index bbca52d7c..0e7fe1014 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/fr.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/fr.json @@ -178,10 +178,10 @@ "info":"Information", "ipAddr":"Adresse IP", "key":"Clef", -"lastConnexionLabel":"Dernières connexions", -"lastFailedConnexionLabel":"Dernières connexions échouées", "lastFailedLogins":"Dernières connexions refusées", +"lastFailedLoginsCaptionLabel":"Dernières connexions refusées", "lastLogins":"Dernières connexions", +"lastLoginsCaptionLabel":"Dernières connexions", "lastName":"Nom", "linkValidUntil":"Ce message contient un lien pour réinitialiser votre mot de passe, ce lien est valide jusqu'au ", "linkValidUntilCertif":"Ce message contient un lien pour réinitialiser votre certificat, ce lien est valide jusqu'à ", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/it.json b/lemonldap-ng-portal/site/htdocs/static/languages/it.json index 42262257c..b042e70f1 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/it.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/it.json @@ -178,10 +178,10 @@ "info":"Informazioni", "ipAddr":"Indirizzo IP", "key":"Chiave", -"lastConnexionLabel":"Last connections", -"lastFailedConnexionLabel":"Last failed connections", "lastFailedLogins":"Ultimi login non riusciti", +"lastFailedLoginsCaptionLabel":"Last failed logins", "lastLogins":"Ultimi accessi", +"lastLoginsCaptionLabel":"Last logins", "lastName":"Cognome", "linkValidUntil":"Questo messaggio contiene un link per reimpostare la password, questo link è valido fino al", "linkValidUntilCertif":"This message contains a link to reset your certificate, this link is valid until ", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/nl.json b/lemonldap-ng-portal/site/htdocs/static/languages/nl.json index 5ef4f8cbc..a139fc4b0 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/nl.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/nl.json @@ -178,10 +178,10 @@ "info":"Information", "ipAddr":"IP address", "key":"Key", -"lastConnexionLabel":"Last connections", -"lastFailedConnexionLabel":"Last failed connections", "lastFailedLogins":"Last failed logins", +"lastFailedLoginsCaptionLabel":"Last failed logins", "lastLogins":"Last logins", +"lastLoginsCaptionLabel":"Last logins", "lastName":"Last name", "linkValidUntil":"This message contains a link to reset your password, this link is valid until ", "linkValidUntilCertif":"This message contains a link to reset your certificate, this link is valid until ", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/pl.json b/lemonldap-ng-portal/site/htdocs/static/languages/pl.json index b6ba27a3f..96aed3e53 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/pl.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/pl.json @@ -178,10 +178,10 @@ "info":"Informacja", "ipAddr":"Adres IP", "key":"Klucz", -"lastConnexionLabel":"Last connections", -"lastFailedConnexionLabel":"Last failed connections", "lastFailedLogins":"Ostatnie nieudane logowania", +"lastFailedLoginsCaptionLabel":"Last failed logins", "lastLogins":"Ostatnie logowania", +"lastLoginsCaptionLabel":"Last logins", "lastName":"Nazwisko", "linkValidUntil":"Ta wiadomość zawiera link do zresetowania hasła, ten link jest ważny do ", "linkValidUntilCertif":"Ta wiadomość zawiera link do zresetowania certyfikatu, ten link jest ważny do ", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/pt.json b/lemonldap-ng-portal/site/htdocs/static/languages/pt.json index 68cbbdd5f..bbb1d8b19 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/pt.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/pt.json @@ -178,10 +178,10 @@ "info":"Information", "ipAddr":"IP address", "key":"Key", -"lastConnexionLabel":"Last connections", -"lastFailedConnexionLabel":"Last failed connections", "lastFailedLogins":"Last failed logins", +"lastFailedLoginsCaptionLabel":"Last failed logins", "lastLogins":"Last logins", +"lastLoginsCaptionLabel":"Last logins", "lastName":"Last name", "linkValidUntil":"This message contains a link to reset your password, this link is valid until ", "linkValidUntilCertif":"This message contains a link to reset your certificate, this link is valid until ", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/ro.json b/lemonldap-ng-portal/site/htdocs/static/languages/ro.json index 6484e19e8..2ddb1ea24 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/ro.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/ro.json @@ -178,10 +178,10 @@ "info":"Information", "ipAddr":"IP address", "key":"Key", -"lastConnexionLabel":"Last connections", -"lastFailedConnexionLabel":"Last failed connections", "lastFailedLogins":"Last failed logins", +"lastFailedLoginsCaptionLabel":"Last failed logins", "lastLogins":"Last logins", +"lastLoginsCaptionLabel":"Last logins", "lastName":"Last name", "linkValidUntil":"This message contains a link to reset your password, this link is valid until ", "linkValidUntilCertif":"This message contains a link to reset your certificate, this link is valid until ", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/tr.json b/lemonldap-ng-portal/site/htdocs/static/languages/tr.json index 17cb08214..c38d14214 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/tr.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/tr.json @@ -178,10 +178,10 @@ "info":"Bilgi", "ipAddr":"IP adresi", "key":"Anahtar", -"lastConnexionLabel":"Last connections", -"lastFailedConnexionLabel":"Last failed connections", "lastFailedLogins":"Son başarısız giriş denemeleri", +"lastFailedLoginsCaptionLabel":"Last failed logins", "lastLogins":"Son girişler", +"lastLoginsCaptionLabel":"Last logins", "lastName":"Soyad", "linkValidUntil":"Bu mesaj parolanızı sıfırlamak için bir bağlantı içerir, bu bağlantı şu zamana kadar geçerlidir", "linkValidUntilCertif":"Bu mesaj sertifikanızı sıfırlamak için bir bağlantı içerir, bu bağlantı şu zamana kadar geçerlidir", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/vi.json b/lemonldap-ng-portal/site/htdocs/static/languages/vi.json index cb1264023..ef7ddf41f 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/vi.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/vi.json @@ -178,10 +178,10 @@ "info":"Thông tin", "ipAddr":"Địa chỉ IP", "key":"Khóa", -"lastConnexionLabel":"Last connections", -"lastFailedConnexionLabel":"Last failed connections", "lastFailedLogins":"Lần cuối đăng nhập thất bại", +"lastFailedLoginsCaptionLabel":"Last failed logins", "lastLogins":"Đăng nhập lần cuối", +"lastLoginsCaptionLabel":"Last logins", "lastName":"Họ", "linkValidUntil":"Thông báo này có chứa liên kết để đặt lại mật khẩu của bạn, liên kết này hợp lệ cho đến khi", "linkValidUntilCertif":"This message contains a link to reset your certificate, this link is valid until ", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/zh.json b/lemonldap-ng-portal/site/htdocs/static/languages/zh.json index 30e68b779..ecc89fdd7 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/zh.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/zh.json @@ -178,10 +178,10 @@ "info":"信息", "ipAddr":"IP 地址", "key":"Key", -"lastConnexionLabel":"Last connections", -"lastFailedConnexionLabel":"Last failed connections", "lastFailedLogins":"上次失败的认证", +"lastFailedLoginsCaptionLabel":"Last failed logins", "lastLogins":"上次登陆", +"lastLoginsCaptionLabel":"Last logins", "lastName":"姓氏", "linkValidUntil":"此消息包含重置您密码的链接，该链接有效期截至", "linkValidUntilCertif":"This message contains a link to reset your certificate, this link is valid until ", diff --git a/lemonldap-ng-portal/site/templates/bootstrap/sessionArray.tpl b/lemonldap-ng-portal/site/templates/bootstrap/sessionArray.tpl index c4c412c9e..d0a708c01 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/sessionArray.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/sessionArray.tpl @@ -3,9 +3,9 @@ - + - + diff --git a/lemonldap-ng-portal/t/63-History.t b/lemonldap-ng-portal/t/63-History.t index 3c696378e..406a48ad0 100644 --- a/lemonldap-ng-portal/t/63-History.t +++ b/lemonldap-ng-portal/t/63-History.t @@ -47,6 +47,9 @@ my @c = ( $res->[2]->[0] =~ /
Last denied connexionsLast failed logins Last connexionsLast logins
127.0.0.1/gs ); ok( @c == 1, " -> One entry found" ); count(2); +ok( $res->[2]->[0] =~ /trspan="lastLoginsCaptionLabel"/, 'History array caption found' ) or explain( $res->[2]->[0] ); +count(1); + ok( $res = $client->_get( '/', cookie => "lemonldap=$id1" ), 'Verify connection' ); count(1);