Merge branch 'master' into ticket-app-master

# Conflicts:
#	docs/source/development/create-a-new-bundle.md
#	src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
#	src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
#	src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
#	src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
#	src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig
#	src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig
#	src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
#	src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts
#	src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
#	src/Bundle/ChillMainBundle/translations/messages.fr.yml
#	src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue

config/bundles.php

@@ -38,4 +38,5 @@ return [
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
     Symfony\UX\Translator\UxTranslatorBundle::class => ['all' => true],
     loophp\PsrHttpMessageBridgeBundle\PsrHttpMessageBridgeBundle::class => ['all' => true],
+    Chill\ZimbraBundle\ChillZimbraBundle::class => ['all' => true],
 ];

config/packages/chill.yaml

@@ -1,5 +1,5 @@
 chill_main:
-    available_languages: [ '%env(resolve:LOCALE)%', 'en' ]
+    available_languages: [ '%env(resolve:LOCALE)%', 'en', 'nl' ]
     available_countries: ['BE', 'FR']
     top_banner:
         visible: false

config/packages/translation.yaml

@@ -1,7 +1,12 @@
+# config/packages/translation.yaml
 framework:
-    default_locale: en
+    default_locale: '%env(resolve:LOCALE)%'   # LOCALE=fr in .env
     translator:
         default_path: '%kernel.project_dir%/translations'
         fallbacks:
-            - en
+            - '%env(resolve:LOCALE)%'        # fr
         providers:
+            loco:
+                dsn: '%env(LOCO_DSN)%'
+                domains: [ 'messages' ]
+                locales: [ 'fr', 'nl' ]

config/packages/translation_chill.yaml

@@ -1,4 +0,0 @@
-framework:
-    default_locale:  '%env(resolve:LOCALE)%'
-    translator:
-        fallbacks: [ '%env(resolve:LOCALE)%' ]