[Jifty-commit] r5825 - in jifty/trunk: . lib/Jifty/Plugin/Authentication lib/Jifty/Plugin/Authentication/Ldap plugins/Authentication-Ldap plugins/Authentication-Ldap/lib plugins/Authentication-Ldap/lib/Jifty plugins/Authentication-Ldap/lib/Jifty/Plugin plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Mixin plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Mixin/Model plugins/Authentication-Ldap/t share/po
Jifty commits
jifty-commit at lists.jifty.org
Sat Sep 13 11:24:33 EDT 2008
Author: yves
Date: Sat Sep 13 11:24:32 2008
New Revision: 5825
Added:
jifty/trunk/plugins/Authentication-Ldap/
jifty/trunk/plugins/Authentication-Ldap/Makefile.PL
jifty/trunk/plugins/Authentication-Ldap/lib/
jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/
jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/Plugin/
jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/
jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/
jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap.pm
jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/
jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm
jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogout.pm
jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Dispatcher.pm
jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Mixin/
jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Mixin/Model/
jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Mixin/Model/User.pm
jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm
jifty/trunk/plugins/Authentication-Ldap/t/
jifty/trunk/plugins/Authentication-Ldap/t/00-load.t
Removed:
jifty/trunk/lib/Jifty/Plugin/Authentication/Ldap/
jifty/trunk/lib/Jifty/Plugin/Authentication/Ldap.pm
Modified:
jifty/trunk/Makefile.PL
jifty/trunk/share/po/en.po
jifty/trunk/share/po/fr.po
jifty/trunk/share/po/ja.po
jifty/trunk/share/po/ro.po
jifty/trunk/share/po/ru.po
jifty/trunk/share/po/zh_cn.po
jifty/trunk/share/po/zh_tw.po
Log:
* move Authentication::Ldap to plugins/
* update po file to not lose current translations
Modified: jifty/trunk/Makefile.PL
==============================================================================
--- jifty/trunk/Makefile.PL (original)
+++ jifty/trunk/Makefile.PL Sat Sep 13 11:24:32 2008
@@ -174,14 +174,6 @@
recommends('Devel::Gladiator'),
recommends('Proc::ProcessTable'),
],
- 'Ldap Plugin' => [
- -default => 0,
- recommends('Net::LDAP')
- ],
-# 'CAS Plugin' => [
-# -default => 0,
-# recommends('Authen::CAS::Client')
-# ],
'Improved halos' => [
-default => 0,
recommends('Template::Declare' => '0.28'),
@@ -209,7 +201,12 @@
install_script('bin/jifty');
install_share;
-# ls plugins -> Authentication-CAS Multipage TabView
+# INSTALLDIRS need to be set before Makefile if you want to change default install path
+# debian packaging use :
+# INSTALLDIRS=vendor $(PERL) Makefile.PL --skipdeps INSTALLDIRS=vendor
+#
+# TODO?: JIFTY_PLUGINS=ALL
+# ls plugins -> Authentication-CAS Authentication-Ldap Multipage TabView
my @plugins = defined $ENV{JIFTY_PLUGINS} ? split(/ /, $ENV{JIFTY_PLUGINS}) : qw(TabView);
# Test all of our sub-dist tests too
Added: jifty/trunk/plugins/Authentication-Ldap/Makefile.PL
==============================================================================
--- (empty file)
+++ jifty/trunk/plugins/Authentication-Ldap/Makefile.PL Sat Sep 13 11:24:32 2008
@@ -0,0 +1,10 @@
+use inc::Module::Install 0.46;
+name('Authentication-Ldap');
+#version_from('lib/Jifty/Plugin/Authentication/CAS.pm');
+version_from('../../lib/Jifty.pm');
+
+requires('Net::LDAP');
+
+&auto_install();
+
+WriteAll;
Added: jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap.pm
==============================================================================
--- (empty file)
+++ jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap.pm Sat Sep 13 11:24:32 2008
@@ -0,0 +1,119 @@
+use strict;
+use warnings;
+
+package Jifty::Plugin::Authentication::Ldap;
+use base qw/Jifty::Plugin/;
+
+=head1 NAME
+
+Jifty::Plugin::Authentication::Ldap - ldap authentication plugin
+
+=head1 DESCRIPTION
+
+B<CAUTION:> This plugin is experimental.
+
+This may be combined with the L<Jifty::Plugin::User> plugin to provide user accounts and ldap password authentication to your application.
+
+in etc/config.yml
+
+ Plugins:
+ - Login: {}
+ - Authentication::Ldap:
+ LDAPhost: ldap.univ.fr # ldap server
+ LDAPbase: ou=people,dc=..... # base ldap
+ LDAPName: displayname # name to be displayed (cn givenname)
+ LDAPMail: mailLocalAddress # email used optionnal
+ LDAPuid: uid # optional
+
+
+
+=head2 METHODS
+
+=head2 prereq_plugins
+
+This plugin depends on the L<User|Jifty::Plugin::User> plugin.
+
+=cut
+
+
+sub prereq_plugins {
+ return ('User');
+}
+
+use Net::LDAP;
+
+
+my ($LDAP, %params);
+
+=head2 init
+
+read etc/config.yml
+
+=cut
+
+sub init {
+ my $self = shift;
+ my %args = @_;
+
+ $params{'Hostname'} = $args{LDAPhost};
+ $params{'base'} = $args{LDAPbase} or die "Need LDAPbase in plugin config";
+ $params{'uid'} = $args{LDAPuid} || "uid";
+ $params{'email'} = $args{LDAPMail} || "";
+ $params{'name'} = $args{LDAPName} || "cn";
+ $LDAP = Net::LDAP->new($params{Hostname},async=>1,onerror => 'undef', debug => 0)
+ or die "Can't connect to LDAP server ",$params{Hostname};
+}
+
+sub LDAP {
+ return $LDAP;
+}
+
+sub base {
+ return $params{'base'};
+}
+
+sub uid {
+ return $params{'uid'};
+}
+
+sub email {
+ return $params{'email'};
+};
+
+sub name {
+ return $params{'name'};
+};
+
+
+
+sub get_infos {
+ my ($self,$user) = @_;
+
+ my $result = $self->LDAP()->search (
+ base => $self->base(),
+ filter => '(uid= '.$user.')',
+ attrs => [$self->name(),$self->email()],
+ sizelimit => 1
+ );
+ $result->code && Jifty->log->error( 'LDAP uid=' . $user . ' ' . $result->error );
+ my ($ret) = $result->entries;
+ my $name = $ret->get_value($self->name());
+ my $email = $ret->get_value($self->email());
+
+ return ({ name => $name, email => $email });
+};
+
+
+
+=head1 SEE ALSO
+
+L<Jifty::Manual::AccessControl>, L<Jifty::Plugin::User>, L<Net::LDAP>
+
+=head1 LICENSE
+
+Jifty is Copyright 2005-2007 Best Practical Solutions, LLC.
+Jifty is distributed under the same terms as Perl itself.
+
+=cut
+
+1;
Added: jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm
==============================================================================
--- (empty file)
+++ jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm Sat Sep 13 11:24:32 2008
@@ -0,0 +1,141 @@
+use warnings;
+use strict;
+
+=head1 NAME
+
+Jifty::Plugin::Authentication::Ldap::Action::LDAPLogin - process LDAP login plugin
+
+=cut
+
+package Jifty::Plugin::Authentication::Ldap::Action::LDAPLogin;
+use base qw/Jifty::Action/;
+
+
+=head1 ARGUMENTS
+
+Return the login form field
+
+=cut
+
+use Jifty::Param::Schema;
+use Jifty::Action schema {
+ param ldap_id =>
+ label is _('Login'),
+ is mandatory;
+# is ajax_validates;
+ param password =>
+ type is 'password',
+ label is _('Password'),
+ is mandatory;
+};
+
+=head2 validate_name NAME
+
+For ajax_validates.
+Makes sure that the name submitted is a legal login.
+
+
+=cut
+
+sub validate_ldap_id {
+ my $self = shift;
+ my $name = shift;
+
+ unless ( $name =~ /^[A-Za-z0-9-]+$/ ) {
+ return $self->validation_error(
+ name => _("That doesn't look like a valid login.") );
+ }
+
+
+ return $self->validation_ok('name');
+}
+
+
+=head2 take_action
+
+Bind on ldap to check the user's password. If it's right, log them in.
+Otherwise, throw an error.
+
+
+=cut
+
+sub take_action {
+ my $self = shift;
+ my $username = $self->argument_value('ldap_id');
+ my ($plugin) = Jifty->find_plugin('Jifty::Plugin::Authentication::Ldap');
+ my $dn = $plugin->uid().'='.$username.','.
+ $plugin->base();
+
+ Jifty->log->debug( "dn = $dn" );
+
+ # Bind on ldap
+ my $msg = $plugin->LDAP()->bind($dn ,'password' =>$self->argument_value('password'));
+
+
+ if ($msg->code) {
+ $self->result->error(
+ _('You may have mistyped your login or password. Give it another shot?')
+ );
+ Jifty->log->error( "LDAP bind $dn " . $msg->error . "" );
+ return;
+ }
+
+ # Load up the user
+ my $infos = $plugin->get_infos($username);
+ my $name = $infos->{name};
+ my $email = $infos->{email};
+
+ my $current_user = Jifty->app_class('CurrentUser');
+ my $user = ($email)
+ ? $current_user->new( email => $email) # load by email to mix authentication
+ : $current_user->new( ldap_id => $username ); # else load by ldap_id
+
+
+ # Autocreate the user if necessary
+ if ( not $user->id ) {
+ my $action = Jifty->web->new_action(
+ class => 'CreateUser',
+ current_user => $current_user->superuser,
+ arguments => {
+ ldap_id => $username
+ }
+ );
+ $action->run;
+
+ if ( not $action->result->success ) {
+ # Should this be less "friendly"?
+ $self->result->error(_("Sorry, something weird happened (we couldn't create a user for you). Try again later."));
+ return;
+ }
+
+ $user = $current_user->new( ldap_id => $username );
+ }
+
+ my $u = $user->user_object;
+
+ # Update, just in case
+ $u->__set( column => 'name', value => $name );
+ $u->__set( column => 'email', value => $email );
+
+
+ # Login!
+ Jifty->web->current_user( $user );
+ Jifty->web->session->set_cookie;
+
+ # Success!
+ $self->report_success;
+
+ return 1;
+};
+
+=head2 report_success
+
+=cut
+
+sub report_success {
+ my $self = shift;
+ $self->result->message(_("Hi %1!", Jifty->web->current_user->user_object->name ));
+};
+
+
+1;
Added: jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogout.pm
==============================================================================
--- (empty file)
+++ jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogout.pm Sat Sep 13 11:24:32 2008
@@ -0,0 +1,35 @@
+use warnings;
+use strict;
+
+=head1 NAME
+
+Jifty::Plugin::Authentication::Ldap::Action::LDAPLogout - process LDAP logout plugin
+
+=cut
+
+package Jifty::Plugin::Authentication::Ldap::Action::LDAPLogout;
+use base qw/Jifty::Action/;
+
+=head2 arguments
+
+Return the email and password form fields
+
+=cut
+
+sub arguments {
+ return ( {} );
+}
+
+=head2 take_action
+
+Nuke the current user object
+
+=cut
+
+sub take_action {
+ my $self = shift;
+ Jifty->web->current_user(undef);
+ return 1;
+}
+
+1;
Added: jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Dispatcher.pm
==============================================================================
--- (empty file)
+++ jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Dispatcher.pm Sat Sep 13 11:24:32 2008
@@ -0,0 +1,32 @@
+use strict;
+use warnings;
+
+package Jifty::Plugin::Authentication::Ldap::Dispatcher;
+use Jifty::Dispatcher -base;
+
+# Put any plugin-specific dispatcher rules here.
+
+# Log out
+before 'ldaplogout' => run {
+ Jifty->web->request->add_action(
+ class => 'LDAPLogout',
+ moniker => 'ldaplogout',
+ );
+};
+
+
+# Login
+on 'ldaplogin' => run {
+ set 'action' =>
+ Jifty->web->new_action(
+ class => 'LDAPLogin',
+ moniker => 'ldaploginbox'
+ );
+ set 'next' => Jifty->web->request->continuation
+ || Jifty::Continuation->new(
+ request => Jifty::Request->new( path => "/" ) );
+};
+
+
+
+1;
Added: jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Mixin/Model/User.pm
==============================================================================
--- (empty file)
+++ jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Mixin/Model/User.pm Sat Sep 13 11:24:32 2008
@@ -0,0 +1,36 @@
+package Jifty::Plugin::Authentication::Ldap::Mixin::Model::User;
+use strict;
+use warnings;
+use Jifty::DBI::Schema;
+use base 'Jifty::DBI::Record::Plugin';
+use URI;
+
+=head1 NAME
+
+Jifty::Plugin::Authentication::Ldap::Mixin::Model::User - Ldap mixin with User model
+
+=head1 DESCRIPTION
+
+L<Jifty::Plugin::Authentication::Ldap> mixin for the User model. Provides an 'ldap_id' column.
+
+=cut
+
+our @EXPORT = qw(has_alternative_auth);
+
+use Jifty::Plugin::Authentication::Ldap::Record schema {
+
+column ldap_id =>
+ type is 'text',
+ label is 'Ldap ID',
+ is distinct,
+ is immutable;
+
+};
+
+=head2 has_alternative_auth
+
+=cut
+
+sub has_alternative_auth { 1 }
+
+1;
Added: jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm
==============================================================================
--- (empty file)
+++ jifty/trunk/plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm Sat Sep 13 11:24:32 2008
@@ -0,0 +1,50 @@
+use utf8;
+use warnings;
+use strict;
+
+=head1 NAME
+
+Jifty::Plugin::Authentication::Ldap::View - provides templates for the pages and forms used by the ldap authentication plugin.
+
+=cut
+
+package Jifty::Plugin::Authentication::Ldap::View;
+use Jifty::View::Declare -base;
+
+{ no warnings 'redefine';
+sub page (&;$) {
+ no strict 'refs';
+ BEGIN {Jifty::Util->require(Jifty->app_class('View'))};
+ Jifty->app_class('View')->can('page')->(@_);
+}
+}
+
+template ldaplogin => page { title => _('Login!') } content {
+ show('/ldaplogin_widget');
+};
+
+
+template ldaplogin_widget => sub {
+# title is _("Login with your Ldap account")
+
+ my ( $action, $next ) = get( 'action', 'next' );
+ $action ||= new_action( class => 'LDAPLogin' );
+ $next ||= Jifty::Continuation->new(
+ request => Jifty::Request->new( path => "/" ) );
+ unless ( Jifty->web->current_user->id ) {
+ h3 { _('Login with your ldap account') };
+ div {
+ attr { id => 'jifty-login' };
+ Jifty->web->form->start( call => $next );
+ render_param( $action, 'ldap_id', focus => 1 );
+ render_param( $action, 'password' );
+ form_return( label => _(q{Login}), submit => $action );
+ Jifty->web->form->end();
+ };
+ } else {
+ outs( _("You're already logged in.") );
+ }
+};
+
+
+1;
Added: jifty/trunk/plugins/Authentication-Ldap/t/00-load.t
==============================================================================
--- (empty file)
+++ jifty/trunk/plugins/Authentication-Ldap/t/00-load.t Sat Sep 13 11:24:32 2008
@@ -0,0 +1,7 @@
+#!/usr/bin/env perl
+
+use warnings;
+use strict;
+
+use Test::More tests => 1;
+use_ok('Jifty::Plugin::Authentication::Ldap');
Modified: jifty/trunk/share/po/en.po
==============================================================================
--- jifty/trunk/share/po/en.po (original)
+++ jifty/trunk/share/po/en.po Sat Sep 13 11:24:32 2008
@@ -263,7 +263,7 @@
msgid "Edit"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:23 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:32
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:53 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:32
msgid "Email"
msgstr ""
@@ -299,7 +299,7 @@
msgid "Go for it!"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:34
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:69
msgid "Hashed Password"
msgstr ""
@@ -312,7 +312,7 @@
msgid "Hello, %1!"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:103 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:147
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:103 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:147 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137
#. (Jifty->web->current_user->user_object->facebook_name)
#. (Jifty->web->current_user->user_object->name)
msgid "Hi %1!"
@@ -357,7 +357,7 @@
msgid "Invalid OpenID URL. Please check to make sure it is correct. (@{[$csr->err]})"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:62 lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:75 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:122 lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:75 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
msgid "It doesn't look like there's an account by that name."
msgstr ""
@@ -389,7 +389,7 @@
msgid "Loading..."
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23 lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:132
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23 lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:132 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23
msgid "Login"
msgstr ""
@@ -405,7 +405,7 @@
msgid "Login with a password"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:28
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:28 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:28
msgid "Login with your Ldap account"
msgstr ""
@@ -413,11 +413,11 @@
msgid "Login with your OpenID"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:35
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:35 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:35
msgid "Login with your ldap account"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:22 lib/Jifty/Plugin/Authentication/Password/View.pm:57
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:22 lib/Jifty/Plugin/Authentication/Password/View.pm:57 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:22
msgid "Login!"
msgstr ""
@@ -498,7 +498,7 @@
msgid "Parent"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28 lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:29 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:60
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28 lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:64 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:60 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28
msgid "Password"
msgstr ""
@@ -530,7 +530,7 @@
msgid "Really, really sorry."
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:37
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:72
msgid "Remember me?"
msgstr ""
@@ -588,7 +588,7 @@
msgid "Sorry about this."
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:62 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:115
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:62 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:115 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107
msgid "Sorry, something weird happened (we couldn't create a user for you). Try again later."
msgstr ""
@@ -614,7 +614,7 @@
msgid "That doesn't look like a correct value"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46
msgid "That doesn't look like a valid login."
msgstr ""
@@ -670,6 +670,10 @@
msgid "Updated"
msgstr ""
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:44
+msgid "Username"
+msgstr ""
+
#: share/web/templates/__jifty/halo:96
msgid "Variables"
msgstr ""
@@ -695,7 +699,7 @@
msgid "Welcome back, "
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:194
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:258
#. ($user->name)
msgid "Welcome back, %1."
msgstr ""
@@ -742,11 +746,11 @@
msgid "You lost your password. A link to reset it will be sent to the following email address:"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:138
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:199
msgid "You may have mistyped your email or password. Give it another shot."
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77
msgid "You may have mistyped your login or password. Give it another shot?"
msgstr ""
@@ -763,7 +767,7 @@
msgid "You said you wanted a pony. (Source %1)"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:45 lib/Jifty/Plugin/Authentication/Password/View.pm:96
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:45 lib/Jifty/Plugin/Authentication/Password/View.pm:96 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:45
msgid "You're already logged in."
msgstr ""
@@ -776,7 +780,7 @@
msgid "Your account has been successfully linked to your Facebook user %1!"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:38
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:73
msgid "Your browser can remember your login for you"
msgstr ""
Modified: jifty/trunk/share/po/fr.po
==============================================================================
--- jifty/trunk/share/po/fr.po (original)
+++ jifty/trunk/share/po/fr.po Sat Sep 13 11:24:32 2008
@@ -315,7 +315,7 @@
msgid "Edit %1"
msgstr "Editer %1"
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:23 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:32
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:53 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:32
msgid "Email"
msgstr "Mail"
@@ -351,7 +351,7 @@
msgid "Go for it!"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:34
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:69
msgid "Hashed Password"
msgstr "Mot de passe crypté"
@@ -364,7 +364,7 @@
msgid "Hello, %1!"
msgstr "Bonjour, %1"
-#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:103 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:147
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:103 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:147 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137
#. (Jifty->web->current_user->user_object->facebook_name)
#. (Jifty->web->current_user->user_object->name)
msgid "Hi %1!"
@@ -409,7 +409,7 @@
msgid "Invalid OpenID URL. Please check to make sure it is correct. (@{[$csr->err]})"
msgstr "URL OpenID incorrecte. Vérifiez la. (@{[$csr->err]}) "
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:62 lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:75 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:122 lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:75 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
msgid "It doesn't look like there's an account by that name."
msgstr "Il ne semble pas y avoir de compte sous ce nom."
@@ -441,7 +441,7 @@
msgid "Loading..."
msgstr "Chargement..."
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23 lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:132
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23 lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:132 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23
msgid "Login"
msgstr "Identification"
@@ -457,7 +457,7 @@
msgid "Login with a password"
msgstr "S'identifier avec un mot de passe"
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:28
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:28 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:28
msgid "Login with your Ldap account"
msgstr "S'identifier avec votre compte Ldap"
@@ -465,11 +465,11 @@
msgid "Login with your OpenID"
msgstr "S'identifier avec votre OpenID"
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:35
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:35 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:35
msgid "Login with your ldap account"
msgstr "S'identifier avec votre compte Ldap"
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:22 lib/Jifty/Plugin/Authentication/Password/View.pm:57
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:22 lib/Jifty/Plugin/Authentication/Password/View.pm:57 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:22
msgid "Login!"
msgstr "Identification"
@@ -562,7 +562,7 @@
msgid "Parent"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28 lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:29 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:60
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28 lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:64 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:60 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28
msgid "Password"
msgstr "Mot de passe"
@@ -598,7 +598,7 @@
msgid "Record created"
msgstr "Enregistrement créé"
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:37
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:72
msgid "Remember me?"
msgstr "S'en rappeler"
@@ -672,7 +672,7 @@
msgid "Sorry about this."
msgstr "Désolé."
-#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:62 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:115
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:62 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:115 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107
msgid "Sorry, something weird happened (we couldn't create a user for you). Try again later."
msgstr "Désolé, un problème nous empêche de créer cet utilisateur. Ré-essayer plus tard."
@@ -702,7 +702,7 @@
msgid "That doesn't look like a correct value"
msgstr "Valeur incorrecte"
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46
msgid "That doesn't look like a valid login."
msgstr "Ce compte ne semble pas valide."
@@ -766,6 +766,10 @@
msgid "Updated"
msgstr "Modification enregistrée"
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:44
+msgid "Username"
+msgstr ""
+
#: share/web/templates/__jifty/halo:96
msgid "Variables"
msgstr ""
@@ -791,7 +795,7 @@
msgid "Welcome back, "
msgstr "Re-bonjour, "
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:194
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:258
#. ($user->name)
msgid "Welcome back, %1."
msgstr "Re-bonjour, %1."
@@ -850,11 +854,11 @@
msgid "You may have mistyped your email address or password. Give it another shot."
msgstr "Vous vous êtes trompé dans votre mail ou votre mot de passe. Ré-essayez."
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:138
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:199
msgid "You may have mistyped your email or password. Give it another shot."
msgstr "Vous vous êtes trompé dans votre mail ou votre mot de passe. Ré-essayez."
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77
msgid "You may have mistyped your login or password. Give it another shot?"
msgstr "Vous vous êtes trompé dans votre compte ou votre mot de passe. Ré-essayez."
@@ -871,7 +875,7 @@
msgid "You said you wanted a pony. (Source %1)"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:45 lib/Jifty/Plugin/Authentication/Password/View.pm:96
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:45 lib/Jifty/Plugin/Authentication/Password/View.pm:96 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:45
msgid "You're already logged in."
msgstr "Vous êtes déjà connecté."
@@ -884,7 +888,7 @@
msgid "Your account has been successfully linked to your Facebook user %1!"
msgstr "Votre compte a bien été lié à votre compte Facebook %1"
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:38
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:73
msgid "Your browser can remember your login for you"
msgstr "Votre navigateur peut mémoriser cette identification"
Modified: jifty/trunk/share/po/ja.po
==============================================================================
--- jifty/trunk/share/po/ja.po (original)
+++ jifty/trunk/share/po/ja.po Sat Sep 13 11:24:32 2008
@@ -1086,7 +1086,7 @@
msgid "Edit"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:23 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:32
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:53 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:32
msgid "Email"
msgstr ""
@@ -1122,7 +1122,7 @@
msgid "Go for it!"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:34
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:69
msgid "Hashed Password"
msgstr ""
@@ -1135,7 +1135,7 @@
msgid "Hello, %1!"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:103 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:147
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:103 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:147 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137
#. (Jifty->web->current_user->user_object->facebook_name)
#. (Jifty->web->current_user->user_object->name)
msgid "Hi %1!"
@@ -1180,7 +1180,7 @@
msgid "Invalid OpenID URL. Please check to make sure it is correct. (@{[$csr->err]})"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:62 lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:75 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:122 lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:75 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
msgid "It doesn't look like there's an account by that name."
msgstr ""
@@ -1212,7 +1212,7 @@
msgid "Loading..."
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23 lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:132
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23 lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:132 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23
msgid "Login"
msgstr ""
@@ -1228,7 +1228,7 @@
msgid "Login with a password"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:28
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:28 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:28
msgid "Login with your Ldap account"
msgstr ""
@@ -1236,11 +1236,11 @@
msgid "Login with your OpenID"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:35
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:35 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:35
msgid "Login with your ldap account"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:22 lib/Jifty/Plugin/Authentication/Password/View.pm:57
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:22 lib/Jifty/Plugin/Authentication/Password/View.pm:57 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:22
msgid "Login!"
msgstr ""
@@ -1321,7 +1321,7 @@
msgid "Parent"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28 lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:29 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:60
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28 lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:64 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:60 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28
msgid "Password"
msgstr ""
@@ -1353,7 +1353,7 @@
msgid "Really, really sorry."
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:37
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:72
msgid "Remember me?"
msgstr ""
@@ -1411,7 +1411,7 @@
msgid "Sorry about this."
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:62 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:115
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:62 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:115 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107
msgid "Sorry, something weird happened (we couldn't create a user for you). Try again later."
msgstr ""
@@ -1437,7 +1437,7 @@
msgid "That doesn't look like a correct value"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46
msgid "That doesn't look like a valid login."
msgstr ""
@@ -1493,6 +1493,10 @@
msgid "Updated"
msgstr ""
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:44
+msgid "Username"
+msgstr ""
+
#: share/web/templates/__jifty/halo:96
msgid "Variables"
msgstr ""
@@ -1518,7 +1522,7 @@
msgid "Welcome back, "
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:194
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:258
#. ($user->name)
msgid "Welcome back, %1."
msgstr ""
@@ -1565,11 +1569,11 @@
msgid "You lost your password. A link to reset it will be sent to the following email address:"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:138
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:199
msgid "You may have mistyped your email or password. Give it another shot."
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77
msgid "You may have mistyped your login or password. Give it another shot?"
msgstr ""
@@ -1586,7 +1590,7 @@
msgid "You said you wanted a pony. (Source %1)"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:45 lib/Jifty/Plugin/Authentication/Password/View.pm:96
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:45 lib/Jifty/Plugin/Authentication/Password/View.pm:96 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:45
msgid "You're already logged in."
msgstr ""
@@ -1599,7 +1603,7 @@
msgid "Your account has been successfully linked to your Facebook user %1!"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:38
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:73
msgid "Your browser can remember your login for you"
msgstr ""
Modified: jifty/trunk/share/po/ro.po
==============================================================================
--- jifty/trunk/share/po/ro.po (original)
+++ jifty/trunk/share/po/ro.po Sat Sep 13 11:24:32 2008
@@ -210,7 +210,7 @@
msgstr "De %1 %2"
#: share/web/templates/helpers/calendar.html:4
-#. (_ &><body class="calpopup"><a href="#" DEFANGED_Onclick="window.close()
+#. (_ &><body class="calpopup"><a href="#" onclick="window.close()
msgid "Calendar"
msgstr "Calendar"
@@ -263,7 +263,7 @@
msgid "Edit"
msgstr "Modifică"
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:23 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:32
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:53 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:32
msgid "Email"
msgstr ""
@@ -299,7 +299,7 @@
msgid "Go for it!"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:34
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:69
msgid "Hashed Password"
msgstr "Parolă criptată"
@@ -312,7 +312,7 @@
msgid "Hello, %1!"
msgstr "Bună ziua"
-#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:103 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:147
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:103 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:147 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137
#. (Jifty->web->current_user->user_object->facebook_name)
#. (Jifty->web->current_user->user_object->name)
msgid "Hi %1!"
@@ -357,7 +357,7 @@
msgid "Invalid OpenID URL. Please check to make sure it is correct. (@{[$csr->err]})"
msgstr "URL OpenID invalid. Verificaţi daca este corect. (@{[$csr->err]})"
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:62 lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:75 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:122 lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:75 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
msgid "It doesn't look like there's an account by that name."
msgstr "Acest cont pare a fi utilizat deja."
@@ -389,7 +389,7 @@
msgid "Loading..."
msgstr "Se incarcă"
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23 lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:132
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23 lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:132 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23
msgid "Login"
msgstr "Identificare"
@@ -405,7 +405,7 @@
msgid "Login with a password"
msgstr "Indentificare cu o parolă"
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:28
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:28 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:28
msgid "Login with your Ldap account"
msgstr "Identificare cu un cont Ldap"
@@ -413,11 +413,11 @@
msgid "Login with your OpenID"
msgstr "Indeitificare cu OpenID"
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:35
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:35 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:35
msgid "Login with your ldap account"
msgstr "Identificare cu un cont Ldap"
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:22 lib/Jifty/Plugin/Authentication/Password/View.pm:57
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:22 lib/Jifty/Plugin/Authentication/Password/View.pm:57 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:22
msgid "Login!"
msgstr "Identificare!"
@@ -498,7 +498,7 @@
msgid "Parent"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28 lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:29 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:60
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28 lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:64 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:60 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28
msgid "Password"
msgstr "Parola"
@@ -530,7 +530,7 @@
msgid "Really, really sorry."
msgstr "Regretăm."
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:37
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:72
msgid "Remember me?"
msgstr "Memorează?"
@@ -588,7 +588,7 @@
msgid "Sorry about this."
msgstr "Ne cerem scuze."
-#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:62 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:115
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:62 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:115 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107
msgid "Sorry, something weird happened (we couldn't create a user for you). Try again later."
msgstr "Scuze, datorită unei probleme, nu va pute; crea contul. Încercaţi mai târziu."
@@ -614,7 +614,7 @@
msgid "That doesn't look like a correct value"
msgstr "Această valoare nu pare a fi corectă"
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46
msgid "That doesn't look like a valid login."
msgstr "Acest login nu pare a fi valid."
@@ -670,6 +670,10 @@
msgid "Updated"
msgstr "Modificare inregistrată"
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:44
+msgid "Username"
+msgstr ""
+
#: share/web/templates/__jifty/halo:96
msgid "Variables"
msgstr "Variabile"
@@ -695,7 +699,7 @@
msgid "Welcome back, "
msgstr "Bine aţi revenit"
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:194
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:258
#. ($user->name)
msgid "Welcome back, %1."
msgstr "Bine aţi revenit"
@@ -742,11 +746,11 @@
msgid "You lost your password. A link to reset it will be sent to the following email address:"
msgstr "Aţi pierdut parola. Un link pentru modificarea parolei va fi trans;is la adresa email următoare:"
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:138
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:199
msgid "You may have mistyped your email or password. Give it another shot."
msgstr "Aţi greşit adresa email sau parola. Re-încercaţi."
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77
msgid "You may have mistyped your login or password. Give it another shot?"
msgstr "Aţi greşit adresa email sau parola. Re-încercaţi?"
@@ -763,7 +767,7 @@
msgid "You said you wanted a pony. (Source %1)"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:45 lib/Jifty/Plugin/Authentication/Password/View.pm:96
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:45 lib/Jifty/Plugin/Authentication/Password/View.pm:96 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:45
msgid "You're already logged in."
msgstr "Sunteţi deja conectat"
@@ -776,7 +780,7 @@
msgid "Your account has been successfully linked to your Facebook user %1!"
msgstr "Contul dvs. a fost asociat cu contul dvs. Facebook %1!"
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:38
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:73
msgid "Your browser can remember your login for you"
msgstr "Navigatorul dvs. vă poate memora loginul pentru o conectare ulterioară"
Modified: jifty/trunk/share/po/ru.po
==============================================================================
--- jifty/trunk/share/po/ru.po (original)
+++ jifty/trunk/share/po/ru.po Sat Sep 13 11:24:32 2008
@@ -266,7 +266,7 @@
msgid "Edit %1"
msgstr "Изменить %1"
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:23 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:32
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:53 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:32
msgid "Email"
msgstr "Почта"
@@ -302,7 +302,7 @@
msgid "Go for it!"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:34
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:69
msgid "Hashed Password"
msgstr ""
@@ -315,7 +315,7 @@
msgid "Hello, %1!"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:103 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:147
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:103 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:147 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137
#. (Jifty->web->current_user->user_object->facebook_name)
#. (Jifty->web->current_user->user_object->name)
msgid "Hi %1!"
@@ -360,7 +360,7 @@
msgid "Invalid OpenID URL. Please check to make sure it is correct. (@{[$csr->err]})"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:62 lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:75 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:122 lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:75 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
msgid "It doesn't look like there's an account by that name."
msgstr "Кажется в системе нет пользователя с таким именем."
@@ -392,7 +392,7 @@
msgid "Loading..."
msgstr "Загрузка..."
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23 lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:132
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23 lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:132 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23
msgid "Login"
msgstr "Вход"
@@ -408,7 +408,7 @@
msgid "Login with a password"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:28
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:28 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:28
msgid "Login with your Ldap account"
msgstr ""
@@ -416,11 +416,11 @@
msgid "Login with your OpenID"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:35
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:35 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:35
msgid "Login with your ldap account"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:22 lib/Jifty/Plugin/Authentication/Password/View.pm:57
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:22 lib/Jifty/Plugin/Authentication/Password/View.pm:57 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:22
msgid "Login!"
msgstr ""
@@ -501,7 +501,7 @@
msgid "Parent"
msgstr "Родитель"
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28 lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:29 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:60
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28 lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:64 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:60 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28
msgid "Password"
msgstr "Пароль"
@@ -533,7 +533,7 @@
msgid "Really, really sorry."
msgstr "Очень сожалеем."
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:37
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:72
msgid "Remember me?"
msgstr "Запомнить?"
@@ -599,7 +599,7 @@
msgid "Sorry about this."
msgstr "Сожалеем об этом."
-#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:62 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:115
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:62 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:115 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107
msgid "Sorry, something weird happened (we couldn't create a user for you). Try again later."
msgstr ""
@@ -625,7 +625,7 @@
msgid "That doesn't look like a correct value"
msgstr "Не похоже на допустимое значение"
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46
msgid "That doesn't look like a valid login."
msgstr ""
@@ -681,6 +681,10 @@
msgid "Updated"
msgstr "Обновленно"
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:44
+msgid "Username"
+msgstr ""
+
#: share/web/templates/__jifty/halo:96
msgid "Variables"
msgstr "Переменные"
@@ -706,7 +710,7 @@
msgid "Welcome back, "
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:194
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:258
#. ($user->name)
msgid "Welcome back, %1."
msgstr "Рады вас видеть снова, %1."
@@ -757,11 +761,11 @@
msgid "You lost your password. A reminder will be send to the following mail:"
msgstr "Вы забыли пароль. Напоминание будет отправлено на адрес: %1"
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:138
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:199
msgid "You may have mistyped your email or password. Give it another shot."
msgstr "Должно быть вы ввели неправильно адрес или пароль. Попробуйте еще разок."
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77
msgid "You may have mistyped your login or password. Give it another shot?"
msgstr ""
@@ -778,7 +782,7 @@
msgid "You said you wanted a pony. (Source %1)"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:45 lib/Jifty/Plugin/Authentication/Password/View.pm:96
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:45 lib/Jifty/Plugin/Authentication/Password/View.pm:96 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:45
msgid "You're already logged in."
msgstr "Вы уже вошли."
@@ -791,7 +795,7 @@
msgid "Your account has been successfully linked to your Facebook user %1!"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:38
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:73
msgid "Your browser can remember your login for you"
msgstr "Ваш браузер может запомнить ваш логин за вас"
Modified: jifty/trunk/share/po/zh_cn.po
==============================================================================
--- jifty/trunk/share/po/zh_cn.po (original)
+++ jifty/trunk/share/po/zh_cn.po Sat Sep 13 11:24:32 2008
@@ -312,7 +312,7 @@
msgid "Edit %1"
msgstr "编辑 %1"
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:23 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:32
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:53 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:32
msgid "Email"
msgstr "电子邮箱"
@@ -348,7 +348,7 @@
msgid "Go for it!"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:34
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:69
msgid "Hashed Password"
msgstr ""
@@ -361,7 +361,7 @@
msgid "Hello, %1!"
msgstr "%1, 您好!"
-#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:103 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:147
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:103 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:147 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137
#. (Jifty->web->current_user->user_object->facebook_name)
#. (Jifty->web->current_user->user_object->name)
msgid "Hi %1!"
@@ -406,7 +406,7 @@
msgid "Invalid OpenID URL. Please check to make sure it is correct. (@{[$csr->err]})"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:62 lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:75 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:122 lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:75 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
msgid "It doesn't look like there's an account by that name."
msgstr "该账号不存在."
@@ -450,7 +450,7 @@
msgid "Loading..."
msgstr "正在加载..."
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23 lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:132
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23 lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:132 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23
msgid "Login"
msgstr "登录"
@@ -466,7 +466,7 @@
msgid "Login with a password"
msgstr "使用密码登录"
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:28
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:28 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:28
msgid "Login with your Ldap account"
msgstr ""
@@ -474,11 +474,11 @@
msgid "Login with your OpenID"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:35
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:35 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:35
msgid "Login with your ldap account"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:22 lib/Jifty/Plugin/Authentication/Password/View.pm:57
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:22 lib/Jifty/Plugin/Authentication/Password/View.pm:57 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:22
msgid "Login!"
msgstr "登录!"
@@ -583,7 +583,7 @@
msgid "Parent"
msgstr "父组件"
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28 lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:29 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:60
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28 lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:64 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:60 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28
msgid "Password"
msgstr "密码"
@@ -619,7 +619,7 @@
msgid "Record created"
msgstr "成功建立记录."
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:37
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:72
msgid "Remember me?"
msgstr "记住我?"
@@ -697,7 +697,7 @@
msgid "Sorry about this."
msgstr "非常抱歉"
-#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:62 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:115
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:62 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:115 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107
msgid "Sorry, something weird happened (we couldn't create a user for you). Try again later."
msgstr ""
@@ -727,7 +727,7 @@
msgid "That doesn't look like a correct value"
msgstr "字段格式错误."
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46
msgid "That doesn't look like a valid login."
msgstr ""
@@ -791,6 +791,10 @@
msgid "Updated"
msgstr "成功更新项目."
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:44
+msgid "Username"
+msgstr ""
+
#: share/web/templates/__jifty/halo:96
msgid "Variables"
msgstr "变项"
@@ -816,7 +820,7 @@
msgid "Welcome back, "
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:194
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:258
#. ($user->name)
msgid "Welcome back, %1."
msgstr "欢迎回来, %1."
@@ -875,11 +879,11 @@
msgid "You may have mistyped your email address or password. Give it another shot."
msgstr "您或许输错了电子邮箱或密码，请重试."
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:138
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:199
msgid "You may have mistyped your email or password. Give it another shot."
msgstr "您或许输错了电子邮箱或密码，请重试."
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77
msgid "You may have mistyped your login or password. Give it another shot?"
msgstr ""
@@ -896,7 +900,7 @@
msgid "You said you wanted a pony. (Source %1)"
msgstr "您不正想要一匹小马吗? (参见 %1)"
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:45 lib/Jifty/Plugin/Authentication/Password/View.pm:96
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:45 lib/Jifty/Plugin/Authentication/Password/View.pm:96 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:45
msgid "You're already logged in."
msgstr "您已经登录了."
@@ -909,7 +913,7 @@
msgid "Your account has been successfully linked to your Facebook user %1!"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:38
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:73
msgid "Your browser can remember your login for you"
msgstr "下次开启浏览器时, 是否保持登录状态?"
Modified: jifty/trunk/share/po/zh_tw.po
==============================================================================
--- jifty/trunk/share/po/zh_tw.po (original)
+++ jifty/trunk/share/po/zh_tw.po Sat Sep 13 11:24:32 2008
@@ -312,7 +312,7 @@
msgid "Edit %1"
msgstr "編輯 %1"
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:23 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:32
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:53 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:32
msgid "Email"
msgstr "電郵"
@@ -352,7 +352,7 @@
msgid "Go for it!"
msgstr "去吧！"
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:34
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:69
msgid "Hashed Password"
msgstr ""
@@ -365,7 +365,7 @@
msgid "Hello, %1!"
msgstr "%1 您好!"
-#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:103 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:103 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:147 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137
#. (Jifty->web->current_user->user_object->facebook_name)
#. (Jifty->web->current_user->user_object->name)
msgid "Hi %1!"
@@ -410,7 +410,7 @@
msgid "Invalid OpenID URL. Please check to make sure it is correct. (@{[$csr->err]})"
msgstr "不正確的 OpenID 網址. (@{[$csr->err]})"
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:62 lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:75 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:122 lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:75 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
msgid "It doesn't look like there's an account by that name."
msgstr "沒有這個帳號."
@@ -454,7 +454,7 @@
msgid "Loading..."
msgstr "請稍候..."
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23 lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:132
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23 lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:132 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23
msgid "Login"
msgstr "登入"
@@ -470,7 +470,7 @@
msgid "Login with a password"
msgstr "使用密碼登入"
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:28
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:28 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:28
msgid "Login with your Ldap account"
msgstr ""
@@ -478,11 +478,11 @@
msgid "Login with your OpenID"
msgstr "以您的 OpenID 登入"
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:35
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:35 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:35
msgid "Login with your ldap account"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:22 lib/Jifty/Plugin/Authentication/Password/View.pm:57
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:22 lib/Jifty/Plugin/Authentication/Password/View.pm:57 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:22
msgid "Login!"
msgstr "登入!"
@@ -583,7 +583,7 @@
msgid "Parent"
msgstr "上層元件"
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28 lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:29 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:60
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28 lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:64 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:60 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28
msgid "Password"
msgstr "密碼"
@@ -619,7 +619,7 @@
msgid "Record created"
msgstr "成功建立項目."
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:37
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:72
msgid "Remember me?"
msgstr "記住我?"
@@ -697,7 +697,7 @@
msgid "Sorry about this."
msgstr "非常抱歉."
-#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:62 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:62 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:115 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107
msgid "Sorry, something weird happened (we couldn't create a user for you). Try again later."
msgstr "不好意思，發生了奇怪的事（我們無法替您建立帳號）。請稍候再試。"
@@ -727,10 +727,14 @@
msgid "That doesn't look like a correct value"
msgstr "欄位格式錯誤."
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46
msgid "That doesn't look like a valid login."
msgstr "看起來不像是有個有效的登入帳號"
+#: plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:47
+msgid "That doesn't look like a valid ticket."
+msgstr ""
+
#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:68 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:72 lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:70
msgid "That doesn't look like an email address."
msgstr "看起來不像是電子郵件地址"
@@ -787,6 +791,10 @@
msgid "Updated"
msgstr "成功更新項目."
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:44
+msgid "Username"
+msgstr ""
+
#: share/web/templates/__jifty/halo:96
msgid "Variables"
msgstr "變數"
@@ -812,7 +820,7 @@
msgid "Welcome back, "
msgstr "歡迎回來，"
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:194
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:258
#. ($user->name)
msgid "Welcome back, %1."
msgstr "歡迎回來, %1."
@@ -867,11 +875,11 @@
msgid "You lost your password. A reminder will be send to the following mail:"
msgstr "您忘記密碼了.我們會寄送一份提示到下面的電郵地址:"
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:138
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:199
msgid "You may have mistyped your email or password. Give it another shot."
msgstr "你可能打錯了電郵或密碼.請再試一次"
-#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77
msgid "You may have mistyped your login or password. Give it another shot?"
msgstr ""
@@ -888,7 +896,7 @@
msgid "You said you wanted a pony. (Source %1)"
msgstr "您可不正是想要一匹小馬嗎? (參見 %1)"
-#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:45 lib/Jifty/Plugin/Authentication/Password/View.pm:96
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:45 lib/Jifty/Plugin/Authentication/Password/View.pm:96 plugins/Authentication-Ldap/lib/Jifty/Plugin/Authentication/Ldap/View.pm:45
msgid "You're already logged in."
msgstr "您已經登入了."
@@ -901,7 +909,7 @@
msgid "Your account has been successfully linked to your Facebook user %1!"
msgstr ""
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:38
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:73
msgid "Your browser can remember your login for you"
msgstr "下次開啟瀏覽器時, 是否保留您的登入狀態?"
More information about the Jifty-commit
mailing list