From a8e5f7dea77d8840c0e500418bff0ec1ffa205ff Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillaume.rousse@renater.fr>
Date: Fri, 26 Oct 2018 14:42:55 +0200
Subject: [PATCH] better branding and name difference explanation
---
conf/manager.conf.in | 2 +
lib/AccountManager/App.pm | 13 +-
lib/AccountManager/L10N/fr.pm | 211 +++++++++---------
.../mail/send_authentication_token.tt2.html | 13 +-
.../mail/send_authentication_token.tt2.txt | 13 +-
templates/web/default | 1 -
.../web/edugain/create_accounts.tt2.html | 8 +-
templates/web/edugain/home.tt2.html | 7 +-
templates/web/edugain/index.tt2.html | 6 +-
.../web/renater/create_accounts.tt2.html | 8 +-
templates/web/renater/home.tt2.html | 9 +-
templates/web/renater/index.tt2.html | 6 +-
12 files changed, 145 insertions(+), 152 deletions(-)
delete mode 120000 templates/web/default
diff --git a/conf/manager.conf.in b/conf/manager.conf.in
index 6516dee..06fb15b 100644
--- a/conf/manager.conf.in
+++ b/conf/manager.conf.in
@@ -1,5 +1,7 @@
[app]
support_email = support@my.fqdn
+name = eduGAIN Access Check
+url =
[setup]
# base templates directory
diff --git a/lib/AccountManager/App.pm b/lib/AccountManager/App.pm
index 0de97d9..9711001 100644
--- a/lib/AccountManager/App.pm
+++ b/lib/AccountManager/App.pm
@@ -466,6 +466,7 @@ sub req_complete_challenge {
url => $self->{configuration}->{app}->{url},
support_email => $self->{configuration}->{app}->{support_email},
version => $self->{configuration}->{app}->{version},
+ name => $self->{configuration}->{app}->{name},
},
sourceip => $ENV{REMOTE_ADDR},
to => $email,
@@ -491,9 +492,17 @@ sub req_complete_challenge {
my $message = Email::MIME->create(
header_str => [
- 'From' => sprintf('eduGAIN Access Check <%s>', $self->{configuration}->{mailer}->{from}),
+ 'From' => sprintf(
+ '%s <%s>',
+ $self->{configuration}->{app}->{name},
+ $self->{configuration}->{mailer}->{from}
+ ),
'To' => $email,
- 'Subject' => sprintf('[eduGAIN Access Check] %s', $self->{lh}->maketext("Test accounts request")),
+ 'Subject' => sprintf(
+ '[%s] %s',
+ $self->{configuration}->{app}->{name},
+ $self->{lh}->maketext("Test accounts request")
+ ),
'Content-Type' => 'multipart/alternative'
],
parts => [
diff --git a/lib/AccountManager/L10N/fr.pm b/lib/AccountManager/L10N/fr.pm
index c64a66e..2dfedd1 100644
--- a/lib/AccountManager/L10N/fr.pm
+++ b/lib/AccountManager/L10N/fr.pm
@@ -17,314 +17,313 @@ __DATA__
msgid "_AUTO"
msgstr "1"
-#: templates/renater/web/create_accounts.tt2.html:74 templates/web/create_accounts.tt2.html:74
+#: templates/web/edugain/create_accounts.tt2.html:74 templates/web/renater/create_accounts.tt2.html:78
msgid "(1) eduPersonAffiliation and eduPersonScoppedAffilisation attributes are assigned quite differently from federation to federation."
msgstr "(1) les attributs eduPersonAffiliation et eduPersonScoppedAffilisation sont valorisés différement d'une fédération à une autre."
#. ("http://tnc2010.terena.org/files/ePSA%20comparison%20v0%2006.ppt")
-#: templates/renater/web/create_accounts.tt2.html:75 templates/web/create_accounts.tt2.html:75
+#: templates/web/edugain/create_accounts.tt2.html:75 templates/web/renater/create_accounts.tt2.html:79
msgid "<a href=\"%1\">This usage comparison of eduPersonAffiliation accross different countries</a> discusses these differences."
msgstr "<a href=\"%1\">Cette comparaison des usages de l'attribut eduPersonAffiliation dans plusieurs pays</a> discute de ces différences."
#. (entityid)
-#: templates/renater/web/create_accounts.tt2.html:4 templates/web/create_accounts.tt2.html:4
+#: templates/web/edugain/create_accounts.tt2.html:4 templates/web/renater/create_accounts.tt2.html:5
msgid "<strong>Success:</strong> your identity as administrator of the Service Provider with entityID <strong>%1</strong> has been validated!"
msgstr "<strong>Succès:</strong> votre identité comme administrateur du service <strong>%1</strong> a été validée!"
-#: templates/renater/web/index.tt2.html:130
+#: templates/web/renater/index.tt2.html:129
msgid "About"
msgstr "À propos"
#. (account.profile()
-#: templates/renater/web/create_accounts.tt2.html:21 templates/web/create_accounts.tt2.html:21
+#: templates/web/edugain/create_accounts.tt2.html:21 templates/web/renater/create_accounts.tt2.html:23
msgid "Account profile: %1"
msgstr "Profil d'utilisateur: %1"
-#: templates/renater/web/create_accounts.tt2.html:51 templates/web/create_accounts.tt2.html:51
-msgid "After a successfull authentication process these attributes are transmited via the SAML protocol from eduGAIN Access Check Identity Provider to your Service Provider."
-msgstr "Ces attributs sont transmis via le protocole SAML, après une authentification réussie, du fournisseur d'identité eduGAIN Access Check à votre service."
+#: templates/web/edugain/create_accounts.tt2.html:51 templates/web/renater/create_accounts.tt2.html:53
+msgid "After a successfull authentication process these attributes are transmitted via the SAML protocol to your service provider."
+msgstr "Ces attributs sont transmis via le protocole SAML, après une authentification réussie, à votre fournisseur de service."
-#: templates/renater/web/index.tt2.html:126
+#: templates/web/renater/index.tt2.html:126
msgid "All rights reserved"
-msgstr ""
+msgstr "Tous droits réservés"
#. (email)
-#: templates/renater/web/complete_challenge.tt2.html:15 templates/web/complete_challenge.tt2.html:15
+#: templates/web/edugain/complete_challenge.tt2.html:15 templates/web/renater/complete_challenge.tt2.html:15
msgid "An email challenge including a validation token has been emailed to you at %1."
msgstr "Un message incluant un code de validation vous a été envoyé à %1."
-#: templates/web/index.tt2.html:81
+#: templates/web/edugain/index.tt2.html:104 templates/web/renater/index.tt2.html:142
msgid "As part of the GÉANT 2020 Framework Partnership Agreement (FPA), this project receives funding from the European Union’s Horizon 2020 research and innovation programme under Grant Agreement No. 731122 (GN4-2)."
msgstr "En tant que membre de l'accord GÉANT 2020 Framework Partnership Agreement (FPA), ce projet bénéficie d'un financement du programme de recherche de l'Union Européenne Horizon 2020 sous l'agrément No. 731122 (GN4-2)."
#. (sp.displayname)
-#: templates/renater/web/select_email.tt2.html:14 templates/web/select_email.tt2.html:14
+#: templates/web/edugain/select_email.tt2.html:14 templates/web/renater/select_email.tt2.html:14
msgid "Before you can create test accounts at this Identity Provider, we need to ensure you are a legitimate administrator of '%1'."
msgstr "Avant de pouvoir créer des comptes de test sur ce fournisseur d'identité, nous devons nous assurer que vous êtes un administateur légitime de '%1'."
-#: templates/renater/web/create_accounts.tt2.html:50 templates/web/create_accounts.tt2.html:50
+#: templates/web/edugain/create_accounts.tt2.html:50 templates/web/renater/create_accounts.tt2.html:52
msgid "Below is the list of user attributes associated to this test account."
msgstr "Voici la liste des attributs utilisateur associés à ce compte de test."
-#: templates/mail/send_authentication_token.tt2.eml:18
-msgid "Best Regards"
-msgstr "Cordialement"
-
#. (challenge_url)
-#: templates/mail/send_authentication_token.tt2.txt:6 templates/renater/mail/send_authentication_token.tt2.txt:6
+#: templates/mail/send_authentication_token.tt2.txt:6
msgid "Challenge URL: %1"
msgstr "URL du challenge: %1"
-#: templates/renater/web/complete_challenge.tt2.html:13 templates/renater/web/complete_challenge.tt2.html:8 templates/renater/web/select_email.tt2.html:8 templates/renater/web/select_federation.tt2.html:8 templates/renater/web/select_sp.tt2.html:8 templates/web/complete_challenge.tt2.html:13 templates/web/complete_challenge.tt2.html:8 templates/web/select_email.tt2.html:8 templates/web/select_federation.tt2.html:8 templates/web/select_sp.tt2.html:8
+#: templates/web/edugain/complete_challenge.tt2.html:13 templates/web/edugain/complete_challenge.tt2.html:8 templates/web/edugain/select_email.tt2.html:8 templates/web/edugain/select_federation.tt2.html:8 templates/web/edugain/select_sp.tt2.html:8 templates/web/renater/complete_challenge.tt2.html:13 templates/web/renater/complete_challenge.tt2.html:8 templates/web/renater/select_email.tt2.html:8 templates/web/renater/select_federation.tt2.html:8 templates/web/renater/select_sp.tt2.html:8
msgid "Complete email challenge"
msgstr "Validez le challenge e-mail"
-#: templates/renater/web/create_accounts.tt2.html:14 templates/web/create_accounts.tt2.html:14
+#: templates/web/edugain/create_accounts.tt2.html:14 templates/web/renater/create_accounts.tt2.html:16
msgid "Download in CSV format"
msgstr "Télécharger au format CSV"
-#: templates/renater/web/errors.tt2.html:6 templates/web/errors.tt2.html:6
+#: templates/web/edugain/errors.tt2.html:6 templates/web/renater/errors.tt2.html:6
msgid "Error:"
msgstr "Erreur:"
-#: templates/renater/web/home.tt2.html:12 templates/web/home.tt2.html:12
+#: templates/web/edugain/home.tt2.html:7 templates/web/renater/home.tt2.html:7
msgid "Functionning"
msgstr "Fonctionnement"
-#: templates/renater/web/home.tt2.html:15 templates/renater/web/home.tt2.html:17 templates/web/home.tt2.html:15 templates/web/home.tt2.html:17
+#: templates/web/edugain/home.tt2.html:10 templates/web/edugain/home.tt2.html:12 templates/web/renater/home.tt2.html:10 templates/web/renater/home.tt2.html:12
msgid "Get started"
msgstr "Commencer"
#. (app.support_email)
-#: templates/mail/send_authentication_token.tt2.eml:16
-msgid "If the creation of test accounts was not initiated by you or a fellow administrator for the above Service Provider, please forward this email and contact %1 to inform them about a potential abuse of the eduGAIN Access Check service."
-msgstr "Si la création de comptes de test n'a pas été demandée par vous ou un autre administrateur du service mentionné plus haut, merci de transmettre ce message à %1 afin d'informer d'une utilisation inappropriée de l'application eduGAIN Access Check."
+#: templates/mail/send_authentication_token.tt2.html:9 templates/mail/send_authentication_token.tt2.txt:9
+msgid "If the creation of test accounts was not initiated by you or a fellow administrator for the above Service Provider, please forward this email and contact %1 to inform them about a potential abuse of the service."
+msgstr "Si la création de comptes de test n'a pas été demandée par vous ou un autre administrateur du service mentionné plus haut, merci de transmettre ce message à %1 afin d'informer d'une utilisation inappropriée du service."
#. (app.support_email)
-#: templates/renater/web/create_accounts.tt2.html:72 templates/web/create_accounts.tt2.html:72
+#: templates/web/edugain/create_accounts.tt2.html:72 templates/web/renater/create_accounts.tt2.html:75
msgid "If you need a customized test account with additional user attributes, you should contact <a href=\"mailto:%1\">%1</a>."
msgstr "Si vous avez besoin d'un compte de test avec des attributs utilisateurs supplémentaires, vous devriez contacter <a href=\"mailto:%1\">%1</a>."
-#
-#: templates/renater/web/index.tt2.html:59 templates/renater/web/index.tt2.html:60 templates/renater/web/index.tt2.html:61
+
+#: templates/web/renater/index.tt2.html:59 templates/web/renater/index.tt2.html:60 templates/web/renater/index.tt2.html:61
msgid "Language"
msgstr "Language"
-#: templates/renater/web/index.tt2.html:128
+#: templates/web/renater/index.tt2.html:128
msgid "Legal mentions"
msgstr "Mentions légales"
-#: templates/renater/web/create_accounts.tt2.html:48 templates/renater/web/create_accounts.tt2.html:55 templates/web/create_accounts.tt2.html:48 templates/web/create_accounts.tt2.html:55
+#: templates/web/edugain/create_accounts.tt2.html:48 templates/web/edugain/create_accounts.tt2.html:55 templates/web/renater/create_accounts.tt2.html:50 templates/web/renater/create_accounts.tt2.html:57
msgid "List of user attributes"
msgstr "Liste des attributs utilisateur"
-#: templates/renater/web/home.tt2.html:10 templates/web/home.tt2.html:10
+#: templates/web/edugain/home.tt2.html:5 templates/web/renater/home.tt2.html:5
msgid "More information"
msgstr "Plus d'information"
-#: templates/renater/web/complete_challenge.tt2.html:30 templates/renater/web/select_email.tt2.html:39 templates/renater/web/select_federation.tt2.html:28 templates/renater/web/select_sp.tt2.html:35 templates/web/complete_challenge.tt2.html:30 templates/web/select_email.tt2.html:39 templates/web/select_federation.tt2.html:28 templates/web/select_sp.tt2.html:35
+#: templates/web/edugain/complete_challenge.tt2.html:30 templates/web/edugain/select_email.tt2.html:39 templates/web/edugain/select_federation.tt2.html:28 templates/web/edugain/select_sp.tt2.html:35 templates/web/renater/complete_challenge.tt2.html:30 templates/web/renater/select_email.tt2.html:39 templates/web/renater/select_federation.tt2.html:28 templates/web/renater/select_sp.tt2.html:35
msgid "Next"
msgstr "Suivant"
-#: templates/renater/web/select_email.tt2.html:31 templates/web/select_email.tt2.html:31
+#: templates/web/edugain/select_email.tt2.html:31 templates/web/renater/select_email.tt2.html:31
msgid "No ContactPerson element could be found in your service metadata, therefore we are unable to provide test accounts for this service."
msgstr "Aucun élément ContactPerson n'a pu être trouvées das les métadonnées de votre fournisseur de service, c'est pourquoi nous sommes incapable de fournir des comptes de test pour ce service."
-#. (accounts_validity_period, entityid)
-#: templates/renater/web/create_accounts.tt2.html:84 templates/web/create_accounts.tt2.html:84
-msgid "Note that these test accounts will automatically expire in %1 days and that they can only be used to test federated login to your eduGAIN-enabled Service Provider with entityID <strong>%2</strong>."
-msgstr "Veuillez noter que ces comptes de test expirent automatiquement dans %1 jours, et qu'ils ne peuvent être utilisés que pour tester l'authentification fédérée sur le service <strong>%2</strong>."
+#. (days, entityid)
+#: templates/web/edugain/create_accounts.tt2.html:84 templates/web/renater/create_accounts.tt2.html:88
+msgid "Note that these test accounts will automatically expire in %1 days and that they can only be used to test federated login to your service provider <strong>%2</strong>."
+msgstr "Veuillez noter que ces comptes de test expirent automatiquement dans %1 jours, et qu'ils ne peuvent être utilisés que pour tester l'authentification fédérée sur le fournisseur de service <strong>%2</strong>."
-#: templates/renater/web/home.tt2.html:3 templates/web/home.tt2.html:3
+#: templates/web/edugain/home.tt2.html:3 templates/web/renater/home.tt2.html:3
msgid "Objective"
msgstr "Objectif"
-#: templates/renater/web/select_email.tt2.html:32 templates/web/select_email.tt2.html:32
+#: templates/web/edugain/select_email.tt2.html:32 templates/web/renater/select_email.tt2.html:32
msgid "Please contact your federation administrators to add needed information to the metadata."
msgstr "Veuillez contacter les administrateurs de votre fédération pour ajouter les informations nécessaires aux métadonnées."
-#: templates/renater/web/complete_challenge.tt2.html:16 templates/web/complete_challenge.tt2.html:16
+#: templates/web/edugain/complete_challenge.tt2.html:16 templates/web/renater/complete_challenge.tt2.html:16
msgid "Please copy and paste the validation token in the form below to proof that you are administrator of this service."
msgstr "Veuillez recopier ce code dans le formulaire ci-dessous pour prouver que vous êtes l'administatreur de ce service."
-#: templates/renater/web/complete_challenge.tt2.html:19 templates/web/complete_challenge.tt2.html:19
+#: templates/web/edugain/complete_challenge.tt2.html:19 templates/web/renater/complete_challenge.tt2.html:19
msgid "Please provide the validation token here:"
msgstr "Veuillez fournir le code de validation:"
-#: templates/renater/web/select_sp.tt2.html:15 templates/web/select_sp.tt2.html:15
+#: templates/web/edugain/select_sp.tt2.html:15 templates/web/renater/select_sp.tt2.html:15
msgid "Please select the service that you want to test in the list below."
msgstr "Veuillez sélectionner le service que vous désirez tester dans la liste ci-dessous."
-#: templates/renater/web/complete_challenge.tt2.html:29 templates/renater/web/select_email.tt2.html:38 templates/renater/web/select_federation.tt2.html:27 templates/renater/web/select_sp.tt2.html:34 templates/web/complete_challenge.tt2.html:29 templates/web/select_email.tt2.html:38 templates/web/select_federation.tt2.html:27 templates/web/select_sp.tt2.html:34
+#: templates/web/edugain/complete_challenge.tt2.html:29 templates/web/edugain/select_email.tt2.html:38 templates/web/edugain/select_federation.tt2.html:27 templates/web/edugain/select_sp.tt2.html:34 templates/web/renater/complete_challenge.tt2.html:29 templates/web/renater/select_email.tt2.html:38 templates/web/renater/select_federation.tt2.html:27 templates/web/renater/select_sp.tt2.html:34
msgid "Previous"
msgstr "Précédent"
-#: templates/renater/web/complete_challenge.tt2.html:5 templates/renater/web/select_email.tt2.html:5 templates/renater/web/select_federation.tt2.html:13 templates/renater/web/select_federation.tt2.html:5 templates/renater/web/select_sp.tt2.html:5 templates/web/complete_challenge.tt2.html:5 templates/web/select_email.tt2.html:5 templates/web/select_federation.tt2.html:13 templates/web/select_federation.tt2.html:5 templates/web/select_sp.tt2.html:5
+#: templates/web/renater/home.tt2.html:4
+msgid "RENATER Access Check is a service based on eduGAIN Access Check software, allowing administrators of service providers registered in Education-Research Federation to safely test their service behavior."
+msgstr "RENATER Access Check est un service basé sur le logiciel eduGAIN Access Check, permettant aux administrateurs de fournisseurs de service enregistrés dans la Fédération Éducation-Recherche de tester de façon sécurisée le fonctionnement de leur service."
+
+#: templates/web/edugain/complete_challenge.tt2.html:5 templates/web/edugain/select_email.tt2.html:5 templates/web/edugain/select_federation.tt2.html:13 templates/web/edugain/select_federation.tt2.html:5 templates/web/edugain/select_sp.tt2.html:5 templates/web/renater/complete_challenge.tt2.html:5 templates/web/renater/select_email.tt2.html:5 templates/web/renater/select_federation.tt2.html:13 templates/web/renater/select_federation.tt2.html:5 templates/web/renater/select_sp.tt2.html:5
msgid "Select a federation"
msgstr "Sélectionnez une fédération"
-#: templates/renater/web/select_email.tt2.html:18 templates/web/select_email.tt2.html:18
+#: templates/web/edugain/select_email.tt2.html:18 templates/web/renater/select_email.tt2.html:18
msgid "Select the email address where an email challenge can be sent to validate your identity:"
msgstr "Sélectionner l'adresse e-mail où envoyer un message pour valider votre identité:"
-#: templates/renater/web/select_federation.tt2.html:16 templates/web/select_federation.tt2.html:16
+#: templates/web/edugain/select_federation.tt2.html:16 templates/web/renater/select_federation.tt2.html:16
msgid "Select the federation corresponding to the service you want to test:"
msgstr "Sélectionner la fédération correspondant au service à tester:"
-#: templates/renater/web/complete_challenge.tt2.html:7 templates/renater/web/select_email.tt2.html:13 templates/renater/web/select_email.tt2.html:7 templates/renater/web/select_federation.tt2.html:7 templates/renater/web/select_sp.tt2.html:7 templates/web/complete_challenge.tt2.html:7 templates/web/select_email.tt2.html:13 templates/web/select_email.tt2.html:7 templates/web/select_federation.tt2.html:7 templates/web/select_sp.tt2.html:7
+#: templates/web/edugain/complete_challenge.tt2.html:7 templates/web/edugain/select_email.tt2.html:13 templates/web/edugain/select_email.tt2.html:7 templates/web/edugain/select_federation.tt2.html:7 templates/web/edugain/select_sp.tt2.html:7 templates/web/renater/complete_challenge.tt2.html:7 templates/web/renater/select_email.tt2.html:13 templates/web/renater/select_email.tt2.html:7 templates/web/renater/select_federation.tt2.html:7 templates/web/renater/select_sp.tt2.html:7
msgid "Select your email address"
msgstr "Sélectionnez votre adresse e-mail"
-#: templates/renater/web/complete_challenge.tt2.html:6 templates/renater/web/select_email.tt2.html:6 templates/renater/web/select_federation.tt2.html:6 templates/renater/web/select_sp.tt2.html:13 templates/renater/web/select_sp.tt2.html:6 templates/web/complete_challenge.tt2.html:6 templates/web/select_email.tt2.html:6 templates/web/select_federation.tt2.html:6 templates/web/select_sp.tt2.html:13 templates/web/select_sp.tt2.html:6
+#: templates/web/edugain/complete_challenge.tt2.html:6 templates/web/edugain/select_email.tt2.html:6 templates/web/edugain/select_federation.tt2.html:6 templates/web/edugain/select_sp.tt2.html:13 templates/web/edugain/select_sp.tt2.html:6 templates/web/renater/complete_challenge.tt2.html:6 templates/web/renater/select_email.tt2.html:6 templates/web/renater/select_federation.tt2.html:6 templates/web/renater/select_sp.tt2.html:13 templates/web/renater/select_sp.tt2.html:6
msgid "Select your service"
msgstr "Sélectionnez votre service"
#. (sourceip, entityid)
-#: templates/mail/send_authentication_token.tt2.eml:7
-msgid "Somebody with IP address %1 has requested to create test accounts for eduGAIN Service Provider with entityID %2."
+#: templates/mail/send_authentication_token.tt2.html:3 templates/mail/send_authentication_token.tt2.txt:2
+msgid "Somebody with IP address %1 has requested to create test accounts for Service Provider with entityID %2."
msgstr "Quelqu'un avec l'adresse IP %1 a demandé la création de comptes de test pour le service %2."
-#: templates/renater/web/create_accounts.tt2.html:8 templates/web/create_accounts.tt2.html:8
+#: templates/web/edugain/create_accounts.tt2.html:8 templates/web/renater/create_accounts.tt2.html:10
msgid "Test accounts created"
msgstr "Comptes de test créés"
-#: templates/mail/send_authentication_token.tt2.eml:3
+#: lib/AccountManager/App.pm:504
msgid "Test accounts request"
msgstr "Demande de comptes de test"
-#: templates/renater/web/create_accounts.tt2.html:94 templates/web/create_accounts.tt2.html:94
+#: templates/web/edugain/create_accounts.tt2.html:94 templates/web/renater/create_accounts.tt2.html:98
msgid "Test another service"
msgstr "Tester un autre service"
-#: templates/renater/web/create_accounts.tt2.html:90 templates/web/create_accounts.tt2.html:90
-msgid "Thank you for using eduGAIN Access Check"
-msgstr "Merci d'avoir utilisé eduGain Access Check"
+#. (app.name)
+#: templates/web/edugain/create_accounts.tt2.html:90 templates/web/renater/create_accounts.tt2.html:94
+msgid "Thank you for using %1"
+msgstr "Merci d'avoir utilisé %1"
#. (to)
-#: templates/mail/send_authentication_token.tt2.eml:8
-msgid "The address %1 is mentioned in the eduGAIN metadata as a contact for this Service Provider."
-msgstr "L'addresse %1 est mentionnée dans les métadonnées de la fédération eduGAIN comme contact pour ce service."
-
-#: templates/renater/web/home.tt2.html:8 templates/web/home.tt2.html:8
-msgid "The test accounts can only be used to access own services."
-msgstr "Ces comptes de test ne peuvent être utilisés qu'avec ce service."
+#: templates/mail/send_authentication_token.tt2.html:4 templates/mail/send_authentication_token.tt2.txt:3
+msgid "The address %1 is mentioned in the federation metadata as a contact for this Service Provider."
+msgstr "L'addresse %1 est mentionnée dans les métadonnées de la fédération comme contact pour ce service."
-#: templates/renater/web/create_accounts.tt2.html:76 templates/web/create_accounts.tt2.html:76
+#: templates/web/edugain/create_accounts.tt2.html:76 templates/web/renater/create_accounts.tt2.html:80
msgid "Therefore its values should be handled with great care."
msgstr "C'est pourquoi ces valeurs doivent être traitées avec prudence."
-#: templates/renater/web/complete_challenge.tt2.html:36 templates/renater/web/select_email.tt2.html:45 templates/renater/web/select_federation.tt2.html:34 templates/renater/web/select_sp.tt2.html:173 templates/web/complete_challenge.tt2.html:36 templates/web/select_email.tt2.html:45 templates/web/select_federation.tt2.html:34 templates/web/select_sp.tt2.html:173
+#: templates/web/edugain/complete_challenge.tt2.html:36 templates/web/edugain/select_email.tt2.html:45 templates/web/edugain/select_federation.tt2.html:34 templates/web/edugain/select_sp.tt2.html:173 templates/web/renater/complete_challenge.tt2.html:36 templates/web/renater/select_email.tt2.html:45 templates/web/renater/select_federation.tt2.html:34 templates/web/renater/select_sp.tt2.html:173
msgid "This information is required"
msgstr "Cette information est nécessaire"
-#: templates/mail/send_authentication_token.tt2.eml:6
-msgid "This is an email challenge automatically sent to you by eduGAIN Access Check."
-msgstr "Ceci est un message envoyé automatiquement par eduGAIN Access Check."
+#. (app.name)
+#: templates/mail/send_authentication_token.tt2.html:2 templates/mail/send_authentication_token.tt2.txt:1
+msgid "This is an email challenge automatically sent to you by %1."
+msgstr "Ceci est un message envoyé automatiquement par %1."
-#: templates/renater/web/select_email.tt2.html:28 templates/web/select_email.tt2.html:28
+#: templates/web/edugain/select_email.tt2.html:28 templates/web/renater/select_email.tt2.html:28
msgid "Those email addresses have been extracted from your service metadata."
msgstr "Ces addresses e-mail ont été extraites des métadonnées pour votre service."
-#: templates/renater/web/select_sp.tt2.html:30 templates/web/select_sp.tt2.html:30
+#: templates/web/edugain/select_sp.tt2.html:30 templates/web/renater/select_sp.tt2.html:30
msgid "Those service providers have been extracted from the selected federation metadata."
msgstr "Ces fournisseurs de service ont été extrait des métadonnées de la fédération sélectionnée."
-#. (challenge_url, token)
-#: templates/mail/send_authentication_token.tt2.html:7 templates/renater/mail/send_authentication_token.tt2.html:7
-msgid "To complete the creation of test accounts, paste the following validation token in <a href=\"%1\">eduGAIN Access Check</a>: %2"
-msgstr "Pour terminer la création de ces comptes de test, recopiez le code de validation suivant dans <a href=\"%1\">eduGAIN Access Check</a>: %2"
+#. (app.name)
+#: templates/mail/send_authentication_token.tt2.txt:5
+msgid "To complete the creation of test accounts, paste the following validation token in %1:"
+msgstr "Pour terminer la création de ces comptes de test, recopiez le code de validation suivant dans %1:"
-#: templates/mail/send_authentication_token.tt2.txt:5 templates/renater/mail/send_authentication_token.tt2.txt:5
-msgid "To complete the creation of test accounts, paste the following validation token in eduGAIN Access Check:"
-msgstr "Pour terminer la création de ces comptes de test, recopiez le code de validation suivant dans eduGAIN Access Check:"
+#. (challenge_url, app.name, token)
+#: templates/mail/send_authentication_token.tt2.html:7
+msgid "To complete the creation of test accounts, paste the following validation token in <a href=\"%1\">%2</a>: %3"
+msgstr "Pour terminer la création de ces comptes de test, recopiez le code de validation suivant dans <a href=\"%1\">%2</a>: %3"
#. (idp_displayname)
-#: templates/renater/web/create_accounts.tt2.html:11 templates/web/create_accounts.tt2.html:11
+#: templates/web/edugain/create_accounts.tt2.html:11 templates/web/renater/create_accounts.tt2.html:13
msgid "To do so, select <strong>%1</strong> when choosing an identity provider."
msgstr "Pour ce faire, sélectionnez <strong>%1</strong> lors du choix du founisseur d'identité à utiliser."
-#: templates/renater/web/home.tt2.html:16 templates/web/home.tt2.html:16
+#: templates/web/edugain/home.tt2.html:11 templates/web/renater/home.tt2.html:11
msgid "To start testing your own services, start by selecting one your are administrator for."
msgstr "Pour commencer à tester vos propres services, commencez par en sélectionner un dont vous êtes l'administrateur."
-#: templates/renater/web/select_sp.tt2.html:20 templates/web/select_sp.tt2.html:20
+#: templates/web/edugain/select_sp.tt2.html:20 templates/web/renater/select_sp.tt2.html:20
msgid "Type the name or entityID of service to test:"
msgstr "Entrez le nom ou l'identifiant (entityID) du service à tester:"
-#: templates/renater/web/index.tt2.html:132
+#: templates/web/renater/index.tt2.html:132
msgid "Users feedback"
msgstr "Retour utilisateurs"
#. (token)
-#: templates/mail/send_authentication_token.tt2.txt:7 templates/renater/mail/send_authentication_token.tt2.txt:7
+#: templates/mail/send_authentication_token.tt2.txt:7
msgid "Validation token: %1"
msgstr "Code de validation: %1"
-#: templates/renater/web/create_accounts.tt2.html:10 templates/web/create_accounts.tt2.html:10
-msgid "You can now use these test accounts to login at your federated service."
-msgstr "Vous pouvez maintenant utiliser ces comptes pour vous identifier sur votre service fédéré."
+#: templates/web/edugain/create_accounts.tt2.html:10 templates/web/renater/create_accounts.tt2.html:12
+msgid "You can now use these test accounts to login at your service provider."
+msgstr "Vous pouvez maintenant utiliser ces comptes pour vous identifier sur votre fournisseur de service."
-#: templates/renater/web/errors.tt2.html:38 templates/web/errors.tt2.html:38
+#: templates/web/edugain/errors.tt2.html:38 templates/web/renater/errors.tt2.html:37
msgid "You can report the issue to the administrators"
msgstr "Vous pouvez informer les administrateurs du problème"
-#: templates/renater/web/select_sp.tt2.html:16 templates/web/select_sp.tt2.html:16
+#: templates/web/edugain/select_sp.tt2.html:16 templates/web/renater/select_sp.tt2.html:16
msgid "You must be an administrator of that service to continue afterwards."
msgstr "Vous devez être administrateur de ce service pour continuer ensuite."
-#: templates/renater/web/create_accounts.tt2.html:32 templates/web/create_accounts.tt2.html:32
+#: templates/web/edugain/create_accounts.tt2.html:32 templates/web/renater/create_accounts.tt2.html:34
msgid "comment:"
msgstr "commentaire:"
-#: templates/renater/web/index.tt2.html:139
+#: templates/web/edugain/index.tt2.html:91 templates/web/renater/index.tt2.html:139
msgid "contact us"
-msgstr ""
+msgstr "contactez-nous"
-#: templates/renater/web/home.tt2.html:6 templates/web/home.tt2.html:6
-msgid "eduGAIN Access Check allows administrators of a Service Provider (SP) registered in an identity federation to create test accounts with different profiles to validate the behaviour and test federated login."
-msgstr "eduGAIN Access Check permet aux administrateurs d'un fournisseur de service (Service Provider) enregistré dans une fédération d'identité de créer des comptes de test avec différents profils, afin de tester l'authentification fédérée et de valider le comportement du service."
+#: templates/web/edugain/home.tt2.html:4
+msgid "eduGAIN Access Check is a service based on the same named software, allowing administrators of service providers registered in eduGAIN interfederation to safely test their service behavior."
+msgstr "eduGAIN Access Check est un service basé sur le logiciel du même nom, permettant aux administrateurs des fournisseurs de service enregistrés dans l'interfederation eduGAIN de tester de façon sécurisée le comportement de leur service."
-#: templates/renater/web/errors.tt2.html:12 templates/web/errors.tt2.html:12
+#: templates/web/edugain/errors.tt2.html:12 templates/web/renater/errors.tt2.html:12
msgid "internal error"
msgstr "erreur interne"
-#: templates/renater/web/errors.tt2.html:15 templates/web/errors.tt2.html:15
+#: templates/web/edugain/errors.tt2.html:15 templates/web/renater/errors.tt2.html:15
msgid "mail notification failure"
msgstr "échec de notification par mail"
#. (matches.0)
-#: templates/renater/web/errors.tt2.html:28 templates/web/errors.tt2.html:28
+#: templates/web/edugain/errors.tt2.html:28 templates/web/renater/errors.tt2.html:28
msgid "missing parameter '%1'"
msgstr "paramètre manquant '%1'"
-#: templates/renater/web/create_accounts.tt2.html:27 templates/web/create_accounts.tt2.html:27
+#: templates/web/edugain/create_accounts.tt2.html:27 templates/web/renater/create_accounts.tt2.html:29
msgid "password:"
msgstr "mot de passe:"
-#: templates/renater/web/create_accounts.tt2.html:38 templates/web/create_accounts.tt2.html:38
+#: templates/web/edugain/create_accounts.tt2.html:38 templates/web/renater/create_accounts.tt2.html:40
msgid "show details"
msgstr "montrer les détails"
-#: templates/renater/web/errors.tt2.html:18 templates/web/errors.tt2.html:18
+#: templates/web/edugain/errors.tt2.html:18 templates/web/renater/errors.tt2.html:18
msgid "test accounts creation failure"
msgstr "échec de création des comptes"
#. (entityid)
-#: templates/renater/web/errors.tt2.html:24 templates/web/errors.tt2.html:24
+#: templates/web/edugain/errors.tt2.html:24 templates/web/renater/errors.tt2.html:24
msgid "the validation token you provided cannot be used for this service provider (%1)"
msgstr "le code de validation fourni n'est pas utilisable pour ce fournisseur de service (%1)"
-#: templates/renater/web/errors.tt2.html:21 templates/web/errors.tt2.html:21
+#: templates/web/edugain/errors.tt2.html:21 templates/web/renater/errors.tt2.html:21
msgid "the validation token you provided is incorrect or it has already been used"
msgstr "le code de validation fourni est incorrect, ou a déjà été utilisé"
-#: templates/renater/web/errors.tt2.html:9 templates/web/errors.tt2.html:9
+#: templates/web/edugain/errors.tt2.html:9 templates/web/renater/errors.tt2.html:9
msgid "unknown action"
msgstr "action inconnue"
-#: templates/renater/web/create_accounts.tt2.html:23 templates/web/create_accounts.tt2.html:23
+#: templates/web/edugain/create_accounts.tt2.html:23 templates/web/renater/create_accounts.tt2.html:25
msgid "user name:"
msgstr "nom d'utilisateur:"
-#: templates/renater/web/create_accounts.tt2.html:67 templates/web/create_accounts.tt2.html:67
+#: templates/web/edugain/create_accounts.tt2.html:67 templates/web/renater/create_accounts.tt2.html:69
msgid "value dynamically generated by the SP"
msgstr "valeur générée dynamiquement par le SP"
diff --git a/templates/mail/send_authentication_token.tt2.html b/templates/mail/send_authentication_token.tt2.html
index 42420c7..a9e94e8 100644
--- a/templates/mail/send_authentication_token.tt2.html
+++ b/templates/mail/send_authentication_token.tt2.html
@@ -1,12 +1,9 @@
<p>
- [% lh.maketext("This is an email challenge automatically sent to you by eduGAIN Access Check.") %]
- [% lh.maketext("Somebody with IP address [_1] has requested to create test accounts for eduGAIN Service Provider with entityID [_2].", sourceip, entityid) %]
- [% lh.maketext("The address [_1] is mentioned in the eduGAIN metadata as a contact for this Service Provider.", to) %]
+ [% lh.maketext("This is an email challenge automatically sent to you by [_1].", app.name) %]
+ [% lh.maketext("Somebody with IP address [_1] has requested to create test accounts for Service Provider with entityID [_2].", sourceip, entityid) %]
+ [% lh.maketext("The address [_1] is mentioned in the federation metadata as a contact for this Service Provider.", to) %]
</p>
-<p>[% lh.maketext("To complete the creation of test accounts, paste the following validation token in <a href=\"[_1]\">eduGAIN Access Check</a>: [_2]", challenge_url, token) %]</p>
+<p>[% lh.maketext("To complete the creation of test accounts, paste the following validation token in <a href=\"[_1]\">[_2]</a>: [_3]", challenge_url, app.name, token) %]</p>
-<p>[% lh.maketext("If the creation of test accounts was not initiated by you or a fellow administrator for the above Service Provider, please forward this email and contact [_1] to inform them about a potential abuse of the eduGAIN Access Check service.", app.support_email) %]</p>
-
-<p>[% lh.maketext("Best Regards") %]</p>
-<p>eduGAIN Access Check Bot</p>
+<p>[% lh.maketext("If the creation of test accounts was not initiated by you or a fellow administrator for the above Service Provider, please forward this email and contact [_1] to inform them about a potential abuse of the service.", app.support_email) %]</p>
diff --git a/templates/mail/send_authentication_token.tt2.txt b/templates/mail/send_authentication_token.tt2.txt
index a1bdf9f..182d138 100644
--- a/templates/mail/send_authentication_token.tt2.txt
+++ b/templates/mail/send_authentication_token.tt2.txt
@@ -1,12 +1,9 @@
-[% lh.maketext("This is an email challenge automatically sent to you by eduGAIN Access Check.") %]
-[% lh.maketext("Somebody with IP address [_1] has requested to create test accounts for eduGAIN Service Provider with entityID [_2].", sourceip, entityid) %]
-[% lh.maketext("The address [_1] is mentioned in the eduGAIN metadata as a contact for this Service Provider.", to) %]
+[% lh.maketext("This is an email challenge automatically sent to you by [_1].", app.name) %]
+[% lh.maketext("Somebody with IP address [_1] has requested to create test accounts for Service Provider with entityID [_2].", sourceip, entityid) %]
+[% lh.maketext("The address [_1] is mentioned in the federation metadata as a contact for this Service Provider.", to) %]
-[% lh.maketext("To complete the creation of test accounts, paste the following validation token in eduGAIN Access Check:") %]
+[% lh.maketext("To complete the creation of test accounts, paste the following validation token in [_1]:", app.name) %]
- [% lh.maketext("Challenge URL: [_1]", challenge_url) %]
- [% lh.maketext("Validation token: [_1]", token) %]
-[% lh.maketext("If the creation of test accounts was not initiated by you or a fellow administrator for the above Service Provider, please forward this email and contact [_1] to inform them about a potential abuse of the eduGAIN Access Check service.", app.support_email) %]
-
-[% lh.maketext("Best Regards") %]
-eduGAIN Access Check Bot
+[% lh.maketext("If the creation of test accounts was not initiated by you or a fellow administrator for the above Service Provider, please forward this email and contact [_1] to inform them about a potential abuse of the service.", app.support_email) %]
diff --git a/templates/web/default b/templates/web/default
deleted file mode 120000
index 829ded7..0000000
--- a/templates/web/default
+++ /dev/null
@@ -1 +0,0 @@
-edugain
\ No newline at end of file
diff --git a/templates/web/edugain/create_accounts.tt2.html b/templates/web/edugain/create_accounts.tt2.html
index d2e296d..dab7975 100644
--- a/templates/web/edugain/create_accounts.tt2.html
+++ b/templates/web/edugain/create_accounts.tt2.html
@@ -7,7 +7,7 @@
<h2>[% lh.maketext("Test accounts created") %]</h2>
<p>
- [% lh.maketext("You can now use these test accounts to login at your federated service.") %]
+ [% lh.maketext("You can now use these test accounts to login at your service provider.") %]
[% lh.maketext("To do so, select <strong>[_1]</strong> when choosing an identity provider.", idp_displayname) %]
</p>
@@ -48,7 +48,7 @@
<h3>[% lh.maketext("List of user attributes") %]</h3>
<p>
[% lh.maketext("Below is the list of user attributes associated to this test account.") %]
- [% lh.maketext("After a successfull authentication process these attributes are transmited via the SAML protocol from eduGAIN Access Check Identity Provider to your Service Provider.") %]
+ [% lh.maketext("After a successfull authentication process these attributes are transmitted via the SAML protocol to your service provider.") %]
</p>
<div>
<table>
@@ -81,13 +81,13 @@
<div class="row">
<div class="callout warning">
- <p>[% lh.maketext("Note that these test accounts will automatically expire in [_1] days and that they can only be used to test federated login to your eduGAIN-enabled Service Provider with entityID <strong>[_2]</strong>.", days, entityid) %]</p>
+ <p>[% lh.maketext("Note that these test accounts will automatically expire in [_1] days and that they can only be used to test federated login to your service provider <strong>[_2]</strong>.", days, entityid) %]</p>
</div>
</div>
<div class="row">
<div class="callout primary">
- <strong>[% lh.maketext("Thank you for using eduGAIN Access Check") %]</strong>
+ <strong>[% lh.maketext("Thank you for using [_1]", app.name) %]</strong>
</div>
</div>
diff --git a/templates/web/edugain/home.tt2.html b/templates/web/edugain/home.tt2.html
index 94fe144..fb0a6c6 100644
--- a/templates/web/edugain/home.tt2.html
+++ b/templates/web/edugain/home.tt2.html
@@ -1,12 +1,7 @@
[% WRAPPER index.tt2.html %]
<h2>[% lh.maketext("Objective") %]</h2>
-<p>
-[%
- lh.maketext("eduGAIN Access Check allows administrators of a Service Provider (SP) registered in an identity federation to create test accounts with different profiles to validate the behaviour and test federated login.")
-%]
-[% lh.maketext("The test accounts can only be used to access own services.") %]
-</p>
+<p>[% lh.maketext("eduGAIN Access Check is a service based on the same named software, allowing administrators of service providers registered in eduGAIN interfederation to safely test their service behavior.") %]</p>
<p><a href="https://wiki.geant.org/display/eduGAIN/eduGAIN+Access+Check">[% lh.maketext("More information") %]</a></p>
<h2>[% lh.maketext("Functionning") %]</h2>
diff --git a/templates/web/edugain/index.tt2.html b/templates/web/edugain/index.tt2.html
index 4ac3e8e..3320d46 100644
--- a/templates/web/edugain/index.tt2.html
+++ b/templates/web/edugain/index.tt2.html
@@ -20,7 +20,7 @@
<script type="text/javascript" src="jquery-ui-1.12.1/jquery-ui.min.js"></script>
<script type="text/javascript" src="jquery-validation-1.17.0.min.js"></script>
- <title>eduGAIN Access Check</title>
+ <title>[% app.name %]</title>
</head>
<body>
@@ -80,7 +80,7 @@
</ul>
</div>
</div>
- <h1 class="row text-center">eduGAIN Access Check</h1>
+ <h1 class="row text-center">[ app.name %]</h1>
</nav>
<main class="row">
@@ -88,7 +88,7 @@
</main>
<footer style="visibility: hidden;">
- <p class="text-center">eduGAIN Access Check [% app.version %] - <a href="mailto:[% app.support_email %]">[% lh.maketext("contact us") %]</a></p>
+ <p class="text-center">[ app.name %] [% app.version %] - <a href="mailto:[% app.support_email %]">[% lh.maketext("contact us") %]</a></p>
<div class="central-section">
<div class="col-1-1">
<img src="images/footer_logo_padded.jpg" style="width: 111px; height:26px;" />
diff --git a/templates/web/renater/create_accounts.tt2.html b/templates/web/renater/create_accounts.tt2.html
index 2e26456..f47d553 100644
--- a/templates/web/renater/create_accounts.tt2.html
+++ b/templates/web/renater/create_accounts.tt2.html
@@ -9,7 +9,7 @@
<h2>[% lh.maketext("Test accounts created") %]</h2>
<p>
- [% lh.maketext("You can now use these test accounts to login at your federated service.") %]
+ [% lh.maketext("You can now use these test accounts to login at your service provider.") %]
[% lh.maketext("To do so, select <strong>[_1]</strong> when choosing an identity provider.", idp_displayname) %]
</p>
@@ -50,7 +50,7 @@
<h3>[% lh.maketext("List of user attributes") %]</h3>
<p>
[% lh.maketext("Below is the list of user attributes associated to this test account.") %]
- [% lh.maketext("After a successfull authentication process these attributes are transmited via the SAML protocol from eduGAIN Access Check Identity Provider to your Service Provider.") %]
+ [% lh.maketext("After a successfull authentication process these attributes are transmitted via the SAML protocol to your service provider.") %]
</p>
<div>
<table>
@@ -85,13 +85,13 @@
<div class="row">
<div class="callout alert-callout-border warning">
- <p>[% lh.maketext("Note that these test accounts will automatically expire in [_1] days and that they can only be used to test federated login to your eduGAIN-enabled Service Provider with entityID <strong>[_2]</strong>.", days, entityid) %]</p>
+ <p>[% lh.maketext("Note that these test accounts will automatically expire in [_1] days and that they can only be used to test federated login to your service provider <strong>[_2]</strong>.", days, entityid) %]</p>
</div>
</div>
<div class="row">
<div class="callout alert-callout-border primary text-center">
- <strong>[% lh.maketext("Thank you for using eduGAIN Access Check") %]</strong>
+ <strong>[% lh.maketext("Thank you for using [_1]", app.name) %]</strong>
</div>
</div>
diff --git a/templates/web/renater/home.tt2.html b/templates/web/renater/home.tt2.html
index 94fe144..14d2690 100644
--- a/templates/web/renater/home.tt2.html
+++ b/templates/web/renater/home.tt2.html
@@ -1,16 +1,11 @@
[% WRAPPER index.tt2.html %]
<h2>[% lh.maketext("Objective") %]</h2>
-<p>
-[%
- lh.maketext("eduGAIN Access Check allows administrators of a Service Provider (SP) registered in an identity federation to create test accounts with different profiles to validate the behaviour and test federated login.")
-%]
-[% lh.maketext("The test accounts can only be used to access own services.") %]
-</p>
+<p>[% lh.maketext("RENATER Access Check is a service based on eduGAIN Access Check software, allowing administrators of service providers registered in Education-Research Federation to safely test their service behavior.") %]</p>
<p><a href="https://wiki.geant.org/display/eduGAIN/eduGAIN+Access+Check">[% lh.maketext("More information") %]</a></p>
<h2>[% lh.maketext("Functionning") %]</h2>
-<img class="float-center" alt="eduGAIN Access Check" src="images/edugain_test_idp_basics.png" height="50%" width="50%"/>
+<img class="float-center" alt="RENATER Access Check" src="images/edugain_test_idp_basics.png" height="50%" width="50%"/>
<h2>[% lh.maketext("Get started") %]</h2>
<p>[% lh.maketext("To start testing your own services, start by selecting one your are administrator for.") %]</p>
diff --git a/templates/web/renater/index.tt2.html b/templates/web/renater/index.tt2.html
index cd5e2eb..9e76b96 100644
--- a/templates/web/renater/index.tt2.html
+++ b/templates/web/renater/index.tt2.html
@@ -23,7 +23,7 @@
<script type="text/javascript" src="foundation/js/vendor/foundation.min.js"></script>
<script type="text/javascript" src="js/startup.js"></script>
- <title>RENATER Access Check</title>
+ <title>[% app.name %]</title>
</head>
<body>
@@ -94,7 +94,7 @@
</nav>
</header>
- <h1 class="row text-center">RENATER Access Check</h1>
+ <h1 class="row text-center">[% app.name %]</h1>
<main class="row">
[% content %]
@@ -136,7 +136,7 @@
</aside>
</footer>
<div class="reveal" id="about_reveal" data-reveal>
- <p class="text-center">eduGAIN Access Check [% app.version %] - <a href="mailto:[% app.support_email %]">[% lh.maketext("contact us") %]</a></p>
+ <p class="text-center">[% app.name %] [% app.version %] - <a href="mailto:[% app.support_email %]">[% lh.maketext("contact us") %]</a></p>
</div>
<div class="reveal" id="legal_reveal" data-reveal>
<p class="text-center">[% lh.maketext("As part of the GÉANT 2020 Framework Partnership Agreement (FPA), this project receives funding from the European Union’s Horizon 2020 research and innovation programme under Grant Agreement No. 731122 (GN4-2)." ) %]</p>
--
GitLab