diff --git a/lib/Lufi.pm b/lib/Lufi.pm index 3e15d70..318e767 100644 --- a/lib/Lufi.pm +++ b/lib/Lufi.pm @@ -179,7 +179,7 @@ sub startup { # I’m a guest and I sent all my files $r->post('/guest/:token/send_mail') ->name('guest_send_mail') - ->to('Invitation#send_mail_to_ldap_user'); + ->to('Invitation#send_mail_to_auth_user'); } } diff --git a/lib/Lufi/Command/sqliteToOtherDB.pm b/lib/Lufi/Command/sqliteToOtherDB.pm index cca3f6c..6ef238c 100644 --- a/lib/Lufi/Command/sqliteToOtherDB.pm +++ b/lib/Lufi/Command/sqliteToOtherDB.pm @@ -78,8 +78,8 @@ sub run { Lufi::DB::Invitation->new(app => $c->app) ->token($invitation->{token}) - ->ldap_user($invitation->{ldap_user}) - ->ldap_user_mail($invitation->{ldap_user_mail}) + ->auth_user($invitation->{auth_user}) + ->auth_user_mail($invitation->{auth_user_mail}) ->guest_mail($invitation->{guest_mail}) ->created_at($invitation->{created_at}) ->expire_at($invitation->{expire_at}) diff --git a/lib/Lufi/Controller/Files.pm b/lib/Lufi/Controller/Files.pm index 56fba34..4049f16 100644 --- a/lib/Lufi/Controller/Files.pm +++ b/lib/Lufi/Controller/Files.pm @@ -120,7 +120,7 @@ sub upload { $ws->send(decode('UTF-8', encode_json( { success => false, - msg => $c->l('Sorry, your invitation has expired or has been deleted. Please contact %1 to have another invitation.', $invit->ldap_user_mail), + msg => $c->l('Sorry, your invitation has expired or has been deleted. Please contact %1 to have another invitation.', $invit->auth_user_mail), } ))); } diff --git a/lib/Lufi/Controller/Invitation.pm b/lib/Lufi/Controller/Invitation.pm index 887d16e..5651a01 100644 --- a/lib/Lufi/Controller/Invitation.pm +++ b/lib/Lufi/Controller/Invitation.pm @@ -18,7 +18,7 @@ sub new_invite { if ($c->is_user_authenticated) { my $mail_attr = $c->config('invitations')->{'mail_attr'} // 'mail'; my $max_expire_at = $c->config('invitations')->{'max_invitation_expiration_delay'} // 30; - my $send_with_user_email = defined $c->config('invitations')->{'send_invitation_with_ldap_user_mail'}; + my $send_with_user_email = defined $c->config('invitations')->{'send_invitation_with_auth_user_mail'}; $c->render( template => 'invitations/invite', max_expire_at => $max_expire_at, @@ -39,7 +39,7 @@ sub send_invite { my $mail_attr = $c->config('invitations')->{'mail_attr'} // 'mail'; my $max_expire_at = $c->config('invitations')->{'max_invitation_expiration_delay'} // 30; - my $send_with_user_email = defined $c->config('invitations')->{'send_invitation_with_ldap_user_mail'}; + my $send_with_user_email = defined $c->config('invitations')->{'send_invitation_with_auth_user_mail'}; # The `if (defined($c->config('ldap')))` is at the router level in lib/Lufi.pm if ($c->is_user_authenticated) { @@ -63,8 +63,8 @@ sub send_invite { } while ($invitation->is_token_used($token)); $invitation = $invitation->from_token($token); - $invitation->ldap_user($c->current_user->{username}); - $invitation->ldap_user_mail($c->current_user->{$mail_attr}); + $invitation->auth_user($c->current_user->{username}); + $invitation->auth_user_mail($c->current_user->{$mail_attr}); $invitation->created_at(time); $invitation->guest_mail($guest_mail); $invitation->expire_at($invitation->created_at + 86400 * $expire_at); @@ -72,14 +72,14 @@ sub send_invite { $invitation->show_in_list(1); $invitation = $invitation->write; - my $from = ($c->config('invitations')->{'send_invitation_with_ldap_user_mail'}) ? $invitation->ldap_user_mail : $c->config('mail_sender'); + my $from = ($c->config('invitations')->{'send_invitation_with_auth_user_mail'}) ? $invitation->auth_user_mail : $c->config('mail_sender'); my $url = $c->url_for('guest', token => $invitation->token)->to_abs; $c->mail( from => $from, to => $invitation->guest_mail, template => 'invitations/invite', format => 'mail', - ldap_user => ucfirst($invitation->ldap_user), + auth_user => ucfirst($invitation->auth_user), url => $url, invitation => $invitation, expires => $c->get_date_lang()->time2str($c->l('%A %d %B %Y at %T'), $invitation->expire_at) @@ -128,7 +128,7 @@ sub delete_invitations { for my $token (@tokens) { my $i = Lufi::DB::Invitation->new(app => $c->app) ->from_token($token); - if ($i->ldap_user eq $c->current_user->{username}) { + if ($i->auth_user eq $c->current_user->{username}) { $i->deleted(1) ->write; push @result, { msg => $c->l('The invitation %1 has been deleted.', $i->token), token => $i->token, deleted => $i->deleted }; @@ -158,7 +158,7 @@ sub resend_invitations { my $i = Lufi::DB::Invitation->new(app => $c->app) ->from_token($token); - if ($i->ldap_user eq $c->current_user->{username}) { + if ($i->auth_user eq $c->current_user->{username}) { if ($i->files_sent_at) { push @failures, $c->l('The invitation %1 can’t be resent: %2 has already sent files.
Please create a new invitation.', $i->token, $i->guest_mail); } else { @@ -167,7 +167,7 @@ sub resend_invitations { ->write; } - my $from = ($c->config('invitations')->{'send_invitation_with_ldap_user_mail'}) ? $i->ldap_user_mail : $c->config('mail_sender'); + my $from = ($c->config('invitations')->{'send_invitation_with_auth_user_mail'}) ? $i->auth_user_mail : $c->config('mail_sender'); my $url = $c->url_for('guest', token => $i->token)->to_abs; my $expire = $c->get_date_lang()->time2str($c->l('%A %d %B %Y at %T'), $i->expire_at); $c->mail( @@ -175,7 +175,7 @@ sub resend_invitations { to => $i->guest_mail, template => 'invitations/invite', format => 'mail', - ldap_user => ucfirst($i->ldap_user), + auth_user => ucfirst($i->auth_user), url => $url, invitation => $i, expires => $expire @@ -237,7 +237,7 @@ sub guest { return $c->render(template => 'invitations/exception'); } -sub send_mail_to_ldap_user { +sub send_mail_to_auth_user { my $c = shift; my $token = $c->param('token'); my $urls = c(@{$c->every_param('urls[]')}); @@ -281,7 +281,7 @@ sub send_mail_to_ldap_user { $c->session(expires => $invitation->files_sent_at + 60 * $invitation->expend_expire_at); $c->mail( from => $c->config('mail_sender'), - to => $invitation->ldap_user_mail, + to => $invitation->auth_user_mail, template => 'invitations/notification_files_sent', format => 'mail', files => c(@files), @@ -292,7 +292,7 @@ sub send_mail_to_ldap_user { return $c->render( json => { success => true, - msg => $c->l('The URLs of your files have been sent by email to %1.', $invitation->ldap_user_mail) + msg => $c->l('The URLs of your files have been sent by email to %1.', $invitation->auth_user_mail) } ); } else { diff --git a/lib/Lufi/DB/Invitation.pm b/lib/Lufi/DB/Invitation.pm index ee3f48d..b3b687b 100644 --- a/lib/Lufi/DB/Invitation.pm +++ b/lib/Lufi/DB/Invitation.pm @@ -5,8 +5,8 @@ use Mojo::File; use Mojo::Collection 'c'; has 'token'; -has 'ldap_user'; -has 'ldap_user_mail'; +has 'auth_user'; +has 'auth_user_mail'; has 'guest_mail'; has 'created_at'; has 'expire_at'; @@ -35,9 +35,9 @@ Have a look at Lufi::DB::Invitation::SQLite's code: it's simple and may be more =item B : string, invitation token -=item B : string, the user who created the invitation +=item B : string, the user who created the invitation -=item B : string, the email of the user who created the invitation +=item B : string, the email of the user who created the invitation =item B : string, the email of the guest @@ -106,8 +106,8 @@ sub to_hash { return { token => $c->token, - ldap_user => $c->ldap_user, - ldap_user_mail => $c->ldap_user_mail, + auth_user => $c->auth_user, + auth_user_mail => $c->auth_user_mail, guest_mail => $c->guest_mail, created_at => $c->created_at, expire_at => $c->expire_at, @@ -289,7 +289,7 @@ sub from_token { =item B : string -=item B : find invitations in the database from their C attribute +=item B : find invitations in the database from their C attribute =item B : a Mojo::Collection of Lufi::DB::Invitation objects, sorted by creation date @@ -302,7 +302,7 @@ sub from_user { my $user = shift; my $r = $c->app->dbi->db - ->select('invitations', undef, { ldap_user => $user }, { -desc => 'created_at' }) + ->select('invitations', undef, { auth_user => $user }, { -desc => 'created_at' }) ->hashes; if ($r->size) { @@ -406,8 +406,8 @@ sub _slurp { if ($invitation) { $c->token( $invitation->{token} ); - $c->ldap_user( $invitation->{ldap_user} ); - $c->ldap_user_mail( $invitation->{ldap_user_mail} ); + $c->auth_user( $invitation->{auth_user} ); + $c->auth_user_mail( $invitation->{auth_user_mail} ); $c->guest_mail( $invitation->{guest_mail} ); $c->created_at( $invitation->{created_at} ); $c->expire_at( $invitation->{expire_at} ); diff --git a/lufi.conf.template b/lufi.conf.template index a9f43b7..044ec03 100644 --- a/lufi.conf.template +++ b/lufi.conf.template @@ -234,10 +234,10 @@ #ldap => { # uri => 'ldaps://ldap.example.org', # server URI # user_tree => 'ou=users,dc=example,dc=org', # search base DN - # bind_dn => 'uid=ldap_user,ou=users,dc=example,dc=org', # search bind DN + # bind_dn => 'uid=auth_user,ou=users,dc=example,dc=org', # search bind DN # bind_pwd => 'secr3t', # search bind password # user_attr => 'uid', # user attribute (uid, mail, sAMAccountName, etc.) - # user_filter => '(!(uid=ldap_user))', # user filter (to exclude some users, etc.) + # user_filter => '(!(uid=auth_user))', # user filter (to exclude some users, etc.) # # optional start_tls configuration. See https://metacpan.org/pod/distribution/perl-ldap/lib/Net/LDAP.pod#start_tls # # don't set or uncomment if you don't want to configure it # start_tls => { @@ -277,7 +277,7 @@ # # Be sure to have a mail system that will correctly send the mail from your users! (DKIM, SPF…) # # To enable this feature, set it to 1 # # optional, disabled by default - # send_invitation_with_ldap_user_mail => 1, + # send_invitation_with_auth_user_mail => 1, # # The user is able to set an expiration delay for the invitation. # # This expiration delay can’t be more than this setting (in days). # # optional, default is 30 days diff --git a/t/mysql.conf b/t/mysql.conf index b1060a9..3288b2d 100644 --- a/t/mysql.conf +++ b/t/mysql.conf @@ -261,7 +261,7 @@ # # Be sure to have a mail system that will correctly send the mail from your users! (DKIM, SPF…) # # To enable this feature, set it to 1 # # optional, disabled by default - # send_invitation_with_ldap_user_mail => 1, + # send_invitation_with_auth_user_mail => 1, # # The user is able to set an expiration delay for the invitation. # # This expiration delay can’t be more than this setting (in days). # # optional, default is 30 days diff --git a/t/postgresql.conf b/t/postgresql.conf index a07c392..87b3e3f 100644 --- a/t/postgresql.conf +++ b/t/postgresql.conf @@ -246,7 +246,7 @@ # # Be sure to have a mail system that will correctly send the mail from your users! (DKIM, SPF…) # # To enable this feature, set it to 1 # # optional, disabled by default - # send_invitation_with_ldap_user_mail => 1, + # send_invitation_with_auth_user_mail => 1, # # The user is able to set an expiration delay for the invitation. # # This expiration delay can’t be more than this setting (in days). # # optional, default is 30 days diff --git a/t/sqlite.conf b/t/sqlite.conf index 91d0ae1..9d60d2b 100644 --- a/t/sqlite.conf +++ b/t/sqlite.conf @@ -250,7 +250,7 @@ # # Be sure to have a mail system that will correctly send the mail from your users! (DKIM, SPF…) # # To enable this feature, set it to 1 # # optional, disabled by default - # send_invitation_with_ldap_user_mail => 1, + # send_invitation_with_auth_user_mail => 1, # # The user is able to set an expiration delay for the invitation. # # This expiration delay can’t be more than this setting (in days). # # optional, default is 30 days diff --git a/themes/default/lib/Lufi/I18N/ar.po b/themes/default/lib/Lufi/I18N/ar.po index f2e18ce..4704b61 100644 --- a/themes/default/lib/Lufi/I18N/ar.po +++ b/themes/default/lib/Lufi/I18N/ar.po @@ -23,12 +23,12 @@ msgstr "" msgid "%1 days" msgstr "زَمَن %1 يَوم" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:2 msgid "%1 invites you to send him/her files" msgstr "يَدعُوكَ %1 لإرسالِ المَلَفَّاتِ إليه" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:6 msgid "%1 invites you to send him/her files through Lufi." msgstr "يَدعُوكَ %1 لإرسالِ المَلَفَّاتِ إلَيه عَبرَ لُوفي." @@ -602,7 +602,7 @@ msgstr "عذرًا ، التحميل معطل." msgid "Sorry, your invitation has expired or has been deleted." msgstr "المعذرة، إنّ دعوتك منتهية الصلاحية أو تم حذفها." -#. ($invit->ldap_user_mail) +#. ($invit->auth_user_mail) #: lib/Lufi/Controller/Files.pm:122 msgid "" "Sorry, your invitation has expired or has been deleted. Please contact %1 to " @@ -611,7 +611,7 @@ msgstr "" "المعذرة ، لقد انتهت مدة صلاحية دعوتك أو قد تم حذفها. الرجاء الاتصال بـ %1 " "للحصول على دعوة أخرى." -#. ($invitation->ldap_user_mail) +#. ($invitation->auth_user_mail) #: lib/Lufi/Controller/Invitation.pm:276 msgid "The URLs of your files have been sent by email to %1." msgstr "لقد تم إرسال روابط ملفاتك بالبريد الإلكتروني إلى %1." @@ -700,7 +700,7 @@ msgid "" "The link(s) of your file(s) will automatically be sent by mail to %1 (%2)" msgstr "سيتم إرسال الرابط (الروابط) لملفاتك تلقائيًا عن طريق البريد إلى %1 (%2)" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:11 msgid "The links of your file(s) will automatically be sent by mail to %1." msgstr "" diff --git a/themes/default/lib/Lufi/I18N/ca.po b/themes/default/lib/Lufi/I18N/ca.po index 4b3c6b8..8a8e6ce 100644 --- a/themes/default/lib/Lufi/I18N/ca.po +++ b/themes/default/lib/Lufi/I18N/ca.po @@ -27,12 +27,12 @@ msgstr "" msgid "%1 days" msgstr "%1 dies" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:2 msgid "%1 invites you to send him/her files" msgstr "" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:6 msgid "%1 invites you to send him/her files through Lufi." msgstr "" @@ -611,14 +611,14 @@ msgstr "Disculpeu, les pujades estan deshabilitades." msgid "Sorry, your invitation has expired or has been deleted." msgstr "" -#. ($invit->ldap_user_mail) +#. ($invit->auth_user_mail) #: lib/Lufi/Controller/Files.pm:122 msgid "" "Sorry, your invitation has expired or has been deleted. Please contact %1 to " "have another invitation." msgstr "" -#. ($invitation->ldap_user_mail) +#. ($invitation->auth_user_mail) #: lib/Lufi/Controller/Invitation.pm:276 msgid "The URLs of your files have been sent by email to %1." msgstr "" @@ -706,7 +706,7 @@ msgid "" "The link(s) of your file(s) will automatically be sent by mail to %1 (%2)" msgstr "" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:11 msgid "The links of your file(s) will automatically be sent by mail to %1." msgstr "" diff --git a/themes/default/lib/Lufi/I18N/co.po b/themes/default/lib/Lufi/I18N/co.po index 22579ef..29e53b0 100644 --- a/themes/default/lib/Lufi/I18N/co.po +++ b/themes/default/lib/Lufi/I18N/co.po @@ -24,12 +24,12 @@ msgstr "" msgid "%1 days" msgstr "%1 ghjorni" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:2 msgid "%1 invites you to send him/her files" msgstr "%1 v’invita à mandalli schedarii" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:6 msgid "%1 invites you to send him/her files through Lufi." msgstr "%1 v’invita à mandalli schedarii via Lufi." @@ -618,14 +618,14 @@ msgstr "Per disgrazia, l’incaricamentu di schedariu hè disattivatu." msgid "Sorry, your invitation has expired or has been deleted." msgstr "Per disgrazia, a vostra invitazione hè scaduta o hè stata squassata." -#. ($invit->ldap_user_mail) +#. ($invit->auth_user_mail) #: lib/Lufi/Controller/Files.pm:123 msgid "Sorry, your invitation has expired or has been deleted. Please contact %1 to have another invitation." msgstr "" "Per disgrazia, a vostra invitazione hè scaduta o hè stata squassata. Ci vole " "à cuntattà %1 per ottene un altra invitazione." -#. ($invitation->ldap_user_mail) +#. ($invitation->auth_user_mail) #: lib/Lufi/Controller/Invitation.pm:295 msgid "The URLs of your files have been sent by email to %1." msgstr "" @@ -726,7 +726,7 @@ msgstr "" "U(i) liame(i) di u(i) vostru(i) schedariu(i) serà(seranu) mandatu(i) " "autumaticamente da messaghju à %1 (%2)" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:11 msgid "The links of your file(s) will automatically be sent by mail to %1." msgstr "" diff --git a/themes/default/lib/Lufi/I18N/de.po b/themes/default/lib/Lufi/I18N/de.po index 20a4f8c..a63fc80 100644 --- a/themes/default/lib/Lufi/I18N/de.po +++ b/themes/default/lib/Lufi/I18N/de.po @@ -22,12 +22,12 @@ msgstr "" msgid "%1 days" msgstr "%1 Tage" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:2 msgid "%1 invites you to send him/her files" msgstr "%1 lädt Sie ein, ihm/ihr Dateien zu senden" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:6 msgid "%1 invites you to send him/her files through Lufi." msgstr "%1 lädt Sie ein, ihm/ihr Dateien über Lufi zu senden." @@ -633,7 +633,7 @@ msgstr "Es tut uns leid, das Hochladen ist deaktiviert." msgid "Sorry, your invitation has expired or has been deleted." msgstr "Es tut uns leid, Ihre Einladung ist abgelaufen oder wurde gelöscht." -#. ($invit->ldap_user_mail) +#. ($invit->auth_user_mail) #: lib/Lufi/Controller/Files.pm:122 msgid "" "Sorry, your invitation has expired or has been deleted. Please contact %1 to " @@ -642,7 +642,7 @@ msgstr "" "Es tut uns leid, Ihre Einladung ist abgelaufen oder wurde gelöscht. Bitte " "kontaktieren Sie %1, um eine weitere Einladung zu erhalten." -#. ($invitation->ldap_user_mail) +#. ($invitation->auth_user_mail) #: lib/Lufi/Controller/Invitation.pm:276 msgid "The URLs of your files have been sent by email to %1." msgstr "Die URLs Ihrer Dateien wurden per E-Mail an %1 gesendet." @@ -733,7 +733,7 @@ msgid "" msgstr "" "Die Links Ihrer Dateien werden automatisch per E-Mail an %1 (%2) gesendet" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:11 msgid "The links of your file(s) will automatically be sent by mail to %1." msgstr "Die Links Ihrer Dateien werden automatisch per E-Mail an %1 gesendet." diff --git a/themes/default/lib/Lufi/I18N/el.po b/themes/default/lib/Lufi/I18N/el.po index c567c33..7111888 100644 --- a/themes/default/lib/Lufi/I18N/el.po +++ b/themes/default/lib/Lufi/I18N/el.po @@ -24,12 +24,12 @@ msgstr "" msgid "%1 days" msgstr "%1 ημέρες" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:2 msgid "%1 invites you to send him/her files" msgstr "%1 σας προσκαλεί να του/της στείλετε αρχεία" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:6 msgid "%1 invites you to send him/her files through Lufi." msgstr "%1 σας προσκαλεί να του/της στείλετε αρχεία μέσα από το Lufi." @@ -614,14 +614,14 @@ msgstr "Μας συγχωρείτε, το ανέβασμα αρχείων είν msgid "Sorry, your invitation has expired or has been deleted." msgstr "Μας συγχωρείτε, η πρόσκληση έχει λήξει ή έχει διαγραφεί." -#. ($invit->ldap_user_mail) +#. ($invit->auth_user_mail) #: lib/Lufi/Controller/Files.pm:123 msgid "Sorry, your invitation has expired or has been deleted. Please contact %1 to have another invitation." msgstr "" "Μας συγχωρείτε, η πρόσκληση έχει λήξει ή έχει διαγραφεί. Επικοινωνήστε με το " "%1 για νέα πρόσκληση." -#. ($invitation->ldap_user_mail) +#. ($invitation->auth_user_mail) #: lib/Lufi/Controller/Invitation.pm:276 msgid "The URLs of your files have been sent by email to %1." msgstr "Οι σύνδεσμοι URL των αρχείων σας στάλθηκαν μέσω email στο %1." @@ -703,7 +703,7 @@ msgstr "" "Θα γίνει αυτόματη αποστολή του συνδέσμου / των συνδέσμων με email προς %1 " "(%2)" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:11 msgid "The links of your file(s) will automatically be sent by mail to %1." msgstr "" diff --git a/themes/default/lib/Lufi/I18N/en.po b/themes/default/lib/Lufi/I18N/en.po index 3a9b7ba..fa3f934 100644 --- a/themes/default/lib/Lufi/I18N/en.po +++ b/themes/default/lib/Lufi/I18N/en.po @@ -21,12 +21,12 @@ msgstr "" msgid "%1 days" msgstr "%1 days" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:2 msgid "%1 invites you to send him/her files" msgstr "%1 invites you to send him/her files" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:6 msgid "%1 invites you to send him/her files through Lufi." msgstr "%1 invites you to send him/her files through Lufi." @@ -550,12 +550,12 @@ msgstr "Sorry, uploading is disabled." msgid "Sorry, your invitation has expired or has been deleted." msgstr "Sorry, your invitation has expired or has been deleted." -#. ($invit->ldap_user_mail) +#. ($invit->auth_user_mail) #: lib/Lufi/Controller/Files.pm:123 msgid "Sorry, your invitation has expired or has been deleted. Please contact %1 to have another invitation." msgstr "Sorry, your invitation has expired or has been deleted. Please contact %1 to have another invitation." -#. ($invitation->ldap_user_mail) +#. ($invitation->auth_user_mail) #: lib/Lufi/Controller/Invitation.pm:295 msgid "The URLs of your files have been sent by email to %1." msgstr "The URLs of your files have been sent by email to %1." @@ -637,7 +637,7 @@ msgstr "The link(s) has been copied to your clipboard" msgid "The link(s) of your file(s) will automatically be sent by mail to %1 (%2)" msgstr "The link(s) of your file(s) will automatically be sent by mail to %1 (%2)" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:11 msgid "The links of your file(s) will automatically be sent by mail to %1." msgstr "The link(s) of your file(s) will automatically be sent by mail to %1." diff --git a/themes/default/lib/Lufi/I18N/es.po b/themes/default/lib/Lufi/I18N/es.po index 5f9fd13..2638a48 100644 --- a/themes/default/lib/Lufi/I18N/es.po +++ b/themes/default/lib/Lufi/I18N/es.po @@ -24,12 +24,12 @@ msgstr "" msgid "%1 days" msgstr "%1 días" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:2 msgid "%1 invites you to send him/her files" msgstr "%1 te invita a enviarle sus archivos" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:6 msgid "%1 invites you to send him/her files through Lufi." msgstr "%1 te invita a enviarle sus archivos a través de Lufi." @@ -588,14 +588,14 @@ msgstr "Lo sentimos, la carga está deshabilitada." msgid "Sorry, your invitation has expired or has been deleted." msgstr "Lo sentimos, tu invitación ha caducado o ha sido eliminada." -#. ($invit->ldap_user_mail) +#. ($invit->auth_user_mail) #: lib/Lufi/Controller/Files.pm:122 msgid "Sorry, your invitation has expired or has been deleted. Please contact %1 to have another invitation." msgstr "" "Lo sentimos, tu invitación ha caducado o ha sido eliminada. Póngase en " "contacto con% 1 para recibir otra invitación." -#. ($invitation->ldap_user_mail) +#. ($invitation->auth_user_mail) #: lib/Lufi/Controller/Invitation.pm:276 msgid "The URLs of your files have been sent by email to %1." msgstr "Las URL de sus archivos se han enviado por correo electrónico a% 1." @@ -679,7 +679,7 @@ msgid "The link(s) of your file(s) will automatically be sent by mail to %1 (%2) msgstr "" "Los enlaces de sus archivos se enviarán automáticamente por correo a %1 (%2)" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:11 msgid "The links of your file(s) will automatically be sent by mail to %1." msgstr "" diff --git a/themes/default/lib/Lufi/I18N/fr.po b/themes/default/lib/Lufi/I18N/fr.po index 1d4aba1..cb6009f 100644 --- a/themes/default/lib/Lufi/I18N/fr.po +++ b/themes/default/lib/Lufi/I18N/fr.po @@ -25,12 +25,12 @@ msgstr "" msgid "%1 days" msgstr "%1 jours" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:2 msgid "%1 invites you to send him/her files" msgstr "%1 vous invite à lui envoyer des fichiers" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:6 msgid "%1 invites you to send him/her files through Lufi." msgstr "%1 vous invite à lui envoyer des fichiers via Lufi." @@ -562,12 +562,12 @@ msgstr "Désolé, l’envoi de fichier est désactivé." msgid "Sorry, your invitation has expired or has been deleted." msgstr "Désolé, votre invitation a expiré ou a été supprimée." -#. ($invit->ldap_user_mail) +#. ($invit->auth_user_mail) #: lib/Lufi/Controller/Files.pm:123 msgid "Sorry, your invitation has expired or has been deleted. Please contact %1 to have another invitation." msgstr "Désolé, votre invitation a expiré ou a été supprimée. Veuillez contacter %1 pour obtenir une nouvelle invitation." -#. ($invitation->ldap_user_mail) +#. ($invitation->auth_user_mail) #: lib/Lufi/Controller/Invitation.pm:295 msgid "The URLs of your files have been sent by email to %1." msgstr "Les URL de vos fichiers ont été envoyées par courriel à %1." @@ -649,7 +649,7 @@ msgstr "Le(s) lien(s) a/ont été copié dans votre presse-papiers" msgid "The link(s) of your file(s) will automatically be sent by mail to %1 (%2)" msgstr "Les liens de vos fichiers seront automatiquement envoyés par courriel à %1 (%2)" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:11 msgid "The links of your file(s) will automatically be sent by mail to %1." msgstr "Les liens de vos fichiers seront automatiquement envoyés par courriel à %1." diff --git a/themes/default/lib/Lufi/I18N/fr_FR.po b/themes/default/lib/Lufi/I18N/fr_FR.po index 1d6be1f..7f7b21a 100644 --- a/themes/default/lib/Lufi/I18N/fr_FR.po +++ b/themes/default/lib/Lufi/I18N/fr_FR.po @@ -25,12 +25,12 @@ msgstr "" msgid "%1 days" msgstr "%1 jours" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:2 msgid "%1 invites you to send him/her files" msgstr "%1 vous invite à lui envoyer des fichiers" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:6 msgid "%1 invites you to send him/her files through Lufi." msgstr "%1 vous invite à lui envoyer des fichiers via Lufi." @@ -631,7 +631,7 @@ msgstr "Désolé, l’envoi de fichier est désactivé." msgid "Sorry, your invitation has expired or has been deleted." msgstr "Désolé, votre invitation a expiré ou a été supprimée." -#. ($invit->ldap_user_mail) +#. ($invit->auth_user_mail) #: lib/Lufi/Controller/Files.pm:122 msgid "" "Sorry, your invitation has expired or has been deleted. Please contact %1 to " @@ -640,7 +640,7 @@ msgstr "" "Désolé, votre invitation a expiré ou a été supprimée. Veuillez contacter %1 " "pour obtenir une nouvelle invitation." -#. ($invitation->ldap_user_mail) +#. ($invitation->auth_user_mail) #: lib/Lufi/Controller/Invitation.pm:276 msgid "The URLs of your files have been sent by email to %1." msgstr "Les URL de vos fichiers ont été envoyées par courriel à %1." @@ -733,7 +733,7 @@ msgstr "" "Les liens de vos fichiers seront automatiquement envoyés par courriel à %1 " "(%2)" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:11 msgid "The links of your file(s) will automatically be sent by mail to %1." msgstr "" diff --git a/themes/default/lib/Lufi/I18N/it.po b/themes/default/lib/Lufi/I18N/it.po index 6703f1f..2a50a5c 100644 --- a/themes/default/lib/Lufi/I18N/it.po +++ b/themes/default/lib/Lufi/I18N/it.po @@ -25,12 +25,12 @@ msgstr "" msgid "%1 days" msgstr "%1 giorni" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:2 msgid "%1 invites you to send him/her files" msgstr "%1 ti invita a inviargli/le i file" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:6 msgid "%1 invites you to send him/her files through Lufi." msgstr "%1 ti invita a inviargli/le i file attraverso Lufi." @@ -616,7 +616,7 @@ msgstr "L'invio del file è attualemente disattivato." msgid "Sorry, your invitation has expired or has been deleted." msgstr "Spiacente, il tuo invito è scaduto o è stato cancellato." -#. ($invit->ldap_user_mail) +#. ($invit->auth_user_mail) #: lib/Lufi/Controller/Files.pm:122 msgid "" "Sorry, your invitation has expired or has been deleted. Please contact %1 to " @@ -625,7 +625,7 @@ msgstr "" "Spiacente, il tuo invito è scaduto o è stato cancellato. Per avere un altro " "invito contatta per favore %1." -#. ($invitation->ldap_user_mail) +#. ($invitation->auth_user_mail) #: lib/Lufi/Controller/Invitation.pm:276 msgid "The URLs of your files have been sent by email to %1." msgstr "L'URL dei tuoi file è stato inviato via email a %1." @@ -714,7 +714,7 @@ msgid "" "The link(s) of your file(s) will automatically be sent by mail to %1 (%2)" msgstr "Il link dei tuoi file verrà automaticamente inviato via mail a %1 (%2)" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:11 msgid "The links of your file(s) will automatically be sent by mail to %1." msgstr "I link dei tuoi file verranno automaticamente inviati via mail a %1." diff --git a/themes/default/lib/Lufi/I18N/ja_JP.po b/themes/default/lib/Lufi/I18N/ja_JP.po index 38be340..6c99f8a 100644 --- a/themes/default/lib/Lufi/I18N/ja_JP.po +++ b/themes/default/lib/Lufi/I18N/ja_JP.po @@ -27,13 +27,13 @@ msgstr "" msgid "%1 days" msgstr "%1日" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:2 #, qt-format msgid "%1 invites you to send him/her files" msgstr "%1 はあなたにファイルを送信しようとしています" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:6 #, qt-format msgid "%1 invites you to send him/her files through Lufi." @@ -653,7 +653,7 @@ msgstr "申し訳ありません。現在アップロードは無効です。" msgid "Sorry, your invitation has expired or has been deleted." msgstr "申し訳ありません。招待は失効したか削除されました。" -#. ($invit->ldap_user_mail) +#. ($invit->auth_user_mail) #: lib/Lufi/Controller/Files.pm:123 #, qt-format msgid "" @@ -661,7 +661,7 @@ msgid "" "have another invitation." msgstr "申し訳ありません。招待は失効したか削除されました。%1に連絡して新たに招待を受けてください。" -#. ($invitation->ldap_user_mail) +#. ($invitation->auth_user_mail) #: lib/Lufi/Controller/Invitation.pm:277 #, qt-format msgid "The URLs of your files have been sent by email to %1." @@ -750,7 +750,7 @@ msgid "" "The link(s) of your file(s) will automatically be sent by mail to %1 (%2)" msgstr "あなたのファイルのリンクは、自動的に %1 (%2) にメールで送信されます" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:11 #, qt-format msgid "The links of your file(s) will automatically be sent by mail to %1." diff --git a/themes/default/lib/Lufi/I18N/lufi.pot b/themes/default/lib/Lufi/I18N/lufi.pot index 04229a3..82f0394 100644 --- a/themes/default/lib/Lufi/I18N/lufi.pot +++ b/themes/default/lib/Lufi/I18N/lufi.pot @@ -21,12 +21,12 @@ msgstr "" msgid "%1 days" msgstr "" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:2 msgid "%1 invites you to send him/her files" msgstr "" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:6 msgid "%1 invites you to send him/her files through Lufi." msgstr "" @@ -550,12 +550,12 @@ msgstr "" msgid "Sorry, your invitation has expired or has been deleted." msgstr "" -#. ($invit->ldap_user_mail) +#. ($invit->auth_user_mail) #: lib/Lufi/Controller/Files.pm:123 msgid "Sorry, your invitation has expired or has been deleted. Please contact %1 to have another invitation." msgstr "" -#. ($invitation->ldap_user_mail) +#. ($invitation->auth_user_mail) #: lib/Lufi/Controller/Invitation.pm:295 msgid "The URLs of your files have been sent by email to %1." msgstr "" @@ -637,7 +637,7 @@ msgstr "" msgid "The link(s) of your file(s) will automatically be sent by mail to %1 (%2)" msgstr "" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:11 msgid "The links of your file(s) will automatically be sent by mail to %1." msgstr "" diff --git a/themes/default/lib/Lufi/I18N/nl.po b/themes/default/lib/Lufi/I18N/nl.po index 89b03fd..1a6b9a4 100644 --- a/themes/default/lib/Lufi/I18N/nl.po +++ b/themes/default/lib/Lufi/I18N/nl.po @@ -21,12 +21,12 @@ msgstr "" msgid "%1 days" msgstr "%1 dagen" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:2 msgid "%1 invites you to send him/her files" msgstr "" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:6 msgid "%1 invites you to send him/her files through Lufi." msgstr "" @@ -598,14 +598,14 @@ msgstr "SOrry, uploaden is uitgeschakeld." msgid "Sorry, your invitation has expired or has been deleted." msgstr "" -#. ($invit->ldap_user_mail) +#. ($invit->auth_user_mail) #: lib/Lufi/Controller/Files.pm:122 msgid "" "Sorry, your invitation has expired or has been deleted. Please contact %1 to " "have another invitation." msgstr "" -#. ($invitation->ldap_user_mail) +#. ($invitation->auth_user_mail) #: lib/Lufi/Controller/Invitation.pm:276 msgid "The URLs of your files have been sent by email to %1." msgstr "" @@ -690,7 +690,7 @@ msgid "" "The link(s) of your file(s) will automatically be sent by mail to %1 (%2)" msgstr "" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:11 msgid "The links of your file(s) will automatically be sent by mail to %1." msgstr "" diff --git a/themes/default/lib/Lufi/I18N/oc.po b/themes/default/lib/Lufi/I18N/oc.po index de43e6e..d32d7c5 100644 --- a/themes/default/lib/Lufi/I18N/oc.po +++ b/themes/default/lib/Lufi/I18N/oc.po @@ -28,12 +28,12 @@ msgstr "" msgid "%1 days" msgstr "%1 jorns" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:2 msgid "%1 invites you to send him/her files" msgstr "%1 vos convida a li mandar de fichièrs" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:6 msgid "%1 invites you to send him/her files through Lufi." msgstr "%1 vos convida a li mandar de fichièrs per Lufi." @@ -628,7 +628,7 @@ msgstr "O planhèm, la foncion per mandar de fichièr es desactivada." msgid "Sorry, your invitation has expired or has been deleted." msgstr "O planhèm, vòstra invitacion a expirada o es estada suprimida." -#. ($invit->ldap_user_mail) +#. ($invit->auth_user_mail) #: lib/Lufi/Controller/Files.pm:122 msgid "" "Sorry, your invitation has expired or has been deleted. Please contact %1 to " @@ -637,7 +637,7 @@ msgstr "" "O planhèm, vòstra invitacion a expirada o es estada suprimida. Contactatz %1 " "per n’aver una autra." -#. ($invitation->ldap_user_mail) +#. ($invitation->auth_user_mail) #: lib/Lufi/Controller/Invitation.pm:276 msgid "The URLs of your files have been sent by email to %1." msgstr "Las URL de vòstres fichièrs son estadas mandadas per corrièl a %1." @@ -729,7 +729,7 @@ msgstr "" "Los ligams de vòstre(s) fichièr(s) seràn automaticament mandats per corrièl " "a %1 (%2)" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:11 msgid "The links of your file(s) will automatically be sent by mail to %1." msgstr "" diff --git a/themes/default/lib/Lufi/I18N/pt.po b/themes/default/lib/Lufi/I18N/pt.po index ae11c60..9e3fdc1 100644 --- a/themes/default/lib/Lufi/I18N/pt.po +++ b/themes/default/lib/Lufi/I18N/pt.po @@ -26,12 +26,12 @@ msgstr "" msgid "%1 days" msgstr "%1 dias" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:2 msgid "%1 invites you to send him/her files" msgstr "%1 convida você a enviar arquivos para ele" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:6 msgid "%1 invites you to send him/her files through Lufi." msgstr "%1convida você a enviar arquivos para ele via Lufi." @@ -625,7 +625,7 @@ msgstr "Desculpe, o envio do ficheiro está desativado." msgid "Sorry, your invitation has expired or has been deleted." msgstr "Desculpe, seu convite expirou ou foi excluído." -#. ($invit->ldap_user_mail) +#. ($invit->auth_user_mail) #: lib/Lufi/Controller/Files.pm:122 msgid "" "Sorry, your invitation has expired or has been deleted. Please contact %1 to " @@ -634,7 +634,7 @@ msgstr "" "Desculpe, seu convite expirou ou foi excluído. Por favor contate %1 para " "obter outro convite." -#. ($invitation->ldap_user_mail) +#. ($invitation->auth_user_mail) #: lib/Lufi/Controller/Invitation.pm:276 msgid "The URLs of your files have been sent by email to %1." msgstr "Os URLs dos seus arquivos foram enviados por e-mail para %1." @@ -725,7 +725,7 @@ msgstr "" "O(s) link(s) do(s) seu(s) arquivo(s) serão automaticamente enviados por e-" "mail para %1 (%2)" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:11 msgid "The links of your file(s) will automatically be sent by mail to %1." msgstr "" diff --git a/themes/default/lib/Lufi/I18N/ru.po b/themes/default/lib/Lufi/I18N/ru.po index a97c5ba..11cab73 100644 --- a/themes/default/lib/Lufi/I18N/ru.po +++ b/themes/default/lib/Lufi/I18N/ru.po @@ -25,12 +25,12 @@ msgstr "" msgid "%1 days" msgstr "%1 дней" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:2 msgid "%1 invites you to send him/her files" msgstr "%1 приглашает тебя отослать ему/ей файлы" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:6 msgid "%1 invites you to send him/her files through Lufi." msgstr "%1 приглашает тебя отослать ему/ей файлы через Lufi." @@ -599,14 +599,14 @@ msgstr "Извини, загрузка отключена." msgid "Sorry, your invitation has expired or has been deleted." msgstr "Извини, твое приглашение истекло или было удалено." -#. ($invit->ldap_user_mail) +#. ($invit->auth_user_mail) #: lib/Lufi/Controller/Files.pm:123 msgid "Sorry, your invitation has expired or has been deleted. Please contact %1 to have another invitation." msgstr "" "Извини, твое приглашение истекло или было удалено. Пожалуйста, попроси %1 " "выдать новое приглашение." -#. ($invitation->ldap_user_mail) +#. ($invitation->auth_user_mail) #: lib/Lufi/Controller/Invitation.pm:276 msgid "The URLs of your files have been sent by email to %1." msgstr "Ссылки на твои файлы были высланы по почте на %1." @@ -687,7 +687,7 @@ msgid "The link(s) of your file(s) will automatically be sent by mail to %1 (%2) msgstr "" "Ссылка(-и) на твой файл(ы) будут автоматически отправлены по почте %1 (%2)" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:11 msgid "The links of your file(s) will automatically be sent by mail to %1." msgstr "Ссылка(-и) на твой файл(ы) будут автоматически отправлены по почте %1." diff --git a/themes/default/lib/Lufi/I18N/sv.po b/themes/default/lib/Lufi/I18N/sv.po index 71e74d3..6151ec4 100644 --- a/themes/default/lib/Lufi/I18N/sv.po +++ b/themes/default/lib/Lufi/I18N/sv.po @@ -24,12 +24,12 @@ msgstr "" msgid "%1 days" msgstr "%1 dagar" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:2 msgid "%1 invites you to send him/her files" msgstr "%1 bjuder in dig att skicka filer till honom eller henne" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:6 msgid "%1 invites you to send him/her files through Lufi." msgstr "%1 bjuder in dig att skicka filer till honom eller henne via Lufi." @@ -581,14 +581,14 @@ msgstr "Det går tyvärr inte att ladda upp för tillfället." msgid "Sorry, your invitation has expired or has been deleted." msgstr "Din inbjudan har antingen gått ut eller raderats." -#. ($invit->ldap_user_mail) +#. ($invit->auth_user_mail) #: lib/Lufi/Controller/Files.pm:122 msgid "Sorry, your invitation has expired or has been deleted. Please contact %1 to have another invitation." msgstr "" "Din inbjudan har dessvärre gått ut eller raderats. Du kan kontakta %1 för " "att få en ny inbjudan." -#. ($invitation->ldap_user_mail) +#. ($invitation->auth_user_mail) #: lib/Lufi/Controller/Invitation.pm:276 msgid "The URLs of your files have been sent by email to %1." msgstr "Länken till dina filer har skickats med e-post till %1." @@ -669,7 +669,7 @@ msgid "The link(s) of your file(s) will automatically be sent by mail to %1 (%2) msgstr "" "Länkarna till dina filer kommer skickas per e-post till %1 (%2) automatiskt" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:11 msgid "The links of your file(s) will automatically be sent by mail to %1." msgstr "Länkarna till dina filer kommer skickas till %1 automatiskt." diff --git a/themes/default/lib/Lufi/I18N/zh_Hans.po b/themes/default/lib/Lufi/I18N/zh_Hans.po index 25b393c..a1bf166 100644 --- a/themes/default/lib/Lufi/I18N/zh_Hans.po +++ b/themes/default/lib/Lufi/I18N/zh_Hans.po @@ -24,12 +24,12 @@ msgstr "" msgid "%1 days" msgstr "%1 天" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:2 msgid "%1 invites you to send him/her files" msgstr "%1 邀请您给他发送文件" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:6 msgid "%1 invites you to send him/her files through Lufi." msgstr "%1 邀请您通过 Lufi 给他发送文件。" @@ -570,12 +570,12 @@ msgstr "抱歉,上传被禁用。" msgid "Sorry, your invitation has expired or has been deleted." msgstr "抱歉,您的邀请已过期或已被删除。" -#. ($invit->ldap_user_mail) +#. ($invit->auth_user_mail) #: lib/Lufi/Controller/Files.pm:123 msgid "Sorry, your invitation has expired or has been deleted. Please contact %1 to have another invitation." msgstr "抱歉,您的邀请已过期或已被删除。请联系 %1 获取新邀请。" -#. ($invitation->ldap_user_mail) +#. ($invitation->auth_user_mail) #: lib/Lufi/Controller/Invitation.pm:277 msgid "The URLs of your files have been sent by email to %1." msgstr "您的文件网址已通过电子邮件发送给 %1。" @@ -647,7 +647,7 @@ msgstr "链接已经复制到您的剪贴板" msgid "The link(s) of your file(s) will automatically be sent by mail to %1 (%2)" msgstr "您的文件链接会自动通过邮件发送给 %1(%2)" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:11 msgid "The links of your file(s) will automatically be sent by mail to %1." msgstr "您的文件的链接会自动通过邮件发送给 %1。" diff --git a/themes/default/lib/Lufi/I18N/zh_Hant.po b/themes/default/lib/Lufi/I18N/zh_Hant.po index d3a8eb3..f94364c 100644 --- a/themes/default/lib/Lufi/I18N/zh_Hant.po +++ b/themes/default/lib/Lufi/I18N/zh_Hant.po @@ -24,12 +24,12 @@ msgstr "" msgid "%1 days" msgstr "%1 日" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:2 msgid "%1 invites you to send him/her files" msgstr "%1 邀請您給他傳送檔案" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:6 msgid "%1 invites you to send him/her files through Lufi." msgstr "%1 邀請您透過 Lufi 給他傳送檔案。" @@ -570,12 +570,12 @@ msgstr "抱歉,上傳被禁用。" msgid "Sorry, your invitation has expired or has been deleted." msgstr "抱歉,您的邀請已過期或是已經被刪除。" -#. ($invit->ldap_user_mail) +#. ($invit->auth_user_mail) #: lib/Lufi/Controller/Files.pm:123 msgid "Sorry, your invitation has expired or has been deleted. Please contact %1 to have another invitation." msgstr "抱歉,您的邀請已過期或是已經被刪除。請聯絡 %1 取得另外的邀請。" -#. ($invitation->ldap_user_mail) +#. ($invitation->auth_user_mail) #: lib/Lufi/Controller/Invitation.pm:276 msgid "The URLs of your files have been sent by email to %1." msgstr "您的檔案的網址已經透過郵件寄給 %1。" @@ -647,7 +647,7 @@ msgstr "連結已經複製到您的剪貼簿" msgid "The link(s) of your file(s) will automatically be sent by mail to %1 (%2)" msgstr "您的檔案的連結會自動透過郵件寄給 %1(%2)" -#. (stash('ldap_user') +#. (stash('auth_user') #: themes/default/templates/invitations/invite.mail.ep:11 msgid "The links of your file(s) will automatically be sent by mail to %1." msgstr "您的檔案的連結會自動透過郵件寄給 %1。" diff --git a/themes/default/templates/index.html.ep b/themes/default/templates/index.html.ep index 67d5f0e..55b94ef 100644 --- a/themes/default/templates/index.html.ep +++ b/themes/default/templates/index.html.ep @@ -27,7 +27,7 @@
- <%= l('The link(s) of your file(s) will automatically be sent by mail to %1 (%2)', stash('invitation')->ldap_user, stash('invitation')->ldap_user_mail) %> + <%= l('The link(s) of your file(s) will automatically be sent by mail to %1 (%2)', stash('invitation')->auth_user, stash('invitation')->auth_user_mail) %>
diff --git a/themes/default/templates/invitations/invite.mail.ep b/themes/default/templates/invitations/invite.mail.ep index 6eb1f4a..b59da03 100644 --- a/themes/default/templates/invitations/invite.mail.ep +++ b/themes/default/templates/invitations/invite.mail.ep @@ -1,14 +1,14 @@ % # vim:set sw=4 ts=4 sts=4 ft=mail.epl expandtab: -% stash subject => l('%1 invites you to send him/her files', stash('ldap_user')); +% stash subject => l('%1 invites you to send him/her files', stash('auth_user')); %= l('Hello,') -%= l('%1 invites you to send him/her files through Lufi.', stash('ldap_user')) +%= l('%1 invites you to send him/her files through Lufi.', stash('auth_user')) %= l('Click on the following URL to upload files on Lufi:') %== stash('url') -%= l('The links of your file(s) will automatically be sent by mail to %1.', stash('ldap_user')) +%= l('The links of your file(s) will automatically be sent by mail to %1.', stash('auth_user')) %= l('This invitation is valid until %1.', stash('expires')) diff --git a/themes/default/templates/invitations/notification_files_sent.mail.ep b/themes/default/templates/invitations/notification_files_sent.mail.ep index acece75..8d23eac 100644 --- a/themes/default/templates/invitations/notification_files_sent.mail.ep +++ b/themes/default/templates/invitations/notification_files_sent.mail.ep @@ -3,7 +3,7 @@ % my $lang = $self->get_date_lang(); % stash subject => l('%1 sent you files', stash('invitation')->guest_mail); -%= l('Hello %1,', ucfirst(stash('invitation')->ldap_user)) +%= l('Hello %1,', ucfirst(stash('invitation')->auth_user)) %= l('%1 used your invitation to send you files:', stash('invitation')->guest_mail) diff --git a/utilities/migrations/mysql.sql b/utilities/migrations/mysql.sql index 31a3237..d51805f 100644 --- a/utilities/migrations/mysql.sql +++ b/utilities/migrations/mysql.sql @@ -55,3 +55,9 @@ ALTER TABLE files MODIFY filesize integer; ALTER TABLE slices MODIFY path varchar(255); -- 5 down ALTER TABLE slices MODIFY path varchar(255) unique NOT NULL; +-- 6 up +ALTER TABLE invitations CHANGE ldap_user auth_user varchar(255); +ALTER TABLE invitations CHANGE ldap_user_mail auth_user_mail varchar(255); +-- 6 down +ALTER TABLE invitations CHANGE auth_user ldap_user varchar(255); +ALTER TABLE invitations CHANGE auth_user_mail ldap_user_mail varchar(255); diff --git a/utilities/migrations/pg.sql b/utilities/migrations/pg.sql index 8083c23..2e8fe71 100644 --- a/utilities/migrations/pg.sql +++ b/utilities/migrations/pg.sql @@ -60,3 +60,9 @@ ALTER TABLE slices DROP CONSTRAINT slices_path_key; -- 6 down ALTER TABLE slices ADD CONSTRAINT slices_path_key UNIQUE (path) ; ALTER TABLE slices ALTER COLUMN path SET NOT NULL; +-- 7 up +ALTER TABLE invitations RENAME COLUMN ldap_user TO auth_user; +ALTER TABLE invitations RENAME COLUMN ldap_user_mail TO auth_user_mail; +-- 7 down +ALTER TABLE invitations RENAME COLUMN auth_user TO ldap_user; +ALTER TABLE invitations RENAME COLUMN auth_user_mail TO ldap_user_mail; diff --git a/utilities/migrations/sqlite.sql b/utilities/migrations/sqlite.sql index 462df33..19eac2e 100644 --- a/utilities/migrations/sqlite.sql +++ b/utilities/migrations/sqlite.sql @@ -94,3 +94,9 @@ CREATE TABLE IF NOT EXISTS invitations ( ); -- 4 down DROP TABLE invitations; +-- 5 up +ALTER TABLE invitations RENAME ldap_user TO auth_user; +ALTER TABLE invitations RENAME ldap_user_mail TO auth_user_mail; +-- 5 down +ALTER TABLE invitations RENAME auth_user TO ldap_user; +ALTER TABLE invitations RENAME auth_user_mail TO ldap_user_mail;