MirrorMirror
/
lufi
mirror of https://framagit.org/fiat-tux/hat-softwares/lufi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

🐛 — Fix #161 — Translate dates in invitations 

Many thanks to https://framagit.org/RainX who reported the bug and
provided the fix 🙂
This commit is contained in:
Luc Didry 2019-09-29 16:44:51 +02:00
parent b59845074f
commit be0b3c7b2c
No known key found for this signature in database
GPG Key ID: EA868E12D0257E3C
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS.md
View File

@ -29,6 +29,7 @@
- Mildis (bugfix) - Mildis (bugfix)
- TECH'advantage, https://www.tech-advantage.com/ (paid for LDAP invitations feature) - TECH'advantage, https://www.tech-advantage.com/ (paid for LDAP invitations feature)
- pi2 (typo) - pi2 (typo)
- Rain (bugfix)
## Vulnerabilities / bug hunters 🐛 ## Vulnerabilities / bug hunters 🐛

3
CHANGELOG
View File

@ -1,6 +1,9 @@
Revision history for Lufi Revision history for Lufi
?.??.? ????-??-?? ?.??.? ????-??-??
- Translate dates in invitations (#161)
- Ignore all .conf files in .gitignore
- Remove redundant fixed_domain setting in conf template
0.04.2 2019-08-14 0.04.2 2019-08-14
- Update german language - Update german language

4
lib/Lufi/Controller/Invitation.pm
View File

@ -81,7 +81,7 @@ sub send_invite {
ldap_user => ucfirst($invitation->ldap_user), ldap_user => ucfirst($invitation->ldap_user),
url => $url, url => $url,
invitation => $invitation, invitation => $invitation,
expires => time2str($c->l('%A %d %B %Y at %T'), $invitation->expire_at) expires => $c->get_date_lang()->time2str($c->l('%A %d %B %Y at %T'), $invitation->expire_at)
); );
push @success, $c->l('Invitation sent to %1.<br> URL: %2', $invitation->guest_mail, $url); push @success, $c->l('Invitation sent to %1.<br> URL: %2', $invitation->guest_mail, $url);
@ -156,7 +156,7 @@ sub resend_invitations {
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_ldap_user_mail'}) ? $i->ldap_user_mail : $c->config('mail_sender');
my $url = $c->url_for('guest', token => $i->token)->to_abs; my $url = $c->url_for('guest', token => $i->token)->to_abs;
my $expire = time2str($c->l('%A %d %B %Y at %T'), $i->expire_at); my $expire = $c->get_date_lang()->time2str($c->l('%A %d %B %Y at %T'), $i->expire_at);
$c->mail( $c->mail(
from => $from, from => $from,
to => $i->guest_mail, to => $i->guest_mail,