From 039141422618e42f298df13a4d739f2e3d92b2a4 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Sun, 17 Jul 2011 17:38:02 +0000 Subject: add a array to store who was promoted, to pass to template --- lib/CatDap/Controller/admin.pm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib') diff --git a/lib/CatDap/Controller/admin.pm b/lib/CatDap/Controller/admin.pm index 6c93212..352c3b1 100644 --- a/lib/CatDap/Controller/admin.pm +++ b/lib/CatDap/Controller/admin.pm @@ -163,6 +163,7 @@ sub account_promote : Local { $c->assert_user_roles('Account Admins'); $c->stash( subpages => gensubpages('account') ); my @errors; + my @promoted; if ( defined $c->req->param('gid') and defined $c->req->param('username') ) { my $gid = $c->req->param('gid'); @@ -206,6 +207,8 @@ sub account_promote : Local { $idpool->replace( uidNumber => $uidnum ); $mesg = $idpool->update; $c->log->info("ERROR IdPool could not be reset to $uidnum: ", $mesg->error) if $mesg->code; + } else { + push @promoted, $uid; } } } @@ -228,6 +231,7 @@ sub account_promote : Local { my @groups = $mesg->entries; $c->stash( groups => \@groups ); $c->stash( errors => \@errors ); + $c->stash( promoted => \@promoted ); } sub account_modify : Local { -- cgit v1.2.1 From 077018601769448fb6817693359b83952537f2e8 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Sun, 17 Jul 2011 19:19:04 +0000 Subject: sort user to promote by login --- lib/CatDap/Controller/admin.pm | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/CatDap/Controller/admin.pm b/lib/CatDap/Controller/admin.pm index 352c3b1..89a0da0 100644 --- a/lib/CatDap/Controller/admin.pm +++ b/lib/CatDap/Controller/admin.pm @@ -224,6 +224,7 @@ sub account_promote : Local { } push @entries, \%new_entry; } + @entries = sort { $a->{'uid'} cmp $b->{'uid'} } @entries; $c->stash( entries => \@entries ); push @errors, $mesg->error if $mesg->code; -- cgit v1.2.1 From c3ac8525105a2d9bbf697eb910e1e9eba67c9610 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Sun, 17 Jul 2011 21:43:32 +0000 Subject: more string to translate --- lib/CatDap/Controller/admin.pm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/CatDap/Controller/admin.pm b/lib/CatDap/Controller/admin.pm index 89a0da0..fd74650 100644 --- a/lib/CatDap/Controller/admin.pm +++ b/lib/CatDap/Controller/admin.pm @@ -182,7 +182,7 @@ sub account_promote : Local { my $entry = $mesg->entry; $mesg = $c->model('user')->search("(objectclass=sambaUnixIdPool)"); if ( $mesg->entries gt 1 ) { - push @errors, "More than one ID Pool"; + push @errors, $c->loc("More than one ID Pool"); #TODO forward to error page } @@ -512,7 +512,7 @@ sub password : Local { $mesg = $c->model('user')->search("uid=$uid"); push @errors,$mesg->error if $mesg->code; if ($mesg->entries gt 1) { - push @errors,'More than one entry matched'; + push @errors, $c->loc('More than one entry matched'); $c->detach; } $entry = $mesg->entry; @@ -525,14 +525,14 @@ sub password : Local { return 1; } if ($c->req->param('txnid') ne $c->session->{txnid}) { - push @errors,'Transaction ID mismatch'; + push @errors, $c->loc('Transaction ID mismatch'); $c->detach; } $newpass = Data::UUID->new->create_str(); my $pp = Net::LDAP::Control::PasswordPolicy->new; $mesg = $entry->replace( userPassword => $newpass,pwdReset => 'TRUE' )->update; if ($mesg->code) { - push @errors,"Password reset failed: " . $mesg->error; + push @errors, $c->loc("Password reset failed: ") . $mesg->error; $c->detach; } my $email = join(',',@mail); @@ -588,14 +588,14 @@ sub group : Local { if ( not $c->req->param('attribute') and not $c->req->param('value') ) { $attribute = 'owner'; $value = $c->user->ldap_entry->dn; - $c->stash( heading => 'Groups you manage'); + $c->stash( heading => $c->loc('Groups you manage')); } else { $attribute = $c->req->param('attribute'); $attribute =~ s/[^\w\d]//g; $value = $c->req->param('value'); $value =~ s/[^\w\d\* ]//g; - $c->stash( heading => 'Groups matching search criteria'); + $c->stash( heading => $c->loc('Groups matching search criteria')); } my $mesg = $c->model('user') @@ -621,7 +621,7 @@ sub group_modify : Local { my $mesg; $c->detach('/admin/group') if $group eq ''; if ( $group !~ /^[\w\d ]*$/ ) { - push @errors, "Group contains illegal characters"; + push @errors, $c->loc('Group contains illegal characters'); $c->detach('/admin/group'); } if (defined $op and $op eq 'delete') { @@ -649,7 +649,7 @@ sub group_modify : Local { } $mesg = $c->model('user')->search("(&(objectClass=groupOfNames)(cn=$group))"); if ( $mesg->entries gt 1 ) { - push @errors, 'More than one entry matched'; + push @errors, $c->loc('More than one entry matched'); $c->detach('/admin/group'); } $c->stash( group => $mesg->entry ); -- cgit v1.2.1 From 4cc7937ed12d64386c6a96c7b82a7f272dcbffe9 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Wed, 20 Jul 2011 23:40:18 +0000 Subject: add more string to translate ( previously untranslated ) --- lib/CatDap/I18N/messages.pot | 104 ++++++++++++++++++++++++++++--------------- 1 file changed, 69 insertions(+), 35 deletions(-) (limited to 'lib') diff --git a/lib/CatDap/I18N/messages.pot b/lib/CatDap/I18N/messages.pot index b972de9..a45f4ca 100644 --- a/lib/CatDap/I18N/messages.pot +++ b/lib/CatDap/I18N/messages.pot @@ -15,11 +15,11 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: lib/CatDap/Controller/register.pm:133 +#: lib/CatDap/Controller/register.pm:134 msgid "Activation" msgstr "" -#: root/admin/account_addoc.tt:28 root/admin/account_modify.tt:24 root/admin/group_modify.tt:18 root/user/index.tt:19 root/user/index.tt:48 +#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11 root/admin/account_modify.tt:24 root/admin/group_modify.tt:21 root/user/index.tt:19 root/user/index.tt:48 msgid "Add" msgstr "" @@ -31,30 +31,35 @@ msgstr "" msgid "Add attribute" msgstr "" +#. (uid) +#: root/admin/account_group.tt:1 +msgid "Add user %1 to a new group" +msgstr "" + #. (oc, dn) #: root/admin/account_addoc.tt:1 msgid "Adding objectclass %1 to dn %2" msgstr "" -#: lib/CatDap/Controller/register.pm:49 +#: lib/CatDap/Controller/register.pm:50 msgid "Addresses do not match" msgstr "" -#: lib/CatDap/Controller/register.pm:89 +#: lib/CatDap/Controller/register.pm:90 msgid "An account already exists with this email address" msgstr "" -#: lib/CatDap/Controller/register.pm:94 +#: lib/CatDap/Controller/register.pm:95 msgid "An account already exists with this username" msgstr "" #. ($errors) -#: lib/CatDap/Controller/register.pm:145 +#: lib/CatDap/Controller/register.pm:146 msgid "An error occured sending the email, but your account was created. Please try the password recovery process if you entered the correct email address. Errors %1" msgstr "" #. ($errors) -#: lib/CatDap/Controller/admin.pm:548 +#: lib/CatDap/Controller/admin.pm:562 msgid "An error occured sending the email, but your account was created. Please try the password recovery process if you entered the correct email address: %1" msgstr "" @@ -67,7 +72,7 @@ msgstr "" msgid "Attribute" msgstr "" -#: lib/CatDap/Controller/register.pm:56 +#: lib/CatDap/Controller/register.pm:57 msgid "Cannot check /etc/passwd, please warn system administrators" msgstr "" @@ -105,15 +110,20 @@ msgstr "" msgid "Dear %1," msgstr "" -#: root/admin/account_modify.tt:27 root/user/index.tt:22 +#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27 root/user/index.tt:22 msgid "Delete" msgstr "" +#. (uid) +#: root/admin/account_group.tt:17 +msgid "Delete user %1 from an existing group:" +msgstr "" + #: root/user/fake.tt:1 msgid "Edit" msgstr "" -#: root/admin/account.tt:33 root/admin/account.tt:8 root/admin/account_promote.tt:6 root/register/index.tt:20 +#: root/admin/account.tt:8 root/register/index.tt:20 msgid "Email" msgstr "" @@ -137,10 +147,6 @@ msgstr "" msgid "Error while searching for account: " msgstr "" -#: root/admin/account.tt:34 root/admin/account_promote.tt:7 -msgid "First Name" -msgstr "" - #: root/register/index.tt:13 msgid "First name" msgstr "" @@ -157,14 +163,18 @@ msgstr "" msgid "Forgotten password?" msgstr "" -#: root/admin/account.tt:36 root/admin/account.tt:9 root/admin/account_promote.tt:9 +#: root/admin/account.tt:9 msgid "Full Name" msgstr "" -#: root/admin/group.tt:27 +#: root/admin/group.tt:28 msgid "Group Name" msgstr "" +#: lib/CatDap/Controller/admin.pm:624 +msgid "Group contains illegal characters" +msgstr "" + #: root/admin/group.tt:9 msgid "Group name" msgstr "" @@ -173,22 +183,34 @@ msgstr "" msgid "Groups" msgstr "" -#: lib/CatDap/Controller/register.pm:52 +#: lib/CatDap/Controller/admin.pm:598 +msgid "Groups matching search criteria" +msgstr "" + +#: lib/CatDap/Controller/admin.pm:591 +msgid "Groups you manage" +msgstr "" + +#: lib/CatDap/Controller/register.pm:53 msgid "Incorrect validation text, please try again" msgstr "" -#: lib/CatDap/Controller/forgot_password.pm:45 lib/CatDap/Controller/register.pm:46 +#: lib/CatDap/Controller/forgot_password.pm:45 lib/CatDap/Controller/register.pm:47 msgid "Invalid email address" msgstr "" -#: lib/CatDap/Controller/register.pm:42 +#: lib/CatDap/Controller/register.pm:43 msgid "Invalid username" msgstr "" -#: lib/CatDap/Controller/register.pm:59 +#: lib/CatDap/Controller/register.pm:60 msgid "Invalid username, already used by system" msgstr "" +#: root/admin/account_promote.tt:3 +msgid "List of users promoted :" +msgstr "" + #: root/template/header:10 root/user/fake.tt:3 msgid "Log out" msgstr "" @@ -197,11 +219,19 @@ msgstr "" msgid "Login" msgstr "" +#: lib/CatDap/Controller/admin.pm:185 +msgid "More than one ID Pool" +msgstr "" + +#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652 +msgid "More than one entry matched" +msgstr "" + #: root/forgot_password/confirm.tt:8 root/user/firstlogin.tt:5 root/user/password.tt:9 msgid "New Password" msgstr "" -#: lib/CatDap/Controller/user.pm:295 +#: lib/CatDap/Controller/user.pm:299 msgid "New passwords dont match" msgstr "" @@ -213,14 +243,18 @@ msgstr "" msgid "Password : " msgstr "" -#: lib/CatDap/Controller/user.pm:289 +#: lib/CatDap/Controller/user.pm:293 msgid "Password incorrect" msgstr "" -#: lib/CatDap/Controller/admin.pm:551 +#: lib/CatDap/Controller/admin.pm:565 msgid "Password reset and email sent" msgstr "" +#: lib/CatDap/Controller/admin.pm:535 +msgid "Password reset failed: " +msgstr "" + #: root/register/index.tt:12 msgid "Personal Information" msgstr "" @@ -233,7 +267,7 @@ msgstr "" msgid "Please use the menus above." msgstr "" -#: root/admin/account_promote.tt:25 +#: root/admin/account_promote.tt:24 msgid "Primary group" msgstr "" @@ -277,10 +311,6 @@ msgstr "" msgid "Search by" msgstr "" -#: root/admin/account_promote.tt:4 -msgid "Select" -msgstr "" - #: root/forgot_password/confirm.tt:16 msgid "Set new password" msgstr "" @@ -289,15 +319,15 @@ msgstr "" msgid "Success" msgstr "" -#: root/admin/account.tt:10 root/admin/account.tt:35 root/admin/account_promote.tt:8 root/register/index.tt:16 +#: root/admin/account.tt:10 root/register/index.tt:16 msgid "Surname" msgstr "" -#: lib/CatDap/Controller/register.pm:70 +#: lib/CatDap/Controller/register.pm:71 msgid "The first name supplied contains illegal characters" msgstr "" -#: lib/CatDap/Controller/register.pm:75 +#: lib/CatDap/Controller/register.pm:76 msgid "The surname supplied contains illegal characters" msgstr "" @@ -313,11 +343,15 @@ msgstr "" msgid "To reset your password, please follow the link below." msgstr "" +#: lib/CatDap/Controller/admin.pm:528 +msgid "Transaction ID mismatch" +msgstr "" + #: root/admin/account_modify.tt:35 root/user/index.tt:29 msgid "Update" msgstr "" -#: root/admin/account.tt:32 root/admin/account.tt:7 root/admin/account_promote.tt:5 root/register/index.tt:7 root/register/index.tt:8 +#: root/admin/account.tt:7 root/register/index.tt:7 root/register/index.tt:8 msgid "Username" msgstr "" @@ -325,7 +359,7 @@ msgstr "" msgid "Username : " msgstr "" -#: lib/CatDap/Controller/register.pm:65 +#: lib/CatDap/Controller/register.pm:66 msgid "Username is not authorized to be used" msgstr "" @@ -356,7 +390,7 @@ msgstr "" msgid "contains" msgstr "" -#: root/admin/group_modify.tt:14 +#: root/admin/group_modify.tt:15 msgid "delete" msgstr "" @@ -376,7 +410,7 @@ msgstr "" msgid "member" msgstr "" -#: lib/CatDap/Controller/admin.pm:535 +#: lib/CatDap/Controller/admin.pm:549 msgid "password reset" msgstr "" -- cgit v1.2.1 From 2444b8126eb04341af00b65233762bdd944fb7ef Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Thu, 21 Jul 2011 11:22:09 +0000 Subject: fix the regexp, so we can manage mga-* group --- lib/CatDap/Controller/admin.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/CatDap/Controller/admin.pm b/lib/CatDap/Controller/admin.pm index fd74650..de0c76a 100644 --- a/lib/CatDap/Controller/admin.pm +++ b/lib/CatDap/Controller/admin.pm @@ -620,7 +620,7 @@ sub group_modify : Local { my @entries; my $mesg; $c->detach('/admin/group') if $group eq ''; - if ( $group !~ /^[\w\d ]*$/ ) { + if ( $group !~ /^[\w\d- ]*$/ ) { push @errors, $c->loc('Group contains illegal characters'); $c->detach('/admin/group'); } -- cgit v1.2.1 From ba1ebfe77fbebb5591076b94c2870b43e8596072 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Thu, 21 Jul 2011 12:11:34 +0000 Subject: fix code, Catalyst::Result do not have a forward method --- lib/CatDap/Controller/admin.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/CatDap/Controller/admin.pm b/lib/CatDap/Controller/admin.pm index de0c76a..814475f 100644 --- a/lib/CatDap/Controller/admin.pm +++ b/lib/CatDap/Controller/admin.pm @@ -612,7 +612,7 @@ sub group_modify : Local { $c->detach('/user/login') if not $c->user; my $mainrole = 'account'; if ( ! $c->check_user_roles('Account Admins') and ! $c->check_user_roles('Group Admins')) { - $c->res->forward('/user'); + $c->forward('/user'); } $mainrole = 'group' if (not $c->check_user_roles('Account Admins')); $c->stash( subpages => gensubpages($mainrole) ); -- cgit v1.2.1 From 6d861e125dff8edccdf6f4070fbb4642d0cd5c89 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Thu, 21 Jul 2011 16:50:26 +0000 Subject: refactor the ldap query, and do it sooner so we can use it for access control --- lib/CatDap/Controller/admin.pm | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'lib') diff --git a/lib/CatDap/Controller/admin.pm b/lib/CatDap/Controller/admin.pm index 814475f..452efd9 100644 --- a/lib/CatDap/Controller/admin.pm +++ b/lib/CatDap/Controller/admin.pm @@ -619,17 +619,25 @@ sub group_modify : Local { my @errors; my @entries; my $mesg; + $c->detach('/admin/group') if $group eq ''; if ( $group !~ /^[\w\d- ]*$/ ) { push @errors, $c->loc('Group contains illegal characters'); $c->detach('/admin/group'); } + + my $mesg_group = $c->model('user')->search("(&(objectClass=groupOfNames)(cn=$group))"); + if ( $mesg_group->entries gt 1 ) { + push @errors, $c->loc('More than one entry matched'); + $c->detach('/admin/group'); + } + if (defined $op and $op eq 'delete') { - $mesg = $c->model('user')->search("(&(objectClass=groupOfNames)(cn=$group))"); - @entries = $mesg->entries; + @entries = $mesg_group->entries; $entries[0]->delete( $attr => $value)->update; $c->res->redirect("/admin/group_modify/$group"); - } + } + if ( defined $op and $op eq 'add' ) { my $member = $c->req->param('member'); $mesg = $c->model('user')->search("(uid=$member)"); @@ -642,17 +650,12 @@ sub group_modify : Local { } @entries = $mesg->entries; my $dn = $entries[0]->dn; - $mesg = $c->model('user')->search("(&(objectClass=groupOfNames)(cn=$group))"); - @entries = $mesg->entries; + @entries = $mesg_group->entries; $entries[0]->add( 'member' => $dn )->update; $c->res->redirect("/admin/group_modify/$group"); } - $mesg = $c->model('user')->search("(&(objectClass=groupOfNames)(cn=$group))"); - if ( $mesg->entries gt 1 ) { - push @errors, $c->loc('More than one entry matched'); - $c->detach('/admin/group'); - } - $c->stash( group => $mesg->entry ); + + $c->stash( group => $mesg_group->entry ); } =head2 index -- cgit v1.2.1 From f40b65c3e1026f5cb96f705a92481ac38cb4c26c Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Thu, 21 Jul 2011 16:50:31 +0000 Subject: group the $mainrole related stuff together, check the permission after getting information on the role --- lib/CatDap/Controller/admin.pm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/CatDap/Controller/admin.pm b/lib/CatDap/Controller/admin.pm index 452efd9..dfea627 100644 --- a/lib/CatDap/Controller/admin.pm +++ b/lib/CatDap/Controller/admin.pm @@ -609,13 +609,13 @@ sub group : Local { sub group_modify : Local { my ( $self, $c, $group, $op, $attr, $value ) = @_; + $c->detach('/user/login') if not $c->user; + my $mainrole = 'account'; - if ( ! $c->check_user_roles('Account Admins') and ! $c->check_user_roles('Group Admins')) { - $c->forward('/user'); - } $mainrole = 'group' if (not $c->check_user_roles('Account Admins')); $c->stash( subpages => gensubpages($mainrole) ); + my @errors; my @entries; my $mesg; @@ -632,6 +632,10 @@ sub group_modify : Local { $c->detach('/admin/group'); } + if ( ! $c->check_user_roles('Account Admins') and ! $c->check_user_roles('Group Admins')) { + $c->forward('/user'); + } + if (defined $op and $op eq 'delete') { @entries = $mesg_group->entries; $entries[0]->delete( $attr => $value)->update; -- cgit v1.2.1 From 58cc2964a962b537e3d856775b9e451c65e10516 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Thu, 21 Jul 2011 16:50:34 +0000 Subject: fix the order of the regexp, as test complain --- lib/CatDap/Controller/admin.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/CatDap/Controller/admin.pm b/lib/CatDap/Controller/admin.pm index dfea627..e8771e6 100644 --- a/lib/CatDap/Controller/admin.pm +++ b/lib/CatDap/Controller/admin.pm @@ -621,7 +621,7 @@ sub group_modify : Local { my $mesg; $c->detach('/admin/group') if $group eq ''; - if ( $group !~ /^[\w\d- ]*$/ ) { + if ( $group !~ /^[-\w\d ]*$/ ) { push @errors, $c->loc('Group contains illegal characters'); $c->detach('/admin/group'); } -- cgit v1.2.1 From 403a3234914fbfe4f215ecefcfe3dbef95e6a16e Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Thu, 21 Jul 2011 17:10:36 +0000 Subject: let a user who is set as a owner of the group manage it --- lib/CatDap/Controller/admin.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/CatDap/Controller/admin.pm b/lib/CatDap/Controller/admin.pm index e8771e6..495a6a1 100644 --- a/lib/CatDap/Controller/admin.pm +++ b/lib/CatDap/Controller/admin.pm @@ -632,7 +632,12 @@ sub group_modify : Local { $c->detach('/admin/group'); } - if ( ! $c->check_user_roles('Account Admins') and ! $c->check_user_roles('Group Admins')) { + #FIXME I am sure that the code can be smaller and leaner + @entries = $mesg_group->entries; + @entries = $entries[0]->get_value('owner'); + my $is_owner = grep { $_ eq $c->user->ldap_entry->dn } @entries; + + if ( ! $is_owner and ! $c->check_user_roles('Account Admins') and ! $c->check_user_roles('Group Admins')) { $c->forward('/user'); } -- cgit v1.2.1 From ca484d71416a0b14585f1505d51ccde5c171a878 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Thu, 21 Jul 2011 19:29:27 +0000 Subject: fix the redirection --- lib/CatDap/Controller/admin.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/CatDap/Controller/admin.pm b/lib/CatDap/Controller/admin.pm index 495a6a1..5d9eed8 100644 --- a/lib/CatDap/Controller/admin.pm +++ b/lib/CatDap/Controller/admin.pm @@ -578,7 +578,7 @@ sub group : Local { $mainrole = 'group'; } else { - $c->res->forward('/user'); + $c->forward('/user'); } #$c->assert_any_user_role({['Account Admins','Group Admins']}); #$mainrole = 'account' if $c->check_user_roles('Account Admins'); -- cgit v1.2.1 From c392ddf66dc25dd598a5aae4fd2a4e100d6752f6 Mon Sep 17 00:00:00 2001 From: Romain d'Alverny Date: Wed, 27 Jul 2011 16:53:34 +0000 Subject: code layout --- lib/CatDap/Controller/user.pm | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) (limited to 'lib') diff --git a/lib/CatDap/Controller/user.pm b/lib/CatDap/Controller/user.pm index f2171eb..e6cc7a1 100644 --- a/lib/CatDap/Controller/user.pm +++ b/lib/CatDap/Controller/user.pm @@ -87,7 +87,7 @@ sub auto : Private { -cipher => 'Blowfish' ) or die $!; $c->session->{enc_password} = $cipher->encrypt($c->req->param('password') || $c->req->param('key')); - $c->response->cookies->{'key'} = { value => $key, expires => '+10m' }; + $c->response->cookies->{'key'} = { value => $key, expires => '+10m' }; $c->stash(pages => roles2pages($c->user->roles)); $c->session->{dn} = $c->user->ldap_entry->dn; $c->session->{user} = $c->req->param('username'); @@ -103,7 +103,7 @@ sub auto : Private { $password = $cipher->decrypt($c->session->{enc_password}); $c->log->debug("Re-authenticating user " . $c->user->username); $c->authenticate({username => $c->user->username,password => $password}); - $c->res->cookies->{'key'} = {value => $key, expires => '+10m'}; + $c->res->cookies->{'key'} = {value => $key, expires => '+10m'}; $c->stash(pages => roles2pages($c->user->roles)); $c->log->info($@) if $@; @@ -279,29 +279,28 @@ sub password : Local { my ($mesg,$newpass,$cipher); $c->stash(subpages => gensubpages()); if ( not defined $c->req->param('password') or not defined $c->req->param('newpassword1') or not defined $c->req->param('newpassword2')) { - -#if ( not defined $c->req->param('newpassword1') or not defined $c->req->param('newpassword2')) { + #if ( not defined $c->req->param('newpassword1') or not defined $c->req->param('newpassword2')) { $c->detach; } # Re-authenticate to check the user has the right password if (not $c->authenticate({ - 'username' => $c->user->username, - 'password' => $c->req->param('password'), - }) - ) { - $c->stash(errors => [ $c->loc('Password incorrect') ]); - $c->detach; + 'username' => $c->user->username, + 'password' => $c->req->param('password'), + }) + ) { + $c->stash(errors => [ $c->loc('Password incorrect') ]); + $c->detach; } if ($c->req->param('newpassword1') eq $c->req->param('newpassword2')) { $newpass = $c->req->param('newpassword1'); } else { push @{${$c->stash}{'errors'}},$c->loc('New passwords dont match'); - $c->detach; + $c->detach; } my $pp = Net::LDAP::Control::PasswordPolicy->new; $mesg = $c->model('User')->set_password( - #oldpasswd => $c->req->param('password'), + #oldpasswd => $c->req->param('password'), newpasswd => $newpass, control => [ $pp ], ); @@ -319,7 +318,7 @@ sub password : Local { ) or die $!; $c->session->{enc_password} = $cipher->encrypt($newpass); push @{${$c->stash}{'errors'}},"Password change succeeded"; - #$c->res->redirect('/user'); + #$c->res->redirect('/user'); } } @@ -336,17 +335,17 @@ sub firstlogin : Local { username => $c->req->param('username'), password => $c->req->param('key')}) ) { $c->stash(errors => ['An error occurred']); - $c->log->info("Failed to authenticate user in first login: " . $c->req->param('key')); + $c->log->info("Failed to authenticate user in first login: " . $c->req->param('key')); $c->res->redirect('/user'); - } - # cache password for next request with form data + } + # cache password for next request with form data my $keyprefix = $self->get_keyprefix($c); - my $key = Data::UUID->new->create_str(); + my $key = Data::UUID->new->create_str(); $cipher = Crypt::CBC->new( -key => $keyprefix . $key, -cipher => 'Blowfish' ) or die $!; $c->session->{enc_password} = $cipher->encrypt($c->req->param('key')); - $c->response->cookies->{'key'} = { value => $key, expires => '+10m' }; + $c->response->cookies->{'key'} = { value => $key, expires => '+10m' }; $c->detach; } @@ -364,7 +363,7 @@ sub firstlogin : Local { ) or die $!; my $password = $cipher->decrypt($c->session->{enc_password}); $c->authenticate({username => $c->req->param('username'),password => $password}) - or $c->log->info("Authenticating user for first password change failed"); + or $c->log->info("Authenticating user for first password change failed"); my $pp = Net::LDAP::Control::PasswordPolicy->new; $mesg = $c->model('User')->set_password( -- cgit v1.2.1 From 436ffc9179be8229f6315dfe3a7dffa266b2209d Mon Sep 17 00:00:00 2001 From: Dimitrios Glentadakis Date: Sat, 18 Feb 2012 21:01:31 +0000 Subject: Add Greek translation --- lib/CatDap/I18N/el.po | 449 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 449 insertions(+) create mode 100644 lib/CatDap/I18N/el.po (limited to 'lib') diff --git a/lib/CatDap/I18N/el.po b/lib/CatDap/I18N/el.po new file mode 100644 index 0000000..b289ce5 --- /dev/null +++ b/lib/CatDap/I18N/el.po @@ -0,0 +1,449 @@ +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Dimitrios Glentadakis , 2012. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2012-02-18 21:59+0100\n" +"Last-Translator: Dimitrios Glentadakis \n" +"Language-Team: Greek \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: el\n" +"X-Generator: Lokalize 1.2\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: lib/CatDap/Controller/register.pm:134 +msgid "Activation" +msgstr "Ενεργοποίηση" + +#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11 root/admin/account_modify.tt:24 root/admin/group_modify.tt:21 root/user/index.tt:19 root/user/index.tt:48 +msgid "Add" +msgstr "Προσθήκη" + +#: root/admin/account_modify.tt:85 +msgid "Add ObjectClass" +msgstr "Προσθήκη ενός ObjectClass" + +#: root/admin/account_modify.tt:47 +msgid "Add attribute" +msgstr "Προσθήκη ιδιότητας" + +#. (uid) +#: root/admin/account_group.tt:1 +msgid "Add user %1 to a new group" +msgstr "Προσθήκη του χρήστη %1 σε μια νέα ομάδα" + +#. (oc, dn) +#: root/admin/account_addoc.tt:1 +msgid "Adding objectclass %1 to dn %2" +msgstr "Προσθήκη του objectclass %1 στο dn %2" + +#: lib/CatDap/Controller/register.pm:50 +msgid "Addresses do not match" +msgstr "Οι διευθύνσεις δεν ταιριάζουν" + +#: lib/CatDap/Controller/register.pm:90 +msgid "An account already exists with this email address" +msgstr "Υπάρχει ήδη ένας λογαριασμός με αυτή τη διεύθυνση ηλ. αλληλογραφίας" + +#: lib/CatDap/Controller/register.pm:95 +msgid "An account already exists with this username" +msgstr "Υπάρχει ήδη ένας λογαριασμός με αυτό το όνομα χρήστη" + +#. ($errors) +#: lib/CatDap/Controller/register.pm:146 +msgid "" +"An error occured sending the email, but your account was created. Please try " +"the password recovery process if you entered the correct email address. " +"Errors %1" +msgstr "" +"Παρουσιάστηκε ένα σφάλμα κατά την αποστολή του μηνύματος ηλ. αλληλογραφίας, " +"αλλά ο λογαριασμός σας έχει δημιουργηθεί. Μπορείτε να χρησιμοποιήσετε την " +"λειτουργία " +"ανάκτησης του κωδικού πρόσβασης αν η διεύθυνσή σας είναι σωστή. Σφάλματα %1" + +#. ($errors) +#: lib/CatDap/Controller/admin.pm:562 +msgid "" +"An error occured sending the email, but your account was created. Please try " +"the password recovery process if you entered the correct email address: %1" +msgstr "" +"Παρουσιάστηκε ένα σφάλμα κατά την αποστολή του μηνύματος ηλ αλληλογραφίας, " +"αλλά ο λογαριασμός σας έχει δημιουργηθεί. Μπορείτε να χρησιμοποιήσετε την " +"λειτουργία " +"ανάκτησης του κωδικού πρόσβασης αν η διεύθυνσή σας είναι σωστή: %1" + +#. ($errors) +#: lib/CatDap/Controller/forgot_password.pm:110 +msgid "An error occured sending the email, please try again later. Errors %1" +msgstr "" +"Παρουσιάστηκε ένα σφάλμα κατά την αποστολή του μηνύματος ηλ. αλληλογραφίας, " +"παρακαλώ προσπαθήστε ξανά αργότερα. Σφάλματα %1" + +#: root/admin/account_addoc.tt:9 root/admin/account_modify.tt:8 root/admin/group_modify.tt:5 root/user/index.tt:4 +msgid "Attribute" +msgstr "Ιδιότητα" + +#: lib/CatDap/Controller/register.pm:57 +msgid "Cannot check /etc/passwd, please warn system administrators" +msgstr "" +"Αδύνατος ο έλεγχος του /etc/passwd, παρακαλώ ειδοποιείστε τους διαχειριστές " +"του συστήματος" + +#: root/register/index.tt:29 +msgid "Captcha" +msgstr "Captcha" + +#: root/user/firstlogin.tt:14 root/user/password.tt:15 +msgid "Change" +msgstr "Αλλαγή" + +#: root/user/fake.tt:2 +msgid "Change password" +msgstr "Αλλαγή κωδικού πρόσβασης" + +#: root/register/complete.tt:5 +msgid "Check your mail for activation instructions." +msgstr "" +"Ελέγξτε την ηλεκτρονική σας αλληλογραφία για τις οδηγίες ενεργοποίησης." + +#: root/forgot_password/complete.tt:5 +msgid "Check your mail for password reset instructions." +msgstr "Ελέγξτε την ηλεκτρονική σας αλληλογραφία για τις οδηγίες επαναφοράς." + +#: root/register/index.tt:24 +msgid "Confirm Email address" +msgstr "Επιβεβαιώστε την διεύθυνση της ηλ.αλληλογραφίας" + +#: root/user/password.tt:5 +msgid "Current password" +msgstr "Τρέχων κωδικός πρόσβασης" + +#. (cn) +#. (entry.cn) +#: root/email/activation.tt:1 root/email/admin/password.tt:1 root/email/forgot_password.tt:1 +msgid "Dear %1," +msgstr "Αγαπητέ/ή %1," + +#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27 root/user/index.tt:22 +msgid "Delete" +msgstr "Διαγραφή" + +#. (uid) +#: root/admin/account_group.tt:17 +msgid "Delete user %1 from an existing group:" +msgstr "Διαγραφή του χρήστη %1 από μια υπάρχουσα ομάδα:" + +#: root/user/fake.tt:1 +msgid "Edit" +msgstr "Επεξεργασία" + +#: root/admin/account.tt:8 root/register/index.tt:20 +msgid "Email" +msgstr "Ηλ. αλληλογραφία" + +#: root/forgot_password/index.tt:8 root/register/index.tt:21 +msgid "Email address" +msgstr "Διεύθυνση ηλ. αλληλογραφίας" + +#: root/forgot_password/complete.tt:1 +msgid "Email sent." +msgstr "Η ηλ. αλληλογραφία εστάλη" + +#: root/forgot_password/confirm.tt:2 +msgid "Enter new password." +msgstr "Εισάγετε νέο κωδικό πρόσβασης." + +#: root/register/index.tt:32 +msgid "Enter text" +msgstr "Εισάγετε κείμενο" + +#: lib/CatDap/Controller/forgot_password.pm:62 lib/CatDap/Controller/forgot_password.pm:76 +msgid "Error while searching for account: " +msgstr "Σφάλμα κατά την αναζήτηση του λογαριασμού" + +#: root/register/index.tt:13 +msgid "First name" +msgstr "Όνομα" + +#: root/forgot_password/index.tt:2 +msgid "Forgot your password?" +msgstr "Ξεχάσατε τον κωδικό σας;" + +#: lib/CatDap/Controller/forgot_password.pm:98 +msgid "Forgotten password" +msgstr "Έχω ξεχάσει τον κωδικό πρόσβασης" + +#: root/index.tt:17 +msgid "Forgotten password?" +msgstr "Έχετε ξεχάσει τον κωδικό πρόσβασης;" + +#: root/admin/account.tt:9 +msgid "Full Name" +msgstr "Ονοματεπώνυμο" + +#: root/admin/group.tt:28 +msgid "Group Name" +msgstr "Όνομα ομάδας" + +#: lib/CatDap/Controller/admin.pm:624 +msgid "Group contains illegal characters" +msgstr "Το όνομα ομάδας περιέχει μη έγκυρους χαρακτήρες" + +#: root/admin/group.tt:9 +msgid "Group name" +msgstr "Όνομα ομάδας" + +#: root/admin/account_modify.tt:2 +msgid "Groups" +msgstr "Ομάδες" + +#: lib/CatDap/Controller/admin.pm:598 +msgid "Groups matching search criteria" +msgstr "Ομάδες που ταιριάζουν με τα κριτήρια αναζήτησης" + +#: lib/CatDap/Controller/admin.pm:591 +msgid "Groups you manage" +msgstr "Ομάδες που διαχειρίζεστε" + +#: lib/CatDap/Controller/register.pm:53 +msgid "Incorrect validation text, please try again" +msgstr "Λάθος κείμενο επικύρωσης, παρακαλώ προσπαθήστε ξανά" + +#: lib/CatDap/Controller/forgot_password.pm:45 lib/CatDap/Controller/register.pm:47 +msgid "Invalid email address" +msgstr "Μη έγκυρη διεύθυνση ηλ. αλληλογραφίας" + +#: lib/CatDap/Controller/register.pm:43 +msgid "Invalid username" +msgstr "Μη έγκυρο όνομα χρήστη" + +#: lib/CatDap/Controller/register.pm:60 +msgid "Invalid username, already used by system" +msgstr "Μη έγκυρο όνομα χρήστη, χρησιμοποιείται ήδη από το σύστημα" + +#: root/admin/account_promote.tt:3 +msgid "List of users promoted :" +msgstr "Λίστα προωθημένων χρηστών:" + +#: root/template/header:10 root/user/fake.tt:3 +msgid "Log out" +msgstr "Αποσύνδεση" + +#: root/index.tt:1 root/index.tt:13 +msgid "Login" +msgstr "Σύνδεση" + +#: lib/CatDap/Controller/admin.pm:185 +msgid "More than one ID Pool" +msgstr "" + +#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652 +msgid "More than one entry matched" +msgstr "Ταιριάζουν περισσότερες από μια καταχωρήσεις" + +#: root/forgot_password/confirm.tt:8 root/user/firstlogin.tt:5 root/user/password.tt:9 +msgid "New Password" +msgstr "Νέος κωδικός πρόσβασης" + +#: lib/CatDap/Controller/user.pm:299 +msgid "New passwords dont match" +msgstr "Οι νέοι κωδικοί πρόσβασης δεν ταιριάζουν" + +#: root/forgot_password/complete.tt:4 +msgid "Operation was successful." +msgstr "Η διεργασία ήταν επιτυχής." + +#: root/index.tt:10 +msgid "Password : " +msgstr "Κωδικός πρόσβασης: " + +#: lib/CatDap/Controller/user.pm:293 +msgid "Password incorrect" +msgstr "Λανθασμένος κωδικός πρόσβασης" + +#: lib/CatDap/Controller/admin.pm:565 +msgid "Password reset and email sent" +msgstr "Επαναφορά κωδικού πρόσβασης, εστάλη ηλ. αλληλογραφία" + +#: lib/CatDap/Controller/admin.pm:535 +msgid "Password reset failed: " +msgstr "Αποτυχία επαναφοράς κωδικού πρόσβασης: " + +#: root/register/index.tt:12 +msgid "Personal Information" +msgstr "Προσωπικές πληροφορίες" + +#: root/email/admin/password.tt:5 +msgid "Please click below to change your password" +msgstr "Παρακαλώ κάντε κλικ παρακάτω για να αλλάξετε τον κωδικό σας" + +#: root/admin/index.tt:1 +msgid "Please use the menus above." +msgstr "Παρακαλώ χρησιμοποιήστε τα ανωτέρω μενού." + +#: root/admin/account_promote.tt:24 +msgid "Primary group" +msgstr "Κύρια ομάδα" + +#: lib/CatDap/Controller/forgot_password.pm:82 +msgid "Privileged accounts may not recover passwords via this mechanism" +msgstr "" +"Οι λογαριασμοί με προνόμια δεν μπορούν να ανακτήσουν τους κωδικούς τους " +"πρόσβασης μέσω αυτού του μηχανισμού " + +#: root/admin/account_modify.tt:71 +msgid "Promote" +msgstr "Προώθησε" + +#: root/admin/account_modify.tt:62 +msgid "Promote user to posixAccount with primary group:" +msgstr "" + +#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35 +msgid "Register" +msgstr "Εγγραφή" + +#: root/register/complete.tt:1 +msgid "Registration completed" +msgstr "Η εγγραφή ολοκληρώθηκε" + +#: root/register/complete.tt:4 +msgid "Registration was successful." +msgstr "Η εγγραφή ολοκληρώθηκε με επιτυχία." + +#: root/forgot_password/confirm.tt:11 root/user/firstlogin.tt:10 root/user/password.tt:12 +msgid "Repeat New Password" +msgstr "Επαναλάβετε το νέο κωδικό πρόσβασης" + +#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12 +msgid "Reset password" +msgstr "Επαναφορά κωδικού πρόσβασης" + +#: root/admin/account.tt:22 +msgid "Search" +msgstr "Αναζήτηση" + +#: root/admin/account.tt:4 root/admin/group.tt:5 +msgid "Search by" +msgstr "Αναζήτηση ανά" + +#: root/forgot_password/confirm.tt:16 +msgid "Set new password" +msgstr "Ορισμός νέου κωδικού πρόσβασης" + +#: root/register/check.tt:1 +msgid "Success" +msgstr "Επιτυχία" + +#: root/admin/account.tt:10 root/register/index.tt:16 +msgid "Surname" +msgstr "Επώνυμο" + +#: lib/CatDap/Controller/register.pm:71 +msgid "The first name supplied contains illegal characters" +msgstr "Το προτεινόμενο όνομα περιέχει απαγορευμένους χαρακτήρες" + +#: lib/CatDap/Controller/register.pm:76 +msgid "The surname supplied contains illegal characters" +msgstr "Το προτεινόμενο επίθετο περιέχει απαγορευμένους χαρακτήρες" + +#: lib/CatDap/Controller/forgot_password.pm:67 +msgid "This email address is not bound to an account" +msgstr "" + +#: root/email/activation.tt:3 +msgid "To activate your account, please follow the link below." +msgstr "" +"Για να ενεργοποιήσετε τον λογαριασμό σας, παρακαλώ ακολουθείστε τον παρακάτω " +"δεσμό." + +#: root/email/forgot_password.tt:3 +msgid "To reset your password, please follow the link below." +msgstr "" +"Για επαναφορά του κωδικού πρόσβασης, παρακαλώ ακολουθήστε τον παρακάτω δεσμό." + +#: lib/CatDap/Controller/admin.pm:528 +msgid "Transaction ID mismatch" +msgstr "" + +#: root/admin/account_modify.tt:35 root/user/index.tt:29 +msgid "Update" +msgstr "Ενημέρωση" + +#: root/admin/account.tt:7 root/register/index.tt:7 root/register/index.tt:8 +msgid "Username" +msgstr "Όνομα χρήστη" + +#: root/index.tt:6 +msgid "Username : " +msgstr "Όνομα χρήστη: " + +#: lib/CatDap/Controller/register.pm:66 +msgid "Username is not authorized to be used" +msgstr "Αυτό το όνομα χρήστη δεν επιτρέπεται" + +#: root/admin/account_addoc.tt:10 root/admin/account_modify.tt:9 root/admin/group_modify.tt:6 root/user/index.tt:4 +msgid "Value" +msgstr "Τιμή" + +#. (c.config.organisation) +#: root/email/forgot_password.tt:2 +msgid "" +"Your %1 account has been requested to change the password. If you did not do " +"this, or you do not want to change your password; you can just do nothing." +msgstr "" +"Απεστάλη μια αίτηση για αλλαγή του κωδικού πρόσβασης του λογαριασμού σας %1. " +"Αν δεν είσαστε ο αιτών, ή αν δεν επιθυμείτε την αλλαγή του κωδικού σας " +"πρόσβασης, απλά αγνοήστε αυτό το μήνυμα." + +#. (c.config.organisation) +#: root/email/activation.tt:2 +msgid "Your %1 account has been successfully created, but requires activation." +msgstr "Ο λογαριασμός σας %1 έχει δημιουργηθεί αλλά απαιτείται ενεργοποίηση." + +#. (c.user.username) +#: root/email/admin/password.tt:3 +msgid "Your password was reset by %1" +msgstr "Έγινε επαναφορά του κωδικού πρόσβασης από %1" + +#: lib/CatDap/Controller/user.pm:61 +msgid "Your session has expired" +msgstr "Η συνεδρία σας έχει λήξει" + +#: root/admin/account.tt:15 root/admin/group.tt:15 +msgid "contains" +msgstr "περιέχει" + +#: root/admin/group_modify.tt:15 +msgid "delete" +msgstr "διαγραφή" + +#: root/admin/account.tt:17 root/admin/group.tt:17 +msgid "greater than or equal to" +msgstr "μεγαλύτερο ή ίσο από" + +#: root/admin/account.tt:16 root/admin/group.tt:16 +msgid "is exactly" +msgstr "είναι ακριβώς" + +#: root/admin/account.tt:18 root/admin/group.tt:18 +msgid "less than" +msgstr "λιγότερο από" + +#: root/admin/group.tt:10 +msgid "member" +msgstr "μέλος" + +#: lib/CatDap/Controller/admin.pm:549 +msgid "password reset" +msgstr "επαναφορά κωδικού πρόσβασης" + +#: root/admin/account_modify.tt:53 +msgid "with value" +msgstr "με την τιμή" + -- cgit v1.2.1 From a0e13a7a516981e93c14fcb0f3b9c6bb191a060b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 23 Feb 2012 15:43:38 +0000 Subject: Uploaded all the French translations from Transifex --- lib/CatDap/I18N/fr.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/CatDap/I18N/fr.po b/lib/CatDap/I18N/fr.po index db15c17..5f71e71 100644 --- a/lib/CatDap/I18N/fr.po +++ b/lib/CatDap/I18N/fr.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Identity / CatDap\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: 2011-04-30 21:00+0000\n" -"Last-Translator: Rémi Verschelde \n" +"PO-Revision-Date: 2012-02-23 14:11+0000\n" +"Last-Translator: Michael Scherer \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" @@ -203,7 +203,7 @@ msgstr "Se déconnecter" #: root/index.tt:1 root/index.tt:13 msgid "Login" -msgstr "Identifiant" +msgstr "Connexion" #: root/forgot_password/confirm.tt:8 root/user/firstlogin.tt:5 #: root/user/password.tt:9 -- cgit v1.2.1 From c2dcd09fc1847c14ba3229343661bcdb026eec45 Mon Sep 17 00:00:00 2001 From: Matteo Pasotti Date: Thu, 22 Mar 2012 18:21:31 +0000 Subject: updated italian translation (charset fixed) --- lib/CatDap/I18N/it.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/CatDap/I18N/it.po b/lib/CatDap/I18N/it.po index 03fc003..c565f25 100644 --- a/lib/CatDap/I18N/it.po +++ b/lib/CatDap/I18N/it.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: Oliver Burger \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -- cgit v1.2.1 From 70c9443f69df8abb3b48629eab16e5870d867806 Mon Sep 17 00:00:00 2001 From: Marek Laane Date: Tue, 24 Apr 2012 22:54:34 +0000 Subject: Updated Estonian translation. --- lib/CatDap/I18N/et.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/CatDap/I18N/et.po b/lib/CatDap/I18N/et.po index 3489279..72f1691 100644 --- a/lib/CatDap/I18N/et.po +++ b/lib/CatDap/I18N/et.po @@ -1,12 +1,12 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # -# Marek Laane , 2011. +# Marek Laane , 2011,2012. msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: 2011-02-17 14:58+0200\n" +"PO-Revision-Date: 2012-04-25 01:54+0200\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" "MIME-Version: 1.0\n" @@ -71,7 +71,7 @@ msgstr "" #. ($errors) #: lib/CatDap/Controller/forgot_password.pm:110 msgid "An error occured sending the email, please try again later. Errors %1" -msgstr "Kirja saatmisel tekkist tõrge, palun proovige hiljem uuesti. Tõrked %1" +msgstr "Kirja saatmisel tekkis tõrge, palun proovige hiljem uuesti. Tõrked %1" #: root/admin/account_addoc.tt:9 root/admin/account_modify.tt:8 root/admin/group_modify.tt:5 root/user/index.tt:4 msgid "Attribute" -- cgit v1.2.1