Changeset 2009

Timestamp:

04/28/17 18:18:39 (7 years ago)

Author:

nanardon

Message:

I18N++

Location:

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web

Files:

• Controller/Root.pm (modified) (1 diff)
• Controller/Tools/LoadPasswd.pm (modified) (2 diffs)
• I18N/fr.po (modified) (15 diffs)
• I18N/messages.pot (modified) (3 diffs)
• Model/Accounts.pm (modified) (2 diffs)

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

@@ -37 +37 @@
 
     my ($locale) = split(',', $c->req->header('Accept-Language') || '');
+    warn $locale;
     $locale ||= '';
     $locale =~ s/(\s\s)/$1/;

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Tools/LoadPasswd.pm

@@ -43 +43 @@
                 my $user = $account->db->get_objects('user', $username)
                     or do {
-                    push(@{ $c->stash->{Pass} }, { u => $username, r => 'No such user' });  
+                    push(@{ $c->stash->{Pass} }, { u => $username, r => $c->localize('No such user') });
                     next;
                 };
-                $account->db->check_acl($user, 'userPassword', 'w') 
+                $account->db->check_acl($user, 'userPassword', 'w')
                     or do {
-                    push(@{ $c->stash->{Pass} }, { u => $username, r => 'Permission denied' });  
+                    push(@{ $c->stash->{Pass} }, { u => $username, r => $c->localize('Permission denied') });
                     next;
                 };
 
                 if ($user->InjectCryptPasswd($password)) {
-                    push(@{ $c->stash->{Pass} }, { u => $username, r => 'Injected' });
+                    push(@{ $c->stash->{Pass} }, { u => $username, r => $c->localize('Injected') };
                 } else {
                     push(@{ $c->stash->{Pass} }, { u => $username, r => 'Error: ' . LATMOS::Accounts::Log::lastmessage(LA_ERR) });
@@ -59 +59 @@
             } else {
                 my $message = $account->ChangeUserPassword($username, $password, $force);
-                push(@{ $c->stash->{Pass} }, { u => $username, r => $message || 'Changed' });
+                push(@{ $c->stash->{Pass} }, { u => $username, r => $message || $c->localize('Changed') });
             }
         }

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

@@ -52 +52 @@
 #: root/html/summary/accage/index.tt:5
 msgid "Active/Non active"
-msgstr ""
+msgstr "Actif/Non actif"
 
 #: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:127
@@ -68 +68 @@
 msgstr "Arrivée"
 
+#. ($username)
+#: lib/LATMOS/Accounts/Web/Model/Accounts.pm:181
+msgid "Cannot get user object %1"
+msgstr "Impossible de charger l'objet utilisateur %1"
+
 #: root/html/includes/sidebar.tt:15
 msgid "Change my password"
@@ -101 +106 @@
 msgstr "Fin de circuit d'entrée"
 
+#: lib/LATMOS/Accounts/Web/Model/Accounts.pm:199
+msgid "Error while changing password"
+msgstr "Erreur lors du changement de mot de passe"
+
 #: root/html/tools/csv/index.tt:10
 msgid "Example:"
-msgstr ""
+msgstr "Exemple:"
 
 #: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:87
@@ -111 +120 @@
 #: root/html/summary/employment/index.tt:12
 msgid "Filter"
-msgstr ""
+msgstr "Filtre"
 
 #: root/html/users/employment.tt:91
@@ -127 +136 @@
 #: root/html/includes/sidebar.tt:97
 msgid "Load Password"
-msgstr ""
+msgstr "Chager des mot de passe"
 
 #: root/html/includes/sidebar.tt:20
@@ -135 +144 @@
 #: root/html/includes/sidebar.tt:55
 msgid "Mass from CSV..."
-msgstr ""
+msgstr "Massif depuis un CSV..."
 
 #: root/html/users/employment.tt:31
@@ -143 +152 @@
 #: root/html/tools/csv/parseCSV.tt:24
 msgid "Object Name"
-msgstr ""
+msgstr "Nom de l'objet"
 
 #: root/html/tools/loadnew/index.tt:22
 msgid "Object data:"
-msgstr ""
+msgstr "Données de l'objet"
 
 #: root/html/tools/loadnew/index.tt:17
 msgid "Object name (optional):"
-msgstr ""
+msgstr "Nom de l'objet (optionnel):"
 
 #: root/html/tools/csv/parseCSV.tt:3
@@ -158 +167 @@
 "input data:"
 msgstr ""
+"Une ou plusieurs erreur sont apparues pendant la création des objets\n"
+"Verifier vos données en entrée"
 
 #: root/html/includes/sidebar.tt:87
