diff --git a/lib/AccountManager/L10N/fr.pm b/lib/AccountManager/L10N/fr.pm
index c72176095848446d6d8171bf02aa77857a0d8655..e43ddcd781ef52dd9884aa4f5a6c9370efeeb797 100644
--- a/lib/AccountManager/L10N/fr.pm
+++ b/lib/AccountManager/L10N/fr.pm
@@ -17,39 +17,6 @@ __DATA__
msgid "_AUTO"
msgstr "1"
-msgid "An ex-student with 'alum' value for eduPersonAffiliation"
-msgstr "Un ancient étudiant avec la valeur 'alum' pour eduPersonAffiliation"
-
-msgid "A person with 'member', 'staff' and 'employee' values for eduPersonAffiliation"
-msgstr "Une personne avec les valeurs 'member', 'staff' et 'employee' pour eduPersonAffiliation"
-
-msgid "A person with all eduGAIN user attributes plus givenName and surname"
-msgstr "Une personne avec tous les attributs eduGAIN plus givenName et surname"
-
-msgid "A person with only an eduPersonTargetedID attribute"
-msgstr "Une personne avec uniquement un attribut eduPersonTargetedID"
-
-msgid "A person with a limited set of attributes (eduPersonPrincipalName, mail and displayName)"
-msgstr "Une personne avec un ensembe d'attributs limités (eduPersonPrincipalName, mail et displayName)"
-
-msgid "A library user on the campus network"
-msgstr "Un utilisateur de la bibliothèque sur le réseau du campus"
-
-msgid "A student with 'member' and 'student' values for eduPersonAffiliation"
-msgstr "Un étudiant avec les valeurs 'member' et 'student' pour eduPersonAffiliation"
-
-msgid "A PhD student with 'member', 'student' and 'faculty' values for eduPersonAffiliation"
-msgstr "Un étudiant en thèse avec les valeurs 'member', 'student' et 'faculty' pour eduPersonAffiliation"
-
-msgid "A teacher with a limited set of attributes (eduPersonScopedAffiliation and eduPersonTargetedID)"
-msgstr "Un enseignant avec un ensemble d'attributs limités (eduPersonScopedAffiliation and eduPersonTargetedID)"
-
-msgid "A teacher with 'member' and 'faculty' values for eduPersonAffiliation"
-msgstr "Un enseignant avec les valeurs 'member' et 'faculty' pour eduPersonAffiliation"
-
-msgid "A researcher, undifferenciable from a teacher as there is no standard value for eduPersonAffiliation"
-msgstr "Un chercheur, indifférenciable d'un enseignant car il n'y a pas de valeur standard pour eduPersonAffiliation"
-
#: 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."
diff --git a/templates/accounts/alumni1.tt2 b/templates/accounts/alumni1.tt2
index ef0a840ec3ef7b695163c9083b65ba6f7406820c..ecdcf80bb3bcff8eeb0a3c090ba3a558a5d52264 100644
--- a/templates/accounts/alumni1.tt2
+++ b/templates/accounts/alumni1.tt2
@@ -4,7 +4,10 @@
Value "member" is not set for eduPersonAffiliation, contrary to current students
%]
[%
- description = "An ex-student with 'alum' value for eduPersonAffiliation"
+ description = {
+ en = "An ex-student with 'alum' value for eduPersonAffiliation"
+ fr = "Un ancient étudiant avec la valeur 'alum' pour eduPersonAffiliation"
+ }
attributes = {
cn = "Åsold Wahlstrøm - eduGAIN Access Check account"
displayName = "Åsold Wahlstrøm - eduGAIN Access Check account"
diff --git a/templates/accounts/employee1.tt2 b/templates/accounts/employee1.tt2
index 7eae2371aa32b51c68107aaaa99041dbe87cd438..d48d6ce24b015e07f44aa184490c0995942685df 100644
--- a/templates/accounts/employee1.tt2
+++ b/templates/accounts/employee1.tt2
@@ -7,7 +7,10 @@
values
%]
[%
- description = "A person with 'member', 'staff' and 'employee' values for eduPersonAffiliation"
+ description = {
+ en = "A person with 'member', 'staff' and 'employee' values for eduPersonAffiliation"
+ fr = "Une personne avec les valeurs 'member', 'staff' et 'employee' pour eduPersonAffiliation"
+ }
attributes = {
cn = "Linnéa Hsu - eduGAIN Access Check account"
displayName = "Linnéa Hsu - eduGAIN Access Check account"
diff --git a/templates/accounts/fullset1.tt2 b/templates/accounts/fullset1.tt2
index 85abc14a393166ba76d5525caec7582657016479..ba869d0b97fff4b6ac19e3fd111ead568978aaf9 100644
--- a/templates/accounts/fullset1.tt2
+++ b/templates/accounts/fullset1.tt2
@@ -5,17 +5,20 @@
attributes plus givenName and surname
%]
[%
- description = "A person with all eduGAIN user attributes plus givenName and surname"
+ description = {
+ en = "A person with all eduGAIN user attributes plus givenName and surname"
+ fr = "Une personne avec tous les attributs eduGAIN plus givenName et surname"
+ }
attributes = {
- cn = "Gundabald Lightfoot - eduGAIN Access Check account"
- displayName = "Gundabald Lightfoot - eduGAIN Access Check account"
- givenName = "Gundabald"
- sn = "Lightfoot - eduGAIN Access Check account"
- mail = "gundabald.lightfoot@${scope}"
- eduPersonAffiliation = [ "member", "faculty" ]
- eduPersonScopedAffiliation = [ "member@${scope}", "faculty@${scope}" ]
- eduPersonPrincipalName = "${id}@${scope}"
- schacHomeOrganization = scope
- schacHomeOrganizationType = "urn:schac:homeOrganizationType:int:other"
+ cn = "Gundabald Lightfoot - eduGAIN Access Check account"
+ displayName = "Gundabald Lightfoot - eduGAIN Access Check account"
+ givenName = "Gundabald"
+ sn = "Lightfoot - eduGAIN Access Check account"
+ mail = "gundabald.lightfoot@${scope}"
+ eduPersonAffiliation = [ "member", "faculty" ]
+ eduPersonScopedAffiliation = [ "member@${scope}", "faculty@${scope}" ]
+ eduPersonPrincipalName = "${id}@${scope}"
+ schacHomeOrganization = scope
+ schacHomeOrganizationType = "urn:schac:homeOrganizationType:int:other"
}
%]
diff --git a/templates/accounts/generic1.tt2 b/templates/accounts/generic1.tt2
index 6dbad5bb0d59698adf2851baa829dc7dd34ceee5..98ef23837c1a33a390e87eef1766543769357e2b 100644
--- a/templates/accounts/generic1.tt2
+++ b/templates/accounts/generic1.tt2
@@ -4,10 +4,13 @@
This account provides a limited set of user attributes (eduPersonPrincipalName, mail and displayName)
%]
[%
- description = "A person with a limited set of attributes (eduPersonPrincipalName, mail and displayName)"
+ description = {
+ en = "A person with a limited set of attributes (eduPersonPrincipalName, mail and displayName)"
+ fr = "Une personne avec un ensembe d'attributs limités (eduPersonPrincipalName, mail et displayName)"
+ }
attributes = {
- displayName = "山崎 弘子樫野 陽子 - eduGAIN Access Check account"
- mail = "forearartian@${scope}"
- eduPersonPrincipalName = "${id}@${scope}"
+ displayName = "山崎 弘子樫野 陽子 - eduGAIN Access Check account"
+ mail = "forearartian@${scope}"
+ eduPersonPrincipalName = "${id}@${scope}"
}
%]
diff --git a/templates/accounts/librarywalkin1.tt2 b/templates/accounts/librarywalkin1.tt2
index 9973cec47a152198880a209b01c9ac30d073c91a..8112e62b5d2aadc4187b8989905bd43d46cf813d 100644
--- a/templates/accounts/librarywalkin1.tt2
+++ b/templates/accounts/librarywalkin1.tt2
@@ -15,7 +15,10 @@
MACE-Dir Registry of eduPersonEntitlement values http://middleware.internet2.edu/urn-mace/urn-mace-dir-entitlement.html
%]
[%
- description = "A library user on the campus network"
+ description = {
+ en = "A library user on the campus network"
+ fr = "Un utilisateur de la bibliothèque sur le réseau du campus"
+ }
attributes = {
cn = "Ramón Núñez - eduGAIN Access Check account"
displayName = "Ramón Núñez - eduGAIN Access Check account"
diff --git a/templates/accounts/limitedset1.tt2 b/templates/accounts/limitedset1.tt2
index 0567110b33a6001ddd3b1a89ac133d00518e8b4d..ac42acbdb2a010cbdc51b235b14dbda79ad917f1 100644
--- a/templates/accounts/limitedset1.tt2
+++ b/templates/accounts/limitedset1.tt2
@@ -4,6 +4,9 @@
This account provides only an eduPersonTargetedID attribute
%]
[%
- description = "A person with only an eduPersonTargetedID attribute"
+ description = {
+ en = "A person with only an eduPersonTargetedID attribute"
+ fr = "Une personne avec uniquement un attribut eduPersonTargetedID"
+ }
attributes = {}
%]
diff --git a/templates/accounts/researcher1.tt2 b/templates/accounts/researcher1.tt2
index 89374f0762183ede9a712f550cfd1aafdefee31f..36b630bd11de6d1518f6d54b3e04b24f29adc80f 100644
--- a/templates/accounts/researcher1.tt2
+++ b/templates/accounts/researcher1.tt2
@@ -5,15 +5,18 @@
researcher.
%]
[%
- description = "A researcher, undifferenciable from a teacher as there is no standard value for eduPersonAffiliation"
+ description = {
+ en = "A researcher, undifferenciable from a teacher as there is no standard value for eduPersonAffiliation"
+ fr = "Un chercheur, indifférenciable d'un enseignant car il n'y a pas de valeur standard pour eduPersonAffiliation"
+ }
attributes = {
- cn = "Stéphane Larivière - eduGAIN Access Check account"
- displayName = "Stéphane Larivière - eduGAIN Access Check account"
- mail = "stephane.lariviere@${scope}"
- eduPersonAffiliation = [ "member", "faculty"]
- eduPersonScopedAffiliation = [ "member@${scope}", "faculty@${scope}" ]
- eduPersonPrincipalName = "${id}@${scope}"
- schacHomeOrganization = scope
- schacHomeOrganizationType = "urn:schac:homeOrganizationType:int:other"
+ cn = "Stéphane Larivière - eduGAIN Access Check account"
+ displayName = "Stéphane Larivière - eduGAIN Access Check account"
+ mail = "stephane.lariviere@${scope}"
+ eduPersonAffiliation = [ "member", "faculty"]
+ eduPersonScopedAffiliation = [ "member@${scope}", "faculty@${scope}" ]
+ eduPersonPrincipalName = "${id}@${scope}"
+ schacHomeOrganization = scope
+ schacHomeOrganizationType = "urn:schac:homeOrganizationType:int:other"
}
%]
diff --git a/templates/accounts/student1.tt2 b/templates/accounts/student1.tt2
index f3ea5d0ea3b1aef5d4962b23c0c7740e78a61e38..adb6047363bee173b870a39d320d18f24cefafde 100644
--- a/templates/accounts/student1.tt2
+++ b/templates/accounts/student1.tt2
@@ -3,7 +3,10 @@
An active student has both "member" and "student" values set for eduPersonAffiliation
%]
[%
- description = "A student with 'member' and 'student' values for eduPersonAffiliation"
+ description = {
+ en = "A student with 'member' and 'student' values for eduPersonAffiliation"
+ fr = "Un étudiant avec les valeurs 'member' et 'student' pour eduPersonAffiliation"
+ }
attributes = {
cn = "Ciarán MacCárthaigh - eduGAIN Access Check account"
displayName = "Ciarán MacCárthaigh - eduGAIN Access Check account"
diff --git a/templates/accounts/student2.tt2 b/templates/accounts/student2.tt2
index 78c9d2382b27f773c0a434e00b3438dc581973fe..501f0de4f32ed04368b034aa24c1834d80e2abaa 100644
--- a/templates/accounts/student2.tt2
+++ b/templates/accounts/student2.tt2
@@ -4,15 +4,18 @@
"member" and "student" and "faculty"
%]
[%
- description = "A PhD student with 'member', 'student' and 'faculty' values for eduPersonAffiliation"
+ description = {
+ en = "A PhD student with 'member', 'student' and 'faculty' values for eduPersonAffiliation"
+ fr = "Un étudiant en thèse avec les valeurs 'member', 'student' et 'faculty' pour eduPersonAffiliation"
+ }
attributes = {
- cn = "Damiën Kuijper - eduGAIN Access Check account"
- displayName = "Damiën Kuijper - eduGAIN Access Check account"
- mail = "damien.kuijper@${scope}"
- eduPersonAffiliation = [ "member", "student", "faculty" ]
- eduPersonScopedAffiliation = [ "member@${scope}", "student@${scope}", "faculty@${scope}" ]
- eduPersonPrincipalName = "${id}@${scope}"
- schacHomeOrganization = scope
- schacHomeOrganizationType = "urn:schac:homeOrganizationType:int:other"
+ cn = "Damiën Kuijper - eduGAIN Access Check account"
+ displayName = "Damiën Kuijper - eduGAIN Access Check account"
+ mail = "damien.kuijper@${scope}"
+ eduPersonAffiliation = [ "member", "student", "faculty" ]
+ eduPersonScopedAffiliation = [ "member@${scope}", "student@${scope}", "faculty@${scope}" ]
+ eduPersonPrincipalName = "${id}@${scope}"
+ schacHomeOrganization = scope
+ schacHomeOrganizationType = "urn:schac:homeOrganizationType:int:other"
}
%]
diff --git a/templates/accounts/teacher1.tt2 b/templates/accounts/teacher1.tt2
index 06716ad09f5e8a84caf0a81c0a288e50b346db63..da7b9f8aff3caf0b2e15340a77d175ce055ef15d 100644
--- a/templates/accounts/teacher1.tt2
+++ b/templates/accounts/teacher1.tt2
@@ -3,15 +3,18 @@
An active teacher has both "member" and "faculty" values set for eduPersonAffiliation
%]
[%
- description = "A teacher with a limited set of attributes (eduPersonScopedAffiliation and eduPersonTargetedID)"
+ description = {
+ en = "A teacher with a limited set of attributes (eduPersonScopedAffiliation and eduPersonTargetedID)"
+ fr = "Un enseignant avec un ensemble d'attributs limités (eduPersonScopedAffiliation and eduPersonTargetedID)"
+ }
attributes = {
- cn = "Peter Müller - eduGAIN Access Check account"
- displayName = "Peter Müller - eduGAIN Access Check account"
- mail = "peter.muller@${scope}"
- eduPersonAffiliation = [ "member", "faculty" ]
- eduPersonScopedAffiliation = [ "member@${scope}", "faculty@${scope}" ]
- eduPersonPrincipalName = "${id}@${scope}"
- schacHomeOrganization = scope
- schacHomeOrganizationType = "urn:schac:homeOrganizationType:int:other"
+ cn = "Peter Müller - eduGAIN Access Check account"
+ displayName = "Peter Müller - eduGAIN Access Check account"
+ mail = "peter.muller@${scope}"
+ eduPersonAffiliation = [ "member", "faculty" ]
+ eduPersonScopedAffiliation = [ "member@${scope}", "faculty@${scope}" ]
+ eduPersonPrincipalName = "${id}@${scope}"
+ schacHomeOrganization = scope
+ schacHomeOrganizationType = "urn:schac:homeOrganizationType:int:other"
}
%]
diff --git a/templates/accounts/teacher2.tt2 b/templates/accounts/teacher2.tt2
index 602369e783113b4c4040fa6736e3169c7afe2466..1ab2b8ae499805643373de7f68545bf49c6bfa6a 100644
--- a/templates/accounts/teacher2.tt2
+++ b/templates/accounts/teacher2.tt2
@@ -3,8 +3,11 @@
This account provides a limited set of user attributes (eduPersonScopedAffiliation and eduPersonTargetedID)
%]
[%
- description = "A teacher with 'member' and 'faculty' values for eduPersonAffiliation"
+ description = {
+ en = "A teacher with 'member' and 'faculty' values for eduPersonAffiliation"
+ fr = "Un enseignant avec les valeurs 'member' et 'faculty' pour eduPersonAffiliation"
+ }
attributes = {
- eduPersonScopedAffiliation = [ "member@${scope}", "faculty@${scope}" ]
+ eduPersonScopedAffiliation = [ "member@${scope}", "faculty@${scope}" ]
}
%]
diff --git a/templates/web/edugain/create_accounts.tt2.html b/templates/web/edugain/create_accounts.tt2.html
index f000f51a4b5f659baca83aacac25371e95658181..99f5efba4bda7c5a2160df4a65c57be783623716 100644
--- a/templates/web/edugain/create_accounts.tt2.html
+++ b/templates/web/edugain/create_accounts.tt2.html
@@ -33,7 +33,7 @@
<tr>
<td colspan="2">
<strong>[% lh.maketext("comment:") %]</strong>
- <div class="comment">[% lh.maketext(description) %]</div>
+ <div class="comment">[% description.${lh.language_tag()} %]</div>
</td>
</tr>
<tr>
diff --git a/templates/web/renater/create_accounts.tt2.html b/templates/web/renater/create_accounts.tt2.html
index b0ab701aa85a1b2672282219de0426e1e3d39ef2..307e4f52324a34edf43061eb35035e98a0d0bcc3 100644
--- a/templates/web/renater/create_accounts.tt2.html
+++ b/templates/web/renater/create_accounts.tt2.html
@@ -35,7 +35,7 @@
<tr>
<td colspan="2">
<strong>[% lh.maketext("comment:") %]</strong>
- <div class="comment">[% lh.maketext(description) %]</div>
+ <div class="comment">[% description.${lh.language_tag()} %]</div>
</td>
</tr>
<tr>