Merge branch 'development' into 'master'

Development

Closes #161

See merge request fiat-tux/hat-softwares/lufi!35

.gitignore

@@ -1,7 +1,7 @@
 local/*
 files/*
 cover_db/*
-lufi.conf
+*.conf
 *.db
 *.db-shm
 *.db-wal

.gitlab-ci.yml

@@ -33,6 +33,8 @@ variables:
     paths:
       - local.tar
     expire_in: 3 hours
+  needs:
+    - carton
   after_script:
     - tar cf local.tar local/
 
@@ -51,14 +53,14 @@ variables:
 
 .sqlite_template: &sqlite_definition
   <<: *tests_template
-  dependencies:
+  needs:
     - carton_sqlite
   services:
     - name: rroemhild/test-openldap
       alias: rroemhild-test-openldap
 .pg_template: &pg_definition
   <<: *tests_template
-  dependencies:
+  needs:
     - carton_postgresql
   services:
     - name: postgres:11
@@ -67,7 +69,7 @@ variables:
       alias: rroemhild-test-openldap
 .mysql_template: &mysql_definition
   <<: *tests_template
-  dependencies:
+  needs:
     - carton_mysql
   services:
     - name: mariadb:10.3

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 🐛
 

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

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.<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 $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,

lufi.conf.template

@@ -101,10 +101,6 @@
     # optional, no domains allowed by default
     #allowed_domains   => ['http://1.example.com', 'http://2.example.com'],
 
-    # If set, the shortened URLs will use this domain
-    # optional
-    #fixed_domain => 'example.org',
-
     # Define a path to the upload directory, where the uploaded files will be stored
     # You can define it relative to lufi directory or set an absolute path
     # Remember that it has to be in a directory writable by Lufi user