-#, fuzzy
 msgid "Others Statistics"
-msgstr "Statistiques"
+msgstr "Autres Statistiques"
 
 #: root/html/tools/csv/index.tt:31
 msgid "Select a CSV file"
-msgstr ""
+msgstr "Selectionner un fichier CSV"
 
 #: root/html/summary/accage/index.tt:13
 msgid "Show inactive accounts"
-msgstr ""
+msgstr "Afficher les comptes inactifs"
 
 #: root/html/users/employment.tt:94
@@ -178 +188 @@
 #: root/html/summary/employment/index.tt:10
 msgid "Site"
-msgstr ""
+msgstr "Site"
 
 #: root/html/summary/employment/index.tt:3
@@ -203 +213 @@
 #: root/html/tools/csv/parseCSV.tt:18
 msgid "The follwing objects has been created:"
-msgstr ""
+msgstr "Les objets suivant ont été créés:"
 
 #: root/html/default.tt:4
 msgid "There's nothing here..."
-msgstr "Il n'y a rien ici"
+msgstr "Il n'y a rien ici..."
 
 #: root/html/tools/csv/index.tt:1
@@ -220 +230 @@
 "firstname and lastname (sn and givenName)."
 msgstr ""
+"Cette vous permet de créer de multiples objets à partir d'un fichier CSV\n"
+"\n"
+"La premiÚre ligne de contenir la liste des attributs à charger, chaque ligne\n"
+"suivante contient les valeurs pour les objets\n"
+"\n"
+"Pour les utilisateurs, le nom peut être omis, le nom de l'objet sera construits\n"
+"à partir des nom et prénom (sn et givenName)."
 
 #: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:78
@@ -231 +248 @@
 #: root/html/tools/csv/index.tt:21
 msgid "Type of object to create"
-msgstr ""
+msgstr "Type d'objet à créer"
 
 #: root/html/tools/loadnew/index.tt:4
 msgid "Type of object to create:"
-msgstr ""
+msgstr "Type d'objet à créer:"
+
+#: lib/LATMOS/Accounts/Web/Model/Accounts.pm:194
+msgid "Unchanged password"
+msgstr "Mot de passe inchangé"
 
 #: root/html/includes/sidebar.tt:52
 msgid "Using formated file"
-msgstr ""
+msgstr "En utilisant un fichier formaté"
 
 #: root/html/includes/sidebar.tt:27
@@ -252 +273 @@
 #: root/html/tools/loadnew/index.tt:23
 msgid "You can load a existing file..."
-msgstr ""
+msgstr "Vous pouvez charger un fichier existant"
 
 #. (c.stash.accountExists)
@@ -266 +287 @@
 #: root/html/tools/loadnew/index.tt:27
 msgid "or paste the content here:"
-msgstr ""
+msgstr "ou coller le contenu ici"
 
 #: root/html/users/employment.tt:29 root/html/users/employment.tt:92
@@ -272 +293 @@
 msgstr "Ã "
 
-#, fuzzy
-#~ msgid "From CVS"
-#~ msgstr "Du"

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

@@ -59 +59 @@
 msgstr ""
 
+#. ($username)
+#: lib/LATMOS/Accounts/Web/Model/Accounts.pm:181
+msgid "Cannot get user object %1"
+msgstr ""
+
 #: root/html/includes/sidebar.tt:15
 msgid "Change my password"
@@ -89 +94 @@
 #: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:96
 msgid "End of entrance"
+msgstr ""
+
+#: lib/LATMOS/Accounts/Web/Model/Accounts.pm:199
+msgid "Error while changing password"
 msgstr ""
 
@@ -225 +234 @@
 msgstr ""
 
+#: lib/LATMOS/Accounts/Web/Model/Accounts.pm:194
+msgid "Unchanged password"
+msgstr ""
+
 #: root/html/includes/sidebar.tt:52
 msgid "Using formated file"

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/Accounts.pm

@@ -179 +179 @@
     my $base = $self->db;
     my $user = $base->get_object('user', $username) or do {
-        return "Cannot get user object";
+        return $self->{c}->localize('Cannot get user object [_1]', $username);
     };
 
@@ -192 +192 @@
     my $msg = $user->check_password($password);
     if ($msg ne 'ok' && !$force) {
-        return $msg . ', mot de passe inchangé';
+        return $msg . ', ' .  $self->{c}->localize('Unchanged password');
     } elsif ($suser && $suser->_set_password($password)) {
         $sync->commit;
         return;
     } else {
-        return 'Erreur lors du changement de mot de passe';
+        return $self->{c}->localize('Error while changing password');
     }
 }