From be0b3c7b2cb5c5ed7e40ed634a249d4e25d98292 Mon Sep 17 00:00:00 2001 From: Luc Didry Date: Sun, 29 Sep 2019 16:44:51 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E2=80=94=20Fix=20#161=20?= =?UTF-8?q?=E2=80=94=20Translate=20dates=20in=20invitations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Many thanks to https://framagit.org/RainX who reported the bug and provided the fix 🙂 --- AUTHORS.md | 1 + CHANGELOG | 3 +++ lib/Lufi/Controller/Invitation.pm | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index cbfbe5f..09a575e 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -29,6 +29,7 @@ - Mildis (bugfix) - TECH'advantage, https://www.tech-advantage.com/ (paid for LDAP invitations feature) - pi2 (typo) +- Rain (bugfix) ## Vulnerabilities / bug hunters 🐛 diff --git a/CHANGELOG b/CHANGELOG index ad24f44..b88d060 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ 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 - Update german language diff --git a/lib/Lufi/Controller/Invitation.pm b/lib/Lufi/Controller/Invitation.pm index 29049e4..fca4cb3 100644 --- a/lib/Lufi/Controller/Invitation.pm +++ b/lib/Lufi/Controller/Invitation.pm @@ -81,7 +81,7 @@ sub send_invite { ldap_user => ucfirst($invitation->ldap_user), url => $url, 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.
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 $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( from => $from, to => $i->guest_mail,