From 26ecbb01c17619432d32e058b39e81684aba203a Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillaume.rousse@renater.fr>
Date: Fri, 13 Nov 2020 19:10:10 +0100
Subject: [PATCH] keep profile translation in templates
---
lib/AccountManager/L10N/fr.pm | 33 -------------------
templates/accounts/alumni1.tt2 | 5 ++-
templates/accounts/employee1.tt2 | 5 ++-
templates/accounts/fullset1.tt2 | 25 +++++++-------
templates/accounts/generic1.tt2 | 11 ++++---
templates/accounts/librarywalkin1.tt2 | 5 ++-
templates/accounts/limitedset1.tt2 | 5 ++-
templates/accounts/researcher1.tt2 | 21 +++++++-----
templates/accounts/student1.tt2 | 5 ++-
templates/accounts/student2.tt2 | 21 +++++++-----
templates/accounts/teacher1.tt2 | 21 +++++++-----
templates/accounts/teacher2.tt2 | 7 ++--
.../web/edugain/create_accounts.tt2.html | 2 +-
.../web/renater/create_accounts.tt2.html | 2 +-
14 files changed, 84 insertions(+), 84 deletions(-)
diff --git a/lib/AccountManager/L10N/fr.pm b/lib/AccountManager/L10N/fr.pm
index c721760..e43ddcd 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 ef0a840..ecdcf80 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 7eae237..d48d6ce 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 85abc14..ba869d0 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 6dbad5b..98ef238 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 9973cec..8112e62 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 0567110..ac42acb 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 89374f0..36b630b 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 f3ea5d0..adb6047 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 78c9d23..501f0de 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 06716ad..da7b9f8 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 602369e..1ab2b8a 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 f000f51..99f5efb 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 b0ab701..307e4f5 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>
--
GitLab