Changeset 2237

Timestamp:

04/30/19 07:36:43 (5 years ago)

Author:

nanardon

Message:

Move po files to make them availlable, handling Accept-Language

Location:

trunk

Files:

• LATMOS-Accounts-Web/lib/I18N (added)
• LATMOS-Accounts-Web/lib/I18N/AcceptLanguage.pm (added)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Root.pm (modified) (2 diffs)
• LATMOS-Accounts/MANIFEST (modified) (2 diffs)
• LATMOS-Accounts/Makefile.PL (modified) (3 diffs)
• LATMOS-Accounts/lib/LATMOS/Accounts/I18N.pm (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/I18N/po (added)
• LATMOS-Accounts/lib/LATMOS/Accounts/I18N/po/fr.po (moved) (moved from trunk/LATMOS-Accounts/po/fr.po) (35 diffs)
• LATMOS-Accounts/lib/LATMOS/Accounts/I18N/po/messages.pot (moved) (moved from trunk/LATMOS-Accounts/po/messages.pot) (28 diffs)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Root.pm

@@ -9 +9 @@
 use Date::Calc;
 use Date::Parse;
+use I18N::AcceptLanguage;
 
 #
@@ -36 +37 @@
     my ( $self, $c ) = @_;
 
-    my ($locale) = split(',', $c->req->header('Accept-Language') || '');
-    $locale ||= '';
-    $locale =~ s/(\s\s)/$1/;
+    my $supportedLanguages = [( 'fr' )];
+
+    my $acceptor = I18N::AcceptLanguage->new( debug => 1 );
+    my $language = ($c->req->header('Accept-Language'), $supportedLanguages);
+    my $locale = $language->[0];
+
     if (my $plocale = ($c->req->param('locale')|| $c->session->{'locale'})) {
         $c->session->{'locale'} = $locale = $plocale;
     }
-    POSIX::setlocale(POSIX::LC_ALL, $locale);
+    POSIX::setlocale(POSIX::LC_MESSAGES, $locale);
     $c->languages($locale ? [ $locale ] : '');
     return 1;

trunk/LATMOS-Accounts/MANIFEST

@@ -157 +157 @@
 man/man8/latmos-accounts.pod
 patchset/no_useless_load.patch
-po/fr.po
-po/messages.pot
 sample/allowed_values.ini
 sample/la-allowed-values.ini
@@ -210 +208 @@
 testdata/synchro/source/passwd
 testdata/synchro/source/shadow
+lib/LATMOS/Accounts/I18N/po/fr/LC_MESSAGES/linkaccounts.mo
+lib/LATMOS/Accounts/I18N/po/messages.pot
+lib/LATMOS/Accounts/I18N/po/fr.po

trunk/LATMOS-Accounts/Makefile.PL

@@ -5 +5 @@
 
 my @po;
-foreach (glob('po/*.po')) {
+foreach (glob('lib/LATMOS/Accounts/I18N/po/*.po')) {
     my ($po) = $_ =~  m:([^/\.]+)\.po$:;
     push (@po, $po);
@@ -126 +126 @@
         $makepo .=
 "
-po/$po.po: po/messages.pot
-\t[ -f po/$po.po ] || msginit --no-translator --input=po/messages.pot --output= --locale=$_
-\tmsgmerge -U po/$po.po po/messages.pot
-
-po/$po/LC_MESSAGES/linkaccounts.mo: po/$po.po
-\tinstall -d po/$po/LC_MESSAGES
+lib/LATMOS/Accounts/I18N/po/$po.po: lib/LATMOS/Accounts/I18N/po/messages.pot
+\t[ -f lib/LATMOS/Accounts/I18N/po/$po.po ] || msginit --no-translator --input=lib/LATMOS/Accounts/I18N/po/messages.pot --output= --locale=$_
+\tmsgmerge -U lib/LATMOS/Accounts/I18N/po/$po.po lib/LATMOS/Accounts/I18N/po/messages.pot
+
+lib/LATMOS/Accounts/I18N/po/$po/LC_MESSAGES/linkaccounts.mo: lib/LATMOS/Accounts/I18N/po/$po.po
+\tinstall -d lib/LATMOS/Accounts/I18N/po/$po/LC_MESSAGES
 \tmsgfmt -o \$@ \$<
 \n"
     }
 
-    $makepo .= "\n\npo: " . join(' ', map { "po/$_.po" } @po) . "\n";
-    $makepo .= "\n\nmo: " . join(' ', map { "po/$_/LC_MESSAGES/linkaccounts.mo" } @po) . "\n";
+    $makepo .= "\n\npo: " . join(' ', map { "lib/LATMOS/Accounts/I18N/po/$_.po" } @po) . "\n";
+    $makepo .= "\n\nmo: " . join(' ', map { "lib/LATMOS/Accounts/I18N/po/$_/LC_MESSAGES/linkaccounts.mo" } @po) . "\n";
 
     <<EOF;
-.PHONY: po/messages.pot
-
-pot: po/messages.pot
-
-po/messages.pot:
-\tcat MANIFEST | egrep '^(lib|bin)' | xargs xgettext.pl -o po/messages.pot
+.PHONY: lib/LATMOS/Accounts/I18N/po/messages.pot
+
+pot: lib/LATMOS/Accounts/I18N/po/messages.pot
+
+lib/LATMOS/Accounts/I18N/po/messages.pot:
+\tcat MANIFEST | egrep '^(lib|bin)' | xargs xgettext.pl -o lib/LATMOS/Accounts/I18N/po/messages.pot
 
 $makepo
@@ -235 +235 @@
     foreach (@po) {
         $section .= "\tinstall -d \$(DESTDIR)\$(LOCALEDIR)/$_/LC_MESSAGES\n";
-        $section .= "\tinstall po/$_/LC_MESSAGES/linkaccounts.mo \$(DESTDIR)\$(LOCALEDIR)/$_/LC_MESSAGES/linkaccounts.mo\n";
+        $section .= "\tinstall lib/LATMOS/Accounts/I18N/po/$_/LC_MESSAGES/linkaccounts.mo \$(DESTDIR)\$(LOCALEDIR)/$_/LC_MESSAGES/linkaccounts.mo\n";
     }
     $section .= "\n";

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/I18N.pm

@@ -25 +25 @@
 
 if (!$init) {
-    if (-d 'po') {
-        Locale::gettext::bindtextdomain('linkaccounts', 'po')
+
+    my $Path = __FILE__;
+    $Path =~ s/\.pm$//;
+    $Path .= '/po';
+    if (-d $Path) {
+        Locale::gettext::bindtextdomain('linkaccounts', $Path)
     }
     Locale::gettext::bind_textdomain_codeset('linkaccounts', 'UTF-8');

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/I18N/po/fr.po

@@ -13 +13 @@
 #. ($Dd)
 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:110
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:496
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:506
 msgid "%d days"
 msgstr "%d jours"
@@ -19 +19 @@
 #. ($Dm)
 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:109
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:495
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:505
 msgid "%d months"
 msgstr "%d mois"
@@ -25 +25 @@
 #. ($Dy)
 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:108
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:494
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:504
 msgid "%d years"
 msgstr "%d ans"
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1441
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1522
 msgid "Account Request id"
 msgstr "Demande de compte"
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1195
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1228
 msgid "Active"
 msgstr "Actif"
 
 #: lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:111
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:670
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:680
 msgid "Aliases"
 msgstr "Alias"
@@ -47 +47 @@
 
 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:180
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1438
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1519
 msgid "Assigned"
 msgstr "Affecté"
 
 #. ($attribute)
-#: lib/LATMOS/Accounts/Bases/Objects.pm:669
-#: lib/LATMOS/Accounts/Bases/Objects.pm:706
+#: lib/LATMOS/Accounts/Bases/Objects.pm:724
+#: lib/LATMOS/Accounts/Bases/Objects.pm:761
 #: lib/LATMOS/Accounts/Bases/Sql/objects.pm:850
 #: lib/LATMOS/Accounts/Bases/Sql/objects.pm:915
@@ -64 +64 @@
 msgstr "Filtres automatiques"
 
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:205
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:203
 msgid "Cache for oalias data"
 msgstr "Cache pour les alias d'objet"
 
-#: lib/LATMOS/Accounts/Bases.pm:483
+#: lib/LATMOS/Accounts/Bases.pm:484
 msgid "Cannot create %s object with empty id"
 msgstr "Ne peut créé l'object %s avec un identifiant vide"
 
 #. ($base)
-#: bin/la-load-csv:59 bin/la-query:117 bin/la-renewEmp:62
+#: bin/la-load-csv:59 bin/la-query:116 bin/la-renewEmp:62
 msgid "Cannot load base %s\n"
 msgstr "Ne peut charger la base %s\n"
 
 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:174
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:794
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:804
 msgid "City"
 msgstr "Ville"
@@ -86 +86 @@
 #: lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:237
 #: lib/LATMOS/Accounts/Bases/Sql/Service.pm:70
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1290
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1328
 msgid "Comment"
 msgstr "Commentaire"
@@ -92 +92 @@
 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:307
 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:164
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1284
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:864
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1322
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:874
 msgid "Company"
 msgstr "Société"
@@ -109 +109 @@
 msgstr "Pays"
 
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:124
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:122
 msgid "Created"
 msgstr "Créé"
 
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:162
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:160
 msgid "Created by"
 msgstr "Créé par"
 
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:215
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:213
 msgid "Deletion protection"
 msgstr "Protection contre l'effacement"
 
 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:161
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:744
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:869
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:754
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:879
 msgid "Department"
 msgstr "Départment"
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1186
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1219
 msgid "Departments"
 msgstr "Départements"
@@ -140 +140 @@
 #: lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:240
 #: lib/LATMOS/Accounts/Bases/Sql/Service.pm:73
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1281
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1319
 msgid "Description"
 msgstr "Description"
@@ -149 +149 @@
 
 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:82
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1253
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1291
 msgid "Email"
 msgstr "Email"
 
 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:167
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1287
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1325
 msgid "Employer"
 msgstr "Employeur"
@@ -199 +199 @@
 msgstr "Expire le"
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1191
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1224
 msgid "Expired"
 msgstr "Expiration"
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1256
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1294
 msgid "External mail"
 msgstr "Email exterieur"
 
 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:285
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1099
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:859
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1117
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:869
 msgid "Fax number"
 msgstr "Fax"
@@ -218 +218 @@
 
 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:94
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1277
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1315
 msgid "First name"
 msgstr "Prénom"
@@ -227 +227 @@
 
 #: lib/LATMOS/Accounts/Bases/Sql/Aliases.pm:69
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:616
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:626
 msgid "Forward"
 msgstr "Renvois"
@@ -236 +236 @@
 msgstr "Depuis les groupe-type:"
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:932
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:930
 msgid "GECOS"
 msgstr "GECOS"
@@ -245 +245 @@
 msgstr "GID"
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1273
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1311
 msgid "HAL id"
 msgstr "Identifiant HAL"
@@ -253 +253 @@
 msgstr "Adresse matérielle"
 
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:144
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:142
 msgid "Hidden"
 msgstr "Caché"
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1270
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1308
 msgid "Home directory"
 msgstr "Home"
@@ -266 +266 @@
 
 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:176
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1434
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1515
 msgid "Hosted"
 msgstr "Hébergé"
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1262
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1300
 msgid "Initials"
 msgstr "Initiales"
 
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:210
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:208
 msgid "Internal object"
 msgstr "Objet interne"
@@ -294 +294 @@
 msgstr "Etiquette"
 
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:129
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:127
 msgid "Last modified"
 msgstr "DerniÚre modification"
@@ -316 +316 @@
 msgstr "Vérrouillé"
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:900
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:910
 msgid "Login"
 msgstr "Login"
@@ -326 +326 @@
 #: lib/LATMOS/Accounts/Bases/Sql/Group.pm:119
 #: lib/LATMOS/Accounts/Bases/Sql/Service.pm:67
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1116
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1134
 msgid "Manager"
 msgstr "Responsable"
@@ -343 +343 @@
 msgstr "Nb de membres"
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:567
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:577
 msgid "Member of"
 msgstr "Membre de"
@@ -351 +351 @@
 msgstr "Premier jour possible"
 
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:156
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:154
 msgid "Modified by"
 msgstr "Modifié par"
 
 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:130
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1239
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:947
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:119
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1277
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:950
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:117
 msgid "Name"
 msgstr "Nom"
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1447
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1528
 msgid "Nationality"
 msgstr "Nationnalité"
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1450
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1531
 msgid "Native country"
 msgstr "Pays de naissance"
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1236
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1274
 msgid "Native first name"
 msgstr "Prénom"
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1233
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1271
 msgid "Native name"
 msgstr "Nom"
@@ -386 +386 @@
 msgstr "Suivant"
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1249
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1287
 msgid "Nickname"
 msgstr "Surnom"
@@ -398 +398 @@
 msgstr "Pas de classe puppet"
 
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:167
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:165
 msgid "Object alias for"
 msgstr "Alias d'objet pour"
@@ -404 +404 @@
 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:322
 #: lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:262
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:895
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:905
 msgid "Office"
 msgstr "Bureau"
@@ -420 +420 @@
 msgstr "Parents"
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1295
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1333
 msgid "Password set"
 msgstr "Mot de passe mis"
 
 #. ($attribute)
-#: lib/LATMOS/Accounts/Bases/Objects.pm:673
-#: lib/LATMOS/Accounts/Bases/Objects.pm:710
+#: lib/LATMOS/Accounts/Bases/Objects.pm:728
+#: lib/LATMOS/Accounts/Bases/Objects.pm:765
 #: lib/LATMOS/Accounts/Bases/Sql/objects.pm:854
 #: lib/LATMOS/Accounts/Bases/Sql/objects.pm:919
@@ -433 +433 @@
 
 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:319
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:882
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:892
 msgid "Phone number"
 msgstr "Téléphone"
 
 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:241
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:834
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:844
 msgid "Post office box"
 msgstr "Boite postale"
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1095
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1113
 msgid "Postal Address"
 msgstr "Adresse postale"
@@ -451 +451 @@
 
 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:196
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:807
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:817
 msgid "Postal code"
 msgstr "Code postal"
@@ -468 +468 @@
 
 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:183
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1444
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1525
 msgid "Request id"
 msgstr "Demande n_"
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:736
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:746
 msgid "Responsible"
 msgstr "Responsable"
@@ -492 +492 @@
 msgstr "Numéro de série"
 
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:150
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:148
 msgid "Service"
 msgstr "Service"
 
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:242
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:240
 msgid "Set me as reference"
 msgstr "Me mettre comme référence"
@@ -506 +506 @@
 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:58
 #: lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:259
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:769
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:779
 msgid "Site"
 msgstr "Site"
@@ -530 +530 @@
 msgstr "État"
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1199
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1232
 msgid "Statut du compte"
 msgstr "Statut du compte"
@@ -536 +536 @@
 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:219
 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:263
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:821
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:831
 msgid "Street"
 msgstr "Rue"
@@ -545 +545 @@
 
 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:142
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:752
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:762
 msgid "Type of contract"
 msgstr "Type de contrat"
@@ -564 +564 @@
 msgstr "Utilisateurs exclus"
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1228
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1535
+msgid "Validité formation SST"
+msgstr ""
+
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1266
 msgid "Web Page"
 msgstr "Page Web"
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:474
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:499
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:479
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:509
 msgid "Work duration"
 msgstr "Durée de présence"

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/I18N/po/messages.pot

@@ -17 +17 @@
 
 #. ($Dd)
-#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:110 lib/LATMOS/Accounts/Bases/Sql/User.pm:496
+#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:110 lib/LATMOS/Accounts/Bases/Sql/User.pm:506
 msgid "%d days"
 msgstr ""
 
 #. ($Dm)
-#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:109 lib/LATMOS/Accounts/Bases/Sql/User.pm:495
+#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:109 lib/LATMOS/Accounts/Bases/Sql/User.pm:505
 msgid "%d months"
 msgstr ""
 
 #. ($Dy)
-#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:108 lib/LATMOS/Accounts/Bases/Sql/User.pm:494
+#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:108 lib/LATMOS/Accounts/Bases/Sql/User.pm:504
 msgid "%d years"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1441
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1522
 msgid "Account Request id"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1195
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1228
 msgid "Active"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:111 lib/LATMOS/Accounts/Bases/Sql/User.pm:670
+#: lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:111 lib/LATMOS/Accounts/Bases/Sql/User.pm:680
 msgid "Aliases"
 msgstr ""
@@ -47 +47 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:180 lib/LATMOS/Accounts/Bases/Sql/User.pm:1438
+#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:180 lib/LATMOS/Accounts/Bases/Sql/User.pm:1519
 msgid "Assigned"
 msgstr ""
 
 #. ($attribute)
-#: lib/LATMOS/Accounts/Bases/Objects.pm:669 lib/LATMOS/Accounts/Bases/Objects.pm:706 lib/LATMOS/Accounts/Bases/Sql/objects.pm:850 lib/LATMOS/Accounts/Bases/Sql/objects.pm:915
+#: lib/LATMOS/Accounts/Bases/Objects.pm:724 lib/LATMOS/Accounts/Bases/Objects.pm:761 lib/LATMOS/Accounts/Bases/Sql/objects.pm:850 lib/LATMOS/Accounts/Bases/Sql/objects.pm:915
 msgid "Attribute %s is not readable"
 msgstr ""
@@ -60 +60 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:205
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:203
 msgid "Cache for oalias data"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases.pm:483
+#: lib/LATMOS/Accounts/Bases.pm:484
 msgid "Cannot create %s object with empty id"
 msgstr ""
 
 #. ($base)
-#: bin/la-load-csv:59 bin/la-query:117 bin/la-renewEmp:62
+#: bin/la-load-csv:59 bin/la-query:116 bin/la-renewEmp:62
 msgid "Cannot load base %s\n"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:174 lib/LATMOS/Accounts/Bases/Sql/User.pm:794
+#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:174 lib/LATMOS/Accounts/Bases/Sql/User.pm:804
 msgid "City"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/Aliases.pm:163 lib/LATMOS/Accounts/Bases/Sql/Group.pm:175 lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:237 lib/LATMOS/Accounts/Bases/Sql/Service.pm:70 lib/LATMOS/Accounts/Bases/Sql/User.pm:1290
+#: lib/LATMOS/Accounts/Bases/Sql/Aliases.pm:163 lib/LATMOS/Accounts/Bases/Sql/Group.pm:175 lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:237 lib/LATMOS/Accounts/Bases/Sql/Service.pm:70 lib/LATMOS/Accounts/Bases/Sql/User.pm:1328
 msgid "Comment"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:307 lib/LATMOS/Accounts/Bases/Sql/Employment.pm:164 lib/LATMOS/Accounts/Bases/Sql/User.pm:1284 lib/LATMOS/Accounts/Bases/Sql/User.pm:864
+#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:307 lib/LATMOS/Accounts/Bases/Sql/Employment.pm:164 lib/LATMOS/Accounts/Bases/Sql/User.pm:1322 lib/LATMOS/Accounts/Bases/Sql/User.pm:874
 msgid "Company"
 msgstr ""
@@ -97 +97 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:124
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:122
 msgid "Created"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:162
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:160
 msgid "Created by"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:215
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:213
 msgid "Deletion protection"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:161 lib/LATMOS/Accounts/Bases/Sql/User.pm:744 lib/LATMOS/Accounts/Bases/Sql/User.pm:869
+#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:161 lib/LATMOS/Accounts/Bases/Sql/User.pm:754 lib/LATMOS/Accounts/Bases/Sql/User.pm:879
 msgid "Department"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1186
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1219
 msgid "Departments"
 msgstr ""
@@ -121 +121 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:328 lib/LATMOS/Accounts/Bases/Sql/Employment.pm:59 lib/LATMOS/Accounts/Bases/Sql/Group.pm:172 lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:240 lib/LATMOS/Accounts/Bases/Sql/Service.pm:73 lib/LATMOS/Accounts/Bases/Sql/User.pm:1281
+#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:328 lib/LATMOS/Accounts/Bases/Sql/Employment.pm:59 lib/LATMOS/Accounts/Bases/Sql/Group.pm:172 lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:240 lib/LATMOS/Accounts/Bases/Sql/Service.pm:73 lib/LATMOS/Accounts/Bases/Sql/User.pm:1319
 msgid "Description"
 msgstr ""
@@ -129 +129 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:82 lib/LATMOS/Accounts/Bases/Sql/User.pm:1253
+#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:82 lib/LATMOS/Accounts/Bases/Sql/User.pm:1291
 msgid "Email"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:167 lib/LATMOS/Accounts/Bases/Sql/User.pm:1287
+#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:167 lib/LATMOS/Accounts/Bases/Sql/User.pm:1325
 msgid "Employer"
 msgstr ""
@@ -173 +173 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1191
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1224
 msgid "Expired"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1256
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1294
 msgid "External mail"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:285 lib/LATMOS/Accounts/Bases/Sql/User.pm:1099 lib/LATMOS/Accounts/Bases/Sql/User.pm:859
+#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:285 lib/LATMOS/Accounts/Bases/Sql/User.pm:1117 lib/LATMOS/Accounts/Bases/Sql/User.pm:869
 msgid "Fax number"
 msgstr ""
@@ -189 +189 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:94 lib/LATMOS/Accounts/Bases/Sql/User.pm:1277
+#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:94 lib/LATMOS/Accounts/Bases/Sql/User.pm:1315
 msgid "First name"
 msgstr ""
@@ -197 +197 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/Aliases.pm:69 lib/LATMOS/Accounts/Bases/Sql/User.pm:616
+#: lib/LATMOS/Accounts/Bases/Sql/Aliases.pm:69 lib/LATMOS/Accounts/Bases/Sql/User.pm:626
 msgid "Forward"
 msgstr ""
@@ -205 +205 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:932
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:930
 msgid "GECOS"
 msgstr ""
@@ -213 +213 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1273
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1311
 msgid "HAL id"
 msgstr ""
@@ -221 +221 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:144
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:142
 msgid "Hidden"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1270
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1308
 msgid "Home directory"
 msgstr ""
@@ -233 +233 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:176 lib/LATMOS/Accounts/Bases/Sql/User.pm:1434
+#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:176 lib/LATMOS/Accounts/Bases/Sql/User.pm:1515
 msgid "Hosted"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1262
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1300
 msgid "Initials"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:210
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:208
 msgid "Internal object"
 msgstr ""
@@ -261 +261 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:129
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:127
 msgid "Last modified"
 msgstr ""
@@ -281 +281 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:900
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:910
 msgid "Login"
 msgstr ""
@@ -289 +289 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/Group.pm:119 lib/LATMOS/Accounts/Bases/Sql/Service.pm:67 lib/LATMOS/Accounts/Bases/Sql/User.pm:1116
+#: lib/LATMOS/Accounts/Bases/Sql/Group.pm:119 lib/LATMOS/Accounts/Bases/Sql/Service.pm:67 lib/LATMOS/Accounts/Bases/Sql/User.pm:1134
 msgid "Manager"
 msgstr ""
@@ -305 +305 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:567
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:577
 msgid "Member of"
 msgstr ""
@@ -313 +313 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:156
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:154
 msgid "Modified by"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:130 lib/LATMOS/Accounts/Bases/Sql/User.pm:1239 lib/LATMOS/Accounts/Bases/Sql/User.pm:947 lib/LATMOS/Accounts/Bases/Sql/objects.pm:119
+#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:130 lib/LATMOS/Accounts/Bases/Sql/User.pm:1277 lib/LATMOS/Accounts/Bases/Sql/User.pm:950 lib/LATMOS/Accounts/Bases/Sql/objects.pm:117
 msgid "Name"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1447
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1528
 msgid "Nationality"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1450
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1531
 msgid "Native country"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1236
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1274
 msgid "Native first name"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1233
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1271
 msgid "Native name"
 msgstr ""
@@ -345 +345 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1249
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1287
 msgid "Nickname"
 msgstr ""
@@ -357 +357 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:167
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:165
 msgid "Object alias for"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:322 lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:262 lib/LATMOS/Accounts/Bases/Sql/User.pm:895
+#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:322 lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:262 lib/LATMOS/Accounts/Bases/Sql/User.pm:905
 msgid "Office"
 msgstr ""
@@ -377 +377 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1295
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1333
 msgid "Password set"
 msgstr ""
 
 #. ($attribute)
-#: lib/LATMOS/Accounts/Bases/Objects.pm:673 lib/LATMOS/Accounts/Bases/Objects.pm:710 lib/LATMOS/Accounts/Bases/Sql/objects.pm:854 lib/LATMOS/Accounts/Bases/Sql/objects.pm:919
+#: lib/LATMOS/Accounts/Bases/Objects.pm:728 lib/LATMOS/Accounts/Bases/Objects.pm:765 lib/LATMOS/Accounts/Bases/Sql/objects.pm:854 lib/LATMOS/Accounts/Bases/Sql/objects.pm:919
 msgid "Permission denied to read attribute %s"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:319 lib/LATMOS/Accounts/Bases/Sql/User.pm:882
+#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:319 lib/LATMOS/Accounts/Bases/Sql/User.pm:892
 msgid "Phone number"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:241 lib/LATMOS/Accounts/Bases/Sql/User.pm:834
+#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:241 lib/LATMOS/Accounts/Bases/Sql/User.pm:844
 msgid "Post office box"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1095
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1113
 msgid "Postal Address"
 msgstr ""
@@ -402 +402 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:196 lib/LATMOS/Accounts/Bases/Sql/User.pm:807
+#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:196 lib/LATMOS/Accounts/Bases/Sql/User.pm:817
 msgid "Postal code"
 msgstr ""
@@ -418 +418 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:183 lib/LATMOS/Accounts/Bases/Sql/User.pm:1444
+#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:183 lib/LATMOS/Accounts/Bases/Sql/User.pm:1525
 msgid "Request id"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:736
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:746
 msgid "Responsible"
 msgstr ""
@@ -442 +442 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:150
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:148
 msgid "Service"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:242
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:240
 msgid "Set me as reference"
 msgstr ""
@@ -454 +454 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:58 lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:259 lib/LATMOS/Accounts/Bases/Sql/User.pm:769
+#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:58 lib/LATMOS/Accounts/Bases/Sql/Nethost.pm:259 lib/LATMOS/Accounts/Bases/Sql/User.pm:779
 msgid "Site"
 msgstr ""
@@ -474 +474 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1199
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1232
 msgid "Statut du compte"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:219 lib/LATMOS/Accounts/Bases/Sql/Address.pm:263 lib/LATMOS/Accounts/Bases/Sql/User.pm:821
+#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:219 lib/LATMOS/Accounts/Bases/Sql/Address.pm:263 lib/LATMOS/Accounts/Bases/Sql/User.pm:831
 msgid "Street"
 msgstr ""
@@ -486 +486 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:142 lib/LATMOS/Accounts/Bases/Sql/User.pm:752
+#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:142 lib/LATMOS/Accounts/Bases/Sql/User.pm:762
 msgid "Type of contract"
 msgstr ""
@@ -502 +502 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1228
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1535
+msgid "Validité formation SST"
+msgstr ""
+
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:1266
 msgid "Web Page"
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/User.pm:474 lib/LATMOS/Accounts/Bases/Sql/User.pm:499
+#: lib/LATMOS/Accounts/Bases/Sql/User.pm:479 lib/LATMOS/Accounts/Bases/Sql/User.pm:509
 msgid "Work duration"
 msgstr ""