From 6780ef337729ba8281968667ee42e8635ba6ddda Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillaume.rousse@renater.fr>
Date: Mon, 16 Nov 2020 13:52:34 +0100
Subject: [PATCH] cosmetics
---
CHANGES.md | 4 ++++
lib/AccountManager/L10N/fr.pm | 13 ++-----------
templates/web/edugain/create_accounts.tt2.html | 15 ++++++++-------
templates/web/renater/create_accounts.tt2.html | 17 ++++++++---------
4 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 2664c5e..d2a2d48 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,9 @@
# eduGAIN Access Check Changelog
+## Version 1.3.0 (16/11/2020)
+
+* switch back to template-based profile definitions, for easier customisation
+
## Version 1.2.2 (19/10/2020)
* mitigate metadata synchronisation error: just skip problematic entity,
diff --git a/lib/AccountManager/L10N/fr.pm b/lib/AccountManager/L10N/fr.pm
index e43ddcd..be10ab9 100644
--- a/lib/AccountManager/L10N/fr.pm
+++ b/lib/AccountManager/L10N/fr.pm
@@ -18,13 +18,8 @@ msgid "_AUTO"
msgstr "1"
#: templates/web/edugain/create_accounts.tt2.html:74 templates/web/renater/create_accounts.tt2.html:78
-msgid "(1) eduPersonAffiliation and eduPersonScopedAffilisation attributes are assigned quite differently from federation to federation."
-msgstr "(1) les attributs eduPersonAffiliation et eduPersonScopedAffilisation sont valorisés différement d'une fédération à une autre."
-
-#. ("http://tnc2010.terena.org/files/ePSA%20comparison%20v0%2006.ppt")
-#: 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."
+msgid "eduPersonAffiliation and eduPersonScopedAffilisation attributes are assigned <a href=\"%1\">quite differently from federation to federation</a>, therefore their values should be handled with great care."
+msgstr "Les attributs eduPersonAffiliation et eduPersonScopedAffilisation sont valorisés <a href=\"%1\">différement d'une fédération à une autre</a>, c'est pourquoi leurs valeurs doivent être traitées avec prudence."
#. (entityid)
#: templates/web/edugain/create_accounts.tt2.html:4 templates/web/renater/create_accounts.tt2.html:5
@@ -213,10 +208,6 @@ msgstr "Merci d'avoir utilisé le service %1"
msgid "The address %1 is mentioned in the federation metadata as a contact for this Service Provider."
msgstr "L'adresse %1 est mentionnée dans les métadonnées de la fédération comme contact pour ce service."
-#: 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/web/edugain/complete_challenge.tt2.html:35 templates/web/edugain/select_email.tt2.html:44 templates/web/edugain/select_sp.tt2.html:193 templates/web/renater/complete_challenge.tt2.html:35 templates/web/renater/select_email.tt2.html:44 templates/web/renater/select_sp.tt2.html:193
msgid "This information is required"
msgstr "Cette information est nécessaire"
diff --git a/templates/web/edugain/create_accounts.tt2.html b/templates/web/edugain/create_accounts.tt2.html
index d454d10..2e0c5ed 100644
--- a/templates/web/edugain/create_accounts.tt2.html
+++ b/templates/web/edugain/create_accounts.tt2.html
@@ -7,7 +7,8 @@
<h2>[% lh.maketext("Test accounts created") %]</h2>
<p>
- [% lh.maketext("You can now use these test accounts to access your <a href=\"[_1]\">service provider</a>, using <strong>[_2]</strong> as identity provider.", sp.url, idp.name) %]
+ [% lh.maketext("You can now use these test accounts to access your <a href=\"[_1]\">service provider</a>, using <strong>[_2]</strong> as identity provider.", sp.url, idp.name) %]
+ [% lh.maketext("If you need a customized test account with additional user attributes, you should contact <a href=\"mailto:[_1]\">[_1]</a>.", app.support_email) %]
</p>
<p class="callout warning">
@@ -50,7 +51,7 @@
</button>
<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("Below is the list of user attributes associated to this test account.") %]
[% lh.maketext("After a successfull authentication process these attributes are transmitted via the SAML protocol to your service provider.") %]
</p>
<div>
@@ -67,11 +68,11 @@
</table>
</div>
- <div class="callout primary">[% lh.maketext("If you need a customized test account with additional user attributes, you should contact <a href=\"mailto:[_1]\">[_1]</a>.", app.support_email) %]</div>
- <div>
- [% lh.maketext("(1) eduPersonAffiliation and eduPersonScopedAffilisation attributes are assigned quite differently from federation to federation.") %]
- [% lh.maketext("<a href=\"[_1]\">This usage comparison of eduPersonAffiliation accross different countries</a> discusses these differences.", "http://tnc2010.terena.org/files/ePSA%20comparison%20v0%2006.ppt") %]
- [% lh.maketext("Therefore its values should be handled with great care.") %]
+ <div class="callout warning">
+ [% lh.maketext(
+ "eduPersonAffiliation and eduPersonScopedAffilisation attributes are assigned <a href=\"[_1]\">quite differently from federation to federation<a>, therefore their values should be handled with great care."
+ "http://tnc2010.terena.org/files/ePSA%20comparison%20v0%2006.ppt"
+ ) %]
</div>
</div>
[% END %]
diff --git a/templates/web/renater/create_accounts.tt2.html b/templates/web/renater/create_accounts.tt2.html
index f139c28..f4f31ba 100644
--- a/templates/web/renater/create_accounts.tt2.html
+++ b/templates/web/renater/create_accounts.tt2.html
@@ -9,7 +9,8 @@
<h2>[% lh.maketext("Test accounts created") %]</h2>
<p>
- [% lh.maketext("You can now use these test accounts to access your <a href=\"[_1]\">service provider</a>, using <strong>[_2]</strong> as identity provider.", sp.url, idp.name) %]
+ [% lh.maketext("You can now use these test accounts to access your <a href=\"[_1]\">service provider</a>, using <strong>[_2]</strong> as identity provider.", sp.url, idp.name) %]
+ [% lh.maketext("If you need a customized test account with additional user attributes, you should contact <a href=\"mailto:[_1]\">[_1]</a>.", app.support_email) %]
</p>
<p class="callout alert-callout-border warning">
@@ -52,7 +53,7 @@
</button>
<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("Below is the list of user attributes associated to this test account.") %]
[% lh.maketext("After a successfull authentication process these attributes are transmitted via the SAML protocol to your service provider.") %]
</p>
<div>
@@ -69,13 +70,11 @@
</table>
</div>
- <div class="callout alert-callout-border info">
- <p>[% lh.maketext("If you need a customized test account with additional user attributes, you should contact <a href=\"mailto:[_1]\">[_1]</a>.", app.support_email) %]</p>
- </div>
- <div>
- [% lh.maketext("(1) eduPersonAffiliation and eduPersonScopedAffilisation attributes are assigned quite differently from federation to federation.") %]
- [% lh.maketext("<a href=\"[_1]\">This usage comparison of eduPersonAffiliation accross different countries</a> discusses these differences.", "http://tnc2010.terena.org/files/ePSA%20comparison%20v0%2006.ppt") %]
- [% lh.maketext("Therefore its values should be handled with great care.") %]
+ <div class="callout alert-callout-border warning">
+ [% lh.maketext(
+ "eduPersonAffiliation and eduPersonScopedAffilisation attributes are assigned <a href=\"[_1]\">quite differently from federation to federation</a>, therefore their values should be handled with great care.",
+ "http://tnc2010.terena.org/files/ePSA%20comparison%20v0%2006.ppt")
+ %]
</div>
</div>
[% END %]
--
GitLab