From c7d7cb5720cec3759e68a758f5246e439ff6eb6f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Sat, 28 Aug 2021 11:13:06 +0200 Subject: [PATCH 01/16] Cleanup --- Form/ApplicationType.php | 2 +- Form/RegisterType.php | 2 +- RapsysAirBundle.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Form/ApplicationType.php b/Form/ApplicationType.php index 572478c..9d8dc83 100644 --- a/Form/ApplicationType.php +++ b/Form/ApplicationType.php @@ -1,7 +1,7 @@ * diff --git a/Form/RegisterType.php b/Form/RegisterType.php index b6689a7..9cf939d 100644 --- a/Form/RegisterType.php +++ b/Form/RegisterType.php @@ -1,7 +1,7 @@ * diff --git a/RapsysAirBundle.php b/RapsysAirBundle.php index 46a770d..b105d39 100644 --- a/RapsysAirBundle.php +++ b/RapsysAirBundle.php @@ -1,7 +1,7 @@ * -- 2.41.1 From 9970e687b66834a69eb289af7e96a8affff82b9a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Sat, 28 Aug 2021 13:07:39 +0200 Subject: [PATCH 02/16] Remove location short -- 2.41.1 From 5ef395b0614118645c4f4776eb24ddb4a9dedec0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Sat, 28 Aug 2021 13:07:55 +0200 Subject: [PATCH 03/16] Add missing used namespaces --- Controller/DefaultController.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Controller/DefaultController.php b/Controller/DefaultController.php index e28e661..e55d6e8 100644 --- a/Controller/DefaultController.php +++ b/Controller/DefaultController.php @@ -18,9 +18,13 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Mailer\Exception\TransportExceptionInterface; use Symfony\Component\Mailer\MailerInterface; use Symfony\Component\Mime\Address; +use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken; +use Rapsys\AirBundle\Entity\Civility; use Rapsys\AirBundle\Entity\Location; use Rapsys\AirBundle\Entity\Session; +use Rapsys\AirBundle\Entity\Snippet; +use Rapsys\AirBundle\Entity\User; use Rapsys\AirBundle\Pdf\DisputePdf; /** -- 2.41.1 From aa959195ee41ca2ce08b87214b84612847f0bbed Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Sat, 28 Aug 2021 13:08:22 +0200 Subject: [PATCH 04/16] Set slug with pseudonym and empty slug Improve reset password notice display conditions --- Controller/UserController.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Controller/UserController.php b/Controller/UserController.php index 6385828..b4f5765 100644 --- a/Controller/UserController.php +++ b/Controller/UserController.php @@ -49,15 +49,6 @@ class UserController extends DefaultController { throw $this->createAccessDeniedException($this->translator->trans('Unable to access user: %mail%', ['%mail%' => $smail])); } - //With admin - if ($this->isGranted('ROLE_ADMIN')) { - //With pseudonym and without slug - if (!empty($pseudonym = $user->getPseudonym()) && empty($user->getSlug())) { - //Preset slug - $user->setSlug($slugger->slug($pseudonym)); - } - } - //Create the RegisterType form and give the proper parameters $edit = $this->createForm($this->config['edit']['view']['edit'], $user, [ //Set action to register route name and context @@ -119,11 +110,6 @@ class UserController extends DefaultController { //Add reset view $this->config['edit']['view']['context']['reset'] = $reset->createView(); - //Without admin role - //XXX: prefer a reset on login to force user unspam action - } else { - //Add notice - $this->addFlash('notice', $this->translator->trans('To change your password login with your mail and any password then follow the procedure')); } //With post method @@ -136,6 +122,15 @@ class UserController extends DefaultController { //Set data $data = $edit->getData(); + //With admin + if ($this->isGranted('ROLE_ADMIN')) { + //With pseudonym and without slug + if (!empty($pseudonym = $data->getPseudonym()) && empty($data->getSlug())) { + //Set slug + $data->setSlug($slugger->slug($pseudonym)); + } + } + //Queue snippet save $manager->persist($data); @@ -152,9 +147,14 @@ class UserController extends DefaultController { //Catch double slug or mail } catch (UniqueConstraintViolationException $e) { //Add error message mail already exists - $this->addFlash('error', $this->translator->trans('Account %mail% or with slug %slug% already exists', ['%mail%' => $data->getMail(), '%slug%' => $slug])); + $this->addFlash('error', $this->translator->trans('Account %mail% already exists', ['%mail%' => $data->getMail()])); } } + //Without admin role + //XXX: prefer a reset on login to force user unspam action + } elseif (!$this->isGranted('ROLE_ADMIN')) { + //Add notice + $this->addFlash('notice', $this->translator->trans('To change your password login with your mail and any password then follow the procedure')); } //Render view -- 2.41.1 From 1e64ab56695919b096eefdf5d50cbe609de1a269 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Sat, 28 Aug 2021 13:11:03 +0200 Subject: [PATCH 05/16] Remove pseudonym requirement --- Form/RegisterType.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Form/RegisterType.php b/Form/RegisterType.php index 9cf939d..0e0395f 100644 --- a/Form/RegisterType.php +++ b/Form/RegisterType.php @@ -15,7 +15,6 @@ use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\Extension\Core\Type\TelType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\Validator\Constraints\NotBlank; class RegisterType extends \Rapsys\UserBundle\Form\RegisterType { /** @@ -32,7 +31,7 @@ class RegisterType extends \Rapsys\UserBundle\Form\RegisterType { //Add extra pseudonym field if (!empty($options['pseudonym'])) { - $form->add('pseudonym', TextType::class, ['attr' => ['placeholder' => 'Your pseudonym'], 'constraints' => [new NotBlank(['message' => 'Please provide your pseudonym'])]]); + $form->add('pseudonym', TextType::class, ['attr' => ['placeholder' => 'Your pseudonym'], 'required' => false]); } //Add extra slug field -- 2.41.1 From b3aa0544ec8eb2c1bfd31b940df5dc4f3947a20b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Sat, 28 Aug 2021 13:11:39 +0200 Subject: [PATCH 06/16] Reuse current request uri --- Resources/views/form/edit.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/views/form/edit.html.twig b/Resources/views/form/edit.html.twig index e8e0adf..2f7286a 100644 --- a/Resources/views/form/edit.html.twig +++ b/Resources/views/form/edit.html.twig @@ -2,7 +2,7 @@ {% block title %}{{ site.title }} - {{ title }}{% endblock %} {% block content %}
-

{{ title }}

+

{{ title }}

{{ form_start(edit) }}
{% if edit.mail is defined %} @@ -42,7 +42,7 @@
{% if reset is defined %}
-

{{ password }}

+

{{ password }}

{{ form_start(reset) }}
{% if reset.password is defined %} -- 2.41.1 From d2c71fec4206c2cfe73bc97d6693b5ad0caf428b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Sat, 28 Aug 2021 13:12:39 +0200 Subject: [PATCH 07/16] Remove unused translation --- Resources/translations/messages.en_gb.yaml | 1 - Resources/translations/messages.fr_fr.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/Resources/translations/messages.en_gb.yaml b/Resources/translations/messages.en_gb.yaml index 65f757b..defbcd9 100644 --- a/Resources/translations/messages.en_gb.yaml +++ b/Resources/translations/messages.en_gb.yaml @@ -11,7 +11,6 @@ 'Account %mail% already exists': 'Account %mail% already exists' 'Account %mail% created but unable to contact': 'Account %mail% created but unable to contact' 'Account %mail% do not exists': 'Account %mail% do not exists' -'Account %mail% or with slug %slug% already exists': 'Account %mail% or with slug %slug% already exists' 'Account %mail% password updated': 'Account %mail% password updated' 'Account %mail% updated but unable to contact': 'Account %mail% updated but unable to contact' 'Account %mail% updated': 'Account %mail% updated' diff --git a/Resources/translations/messages.fr_fr.yaml b/Resources/translations/messages.fr_fr.yaml index 4c08268..5d13d42 100644 --- a/Resources/translations/messages.fr_fr.yaml +++ b/Resources/translations/messages.fr_fr.yaml @@ -11,7 +11,6 @@ 'Account %mail% already exists': 'Compte %mail% déjà existant' 'Account %mail% created but unable to contact': 'Compte %mail% créé mais impossible à contacter' 'Account %mail% do not exists': 'Compte %mail% n''existe pas' -'Account %mail% or with slug %slug% already exists': 'Compte %mail% ou avec limace %slug% déjà existant' 'Account %mail% password updated': 'Mot de passe du compte %mail% mis à jour' 'Account %mail% updated but unable to contact': 'Compte %mail% mis à jour mais impossible à contacter' 'Account %mail% updated': 'Compte %mail% mis à jour' -- 2.41.1 From d9d15337d88f4ca34c2e419f7782f750540fccb6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Sun, 29 Aug 2021 06:43:25 +0200 Subject: [PATCH 08/16] Reorder --- Entity/User.php | 62 ++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/Entity/User.php b/Entity/User.php index 1fb9f1a..189e0ea 100644 --- a/Entity/User.php +++ b/Entity/User.php @@ -185,37 +185,6 @@ class User extends BaseUser { return $this->applications; } - /** - * Add snippet - * - * @param Snippet $snippet - * - * @return User - */ - public function addSnippet(Snippet $snippet): User { - $this->snippets[] = $snippet; - - return $this; - } - - /** - * Remove snippet - * - * @param Snippet $snippet - */ - public function removeSnippet(Snippet $snippet): bool { - return $this->snippets->removeElement($snippet); - } - - /** - * Get snippets - * - * @return ArrayCollection - */ - public function getSnippets(): ArrayCollection { - return $this->snippets; - } - /** * Add dance * @@ -280,6 +249,37 @@ class User extends BaseUser { return $this->locations; } + /** + * Add snippet + * + * @param Snippet $snippet + * + * @return User + */ + public function addSnippet(Snippet $snippet): User { + $this->snippets[] = $snippet; + + return $this; + } + + /** + * Remove snippet + * + * @param Snippet $snippet + */ + public function removeSnippet(Snippet $snippet): bool { + return $this->snippets->removeElement($snippet); + } + + /** + * Get snippets + * + * @return ArrayCollection + */ + public function getSnippets(): ArrayCollection { + return $this->snippets; + } + /** * Add subscriber * -- 2.41.1 From 05b55f89bc508b0d6c43c4d854fb5e9ffdf6484c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Sun, 29 Aug 2021 06:43:32 +0200 Subject: [PATCH 09/16] Cleanup --- Entity/Dance.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Entity/Dance.php b/Entity/Dance.php index e3779da..c269f32 100644 --- a/Entity/Dance.php +++ b/Entity/Dance.php @@ -55,6 +55,8 @@ class Dance { //Set defaults $this->created = new \DateTime('now'); $this->updated = new \DateTime('now'); + + //Set collections $this->applications = new ArrayCollection(); $this->users = new ArrayCollection(); } @@ -204,7 +206,7 @@ class Dance { * {@inheritdoc} */ public function preUpdate(PreUpdateEventArgs $eventArgs) { - //Check that we have an session instance + //Check that we have a dance instance if (($dance = $eventArgs->getEntity()) instanceof Dance) { //Set updated value $dance->setUpdated(new \DateTime('now')); -- 2.41.1 From c6bbcfd55938e1dac9eab54a00f5880e1f712785 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Tue, 7 Sep 2021 15:54:14 +0200 Subject: [PATCH 10/16] Add markdown parsedown requirement --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4b932cb..15300ae 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,8 @@ }, "require": { "doctrine/doctrine-bundle": "^1.0|^2.0", - "doctrine/orm": "^2.7", + "doctrine/orm": "^2.0", + "erusev/parsedown": "^1.7", "rapsys/userbundle": "dev-master", "rapsys/packbundle": "dev-master", "fpdf/fpdf": "^1.83", -- 2.41.1 From 0d5b10dfb87e7393daa1c43147ce70f1e5b8806d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Tue, 7 Sep 2021 15:55:27 +0200 Subject: [PATCH 11/16] Update translations --- Resources/translations/messages.en_gb.yaml | 33 +++++++++++++++---- Resources/translations/messages.fr_fr.yaml | 37 ++++++++++++++++------ 2 files changed, 54 insertions(+), 16 deletions(-) diff --git a/Resources/translations/messages.en_gb.yaml b/Resources/translations/messages.en_gb.yaml index defbcd9..45c34b8 100644 --- a/Resources/translations/messages.en_gb.yaml +++ b/Resources/translations/messages.en_gb.yaml @@ -1,3 +1,6 @@ +'%city% %slot% on %date% at %time%': '%city% %slot% on %date% at %time%' +'%dance% %city% %slot% on %date% at %time%': '%dance% %city% %slot% on %date% at %time%' +'%dance% %id% by %pseudonym%': '%dance% %id% by %pseudonym%' '%pseudonym% outdoor Argentine Tango session calendar': '%pseudonym% outdoor Argentine Tango session calendar' '%title%''s mission is simple: provide dancers with the information they need to easily find organizers dance sessions.': '%title%''s mission is simple: provide dancers with the information they need to easily find organizers dance sessions.' '%title%, an information site for outdoor dancers and organizers.': '%title%, an information site for outdoor dancers and organizers.' @@ -8,6 +11,7 @@ 'Absence the first hour in cancellation case': 'Absence the first hour in cancellation case' 'Abstract': 'Abstract' 'Access denied': 'Access denied' +'Access map': 'Access map' 'Account %mail% already exists': 'Account %mail% already exists' 'Account %mail% created but unable to contact': 'Account %mail% created but unable to contact' 'Account %mail% do not exists': 'Account %mail% do not exists' @@ -55,9 +59,14 @@ 'Argentine Tango at Trocadero esplanade': 'Argentine Tango on Trocadero esplanade' 'Argentine Tango at Vendome place': 'Argentine Tango in Vendome place' 'Argentine Tango at Vivian Maier garden': 'Argentine Tango in Vivian Maier garden' +'Argentine Tango ball and class': 'Argentine Tango ball and class' +'Argentine Tango ball': 'Argentine Tango ball' 'Argentine Tango in Paris': 'Argentine Tango in Paris' 'Argentine Tango organizers': 'Argentine Tango organizers' +'Argentine Tango private class': 'Argentine Tango private class' +'Argentine Tango public class': 'Argentine Tango public class' 'Argentine Tango': 'Argentine Tango' +'Around %start% until %stop%': 'Around %start% until %stop%' 'Assit at location an organizer': 'Assit at location an organizer' 'Assited or organized once at location': 'Assited or organized once at location' 'Attended once since start until end': 'Attended once since start until end' @@ -68,6 +77,8 @@ 'Autonomous enclosure 250W RMS (Ibiza Sound Port 10 or superior)': 'Autonomous enclosure 250W RMS (Ibiza Sound Port 10 or superior)' 'Autonomous music player (with Bluetooth, Jack, MiniJack or RCA connectivity)': 'Autonomous music player (with Bluetooth, Jack, MiniJack or RCA connectivity)' 'Backup battery': 'Backup battery' +'Ball and class': 'Ball and class' +'Ball': 'Ball' 'Bastille place': 'Bastille place' 'Begin': 'Begin' 'Broom and/or squeegee depending on location': 'Broom and/or squeegee depending on location' @@ -87,13 +98,13 @@ 'Consult %title% website': 'Consult %title% website' 'Contact Libre Air': 'Contact Libre Air' 'Contact': 'Contact' -'Contribute to %title%': 'Contribute to %title%' -'Contribution': 'Contribution' +'Contribution to costs': 'Contribution to costs' 'Copyright 2019-2021': 'Copyright 2019-2021' 'Cortina every 2 to 4 songs': 'Cortina every 2 to 4 songs' 'Cortina every 3 to 4 songs': 'Cortina every 3 to 4 songs' 'Court city': 'Court city' 'Created': 'Created' +'Dance floor in the mini-garden of the Monde headquarter, pass under the arch then go along to the left, the dance floor is at the balcony of the Austerlitz rail station tracks.': 'Dance floor in the mini-garden of the Monde headquarter, pass under the arch then go along to the left, the dance floor is at the balcony of the Austerlitz rail station tracks.' 'Dance': 'Dance' 'Dashboard': 'Dashboard' 'Date': 'Date' @@ -126,8 +137,8 @@ 'French': 'French' 'Frequently asked questions': 'Frequently asked questions' 'Friday': 'Friday' -'From %start% to %stop%': 'From %start% to %stop%' 'Fund our mission': 'Fund our mission' +'GPS coordinates': 'GPS coordinates' 'Garnier opera': 'Garnier opera' 'Garnier': 'Garnier' 'Guest': 'Guest' @@ -145,8 +156,10 @@ 'If you did not receive a verification mail, check your Spam or Junk mail folders': 'If you did not receive a verification mail, check your Spam or Junk mail folders' 'Igor Stravinsky place': 'Igor Stravinsky place' 'Image': 'Image' +'In Paris': 'In Paris' 'In case of bug or glitch you may contact us throught the contact form: %title%': 'In case of bug or glitch you may contact us throught the contact form: %title%' 'In the future, %title% hopes to become a daily visited resource for participants and organizers of outdoor dance sessions.': 'In the future, %title% hopes to become a daily visited resource for participants and organizers of outdoor dance sessions.' +'Indoor': 'Indoor' 'Intermediate french communication': 'Intermediate french communication' 'Intermediate tango ballroom organisation': 'Intermediate tango ballroom organisation' 'Intermediate tango music programming': 'Intermediate tango music programming' @@ -200,7 +213,6 @@ 'Medium change': 'Medium change' 'Meeting': 'Meeting' 'Message': 'Message' -'Minimap': 'Minimap' 'Miss': 'Miss' 'Missing broom (except Opera/Orsay/Tokyo)': 'Missing broom (except Opera/Orsay/Tokyo)' 'Missing in action': 'Missing in action' @@ -211,7 +223,7 @@ 'Modify': 'Modify' 'Monday': 'Monday' 'Monde garden': 'Monde garden' -'Monde': 'Monde' +'Monde garden access map': 'Monde garden access map' 'Monthly application %location% already exists': 'Monthly application %location% already exists' 'More than one hour delay': 'More than one hour delay' 'Morning': 'Morning' @@ -225,6 +237,7 @@ 'Name': 'Name' 'Navigation': 'Navigation' 'No more battery': 'No more battery' +'No': 'No' 'Nobody': 'Nobody' 'None': 'None' 'Not Found': 'Not Found' @@ -260,8 +273,11 @@ 'Preparation': 'Preparation' 'Prerequisite': 'Prerequisite' 'Present qualified majority': 'Present qualified majority' +'Private class': 'Private class' 'Profile': 'Profile' +'Program': 'Program' 'Pseudonym': 'Pseudonym' +'Public class': 'Public class' 'Qualified double majority': 'Qualified double majority' 'Qualified majority': 'Qualified majority' 'Questions asked via the contact form will be added to this page as they arise.': 'Questions asked via the contact form will be added to this page as they arise.' @@ -339,8 +355,8 @@ 'To create your account you must follow this link:': 'To create your account you can follow this link:' 'To recover your account follow this link: %recover_url%': 'To recover your account follow this link: %recover_url%' 'To recover your account follow this link:': 'To recover your account follow this link:' -'To the hat, ideally %rate% €, to cover the costs: talc, electricity, bicycle, server': 'To the hat, ideally %rate% €, to cover the costs: talc, electricity, bicycle, server' -'To the hat, to cover the costs: talc, electricity, bicycle, server': 'To the hat, to cover the costs: talc, electricity, bicycle, server' +'To the hat, ideally %rate% €, to cover: talc, electricity, bicycle, server, ...': 'To the hat, ideally %rate% €, to cover: talc, electricity, bicycle, server, ...' +'To the hat, to cover: talc, electricity, bicycle, server, ...': 'To the hat, to cover: talc, electricity, bicycle, server, ...' 'Tokyo palace': 'Tokyo palace' 'Tokyo': 'Tokyo' 'Traffic at prohibited time': 'Traffic at prohibited time' @@ -376,6 +392,7 @@ 'Who are we ?': 'Who are we ?' 'Who can create an account ?': 'Who can create an account ?' 'Who': 'Who' +'Yes': 'Yes' 'Your abstract': 'Your abstract' 'Your account has been activated': 'Your account has been activated' 'Your account has been created': 'Your account has been created' @@ -399,6 +416,7 @@ 'Your hat': 'Your hat' 'Your hotspot': 'Your hotspot' 'Your image': 'Your image' +'Your indoor': 'Your indoor' 'Your latitude': 'Your latitude' 'Your length': 'Your length' 'Your link': 'Your link' @@ -459,6 +477,7 @@ 'dispute': 'dispute' 'faq': 'faq' 'frequently asked questions': 'frequently asked questions' +'in Paris': 'in Paris' 'listing': 'listing' 'location list': 'location list' 'locations': 'locations' diff --git a/Resources/translations/messages.fr_fr.yaml b/Resources/translations/messages.fr_fr.yaml index 5d13d42..3badac7 100644 --- a/Resources/translations/messages.fr_fr.yaml +++ b/Resources/translations/messages.fr_fr.yaml @@ -1,3 +1,6 @@ +'%city% %slot% on %date% at %time%': '%city% %slot% le %date% à %time%' +'%dance% %city% %slot% on %date% at %time%': '%dance% %city% %slot% le %date% à %time%' +'%dance% %id% by %pseudonym%': '%dance% %id% par %pseudonym%' '%pseudonym% outdoor Argentine Tango session calendar': 'Calendrier des sessions de Tango Argentin en plein air de %pseudonym%' '%title%''s mission is simple: provide dancers with the information they need to easily find organizers dance sessions.': 'L''activité d''%title% est simple : fournir aux danseurs les informations dont ils ont besoin pour trouver facilement les organisateurs de séances de danse.' '%title%, an information site for outdoor dancers and organizers.': '%title%, un site d''information pour danseurs et organisateurs extérieurs.' @@ -8,6 +11,7 @@ 'Absence the first hour in cancellation case': 'Absence la première heure en cas d''annulation' 'Abstract': 'Résumé' 'Access denied': 'Accès refusé' +'Access map': 'Plan d''accès' 'Account %mail% already exists': 'Compte %mail% déjà existant' 'Account %mail% created but unable to contact': 'Compte %mail% créé mais impossible à contacter' 'Account %mail% do not exists': 'Compte %mail% n''existe pas' @@ -59,9 +63,14 @@ 'Argentine Tango at Trocadero esplanade': 'Tango Argentin sur l''esplanade du Trocadero' 'Argentine Tango at Vendome place': 'Tango Argentin sur la place Vendôme' 'Argentine Tango at Vivian Maier garden': 'Tango Argentin au jardin Vivian Maier' +'Argentine Tango ball and class': 'Bal et cours de Tango Argentin' +'Argentine Tango ball': 'Bal de Tango Argentin' 'Argentine Tango in Paris': 'Tango Argentin à Paris' 'Argentine Tango organizers': 'Organisateurs de Tango Argentin' +'Argentine Tango private class': 'Cours privé de Tango Argentin' +'Argentine Tango public class': 'Cours collectif de Tango Argentin' 'Argentine Tango': 'Tango Argentin' +'Around %start% until %stop%': 'Vers %start% jusqu''à %stop%' 'Assit at location an organizer': 'Assister sur l''emplacement un organisateur' 'Assited or organized once at location': 'Assister ou organiser une fois sur l''emplacement' 'Attended once since start until end': 'Être présent une fois du début à la fin' @@ -73,6 +82,8 @@ 'Autonomous enclosure 250W RMS (Ibiza Sound Port 10 or superior)': 'Enceinte autonome 250W RMS (Ibiza Sound Port 10 ou supérieure)' 'Autonomous music player (with Bluetooth, Jack, MiniJack or RCA connectivity)': 'Lecteur de musique autonome (avec connectivité Bluetooth, Jack, MiniJack ou RCA)' 'Backup battery': 'Batterie de secours' +'Ball and class': 'Bal et cours' +'Ball': 'Bal' 'Bastille place': 'Place de la Bastille' 'Begin': 'Début' 'Broom and/or squeegee depending on location': 'Balais et/ou raclette selon l''emplacement' @@ -92,13 +103,13 @@ 'Consult %title% website': 'Consulter le site de %title%' 'Contact Libre Air': 'Contacter Air Libre' 'Contact': 'Contacter' -'Contribute to %title%': 'Contribuer à %title%' -'Contribution': 'Contribution' +'Contribution to costs': 'Contribution aux frais' 'Copyright 2019-2021': 'Droit d''auteur 2019-2021' 'Cortina every 2 to 4 songs': 'Cortina touts les 2 à 4 morceaux' 'Cortina every 3 to 4 songs': 'Cortina touts les 3 à 4 morceaux' 'Court city': 'Ville du tribunal' 'Created': 'Création' +'Dance floor in the mini-garden of the Monde headquarter, pass under the arch then go along to the left, the dance floor is at the balcony of the Austerlitz rail station tracks.': 'Piste de danse dans le mini-jardin du siège du Monde, passer sous l''arche puis longer à gauche, la piste est au balcon des voies de la gare d''Austerlitz.' 'Dance': 'Danse' 'Dashboard': 'Tableau de bord' 'Date': 'Date' @@ -131,8 +142,10 @@ 'French': 'Français' 'Frequently asked questions': 'Foire aux questions' 'Friday': 'Vendredi' -'From %start% to %stop%': 'A partir de %start% à %stop%' 'Fund our mission': 'financer notre activité' +'GPS coordinates': 'Coordonnées GPS' +'Yes': 'Oui' +'No': 'Non' 'Garnier opera': 'Opéra Garnier' 'Garnier': 'Garnier' 'Guest': 'Invité' @@ -150,8 +163,10 @@ 'If you did not receive a verification mail, check your Spam or Junk mail folders': 'Si vous n''avez pas reçu le courriel de vérification, regardez les dossiers Spam ou Indésirable dans votre messagerie' 'Igor Stravinsky place': 'Place Igor Stravinsky' 'Image': 'Image' +'In Paris': 'À Paris' 'In case of bug or glitch you may contact us throught the contact form: %title%': 'En cas de bug ou de problème, vous pouvez nous contacter via le formulaire de contact : %title%' 'In the future, %title% hopes to become a daily visited resource for participants and organizers of outdoor dance sessions.': 'À l''avenir, %title% espère devenir une ressource visitée quotidiennement par les participants et organisateurs de séances de danse en extérieur.' +'Indoor': 'À l''intérieur' 'Intermediate french communication': 'Communication en français intermédiaire' 'Intermediate tango ballroom organisation': 'Organisation de bal intermédiaire' 'Intermediate tango music programming': 'Programmation musicale de tango intermédiaire' @@ -205,7 +220,6 @@ 'Medium change': 'Changement intermédiaire' 'Meeting': 'Réunion' 'Message': 'Message' -'Minimap': 'Minicarte' 'Miss': 'Mademoiselle' 'Missing broom (except Opera/Orsay/Tokyo)': 'Balais absent (sauf Opera/Orsay/Tokyo)' 'Missing in action': 'Porté disparu' @@ -216,10 +230,10 @@ 'Modify': 'Modifier' 'Monday': 'Lundi' 'Monde garden': 'Jardin du Monde' -'Monde': 'Monde' +'Monde garden access map': 'Carte d''accès du jardin du Monde' 'Monthly application %location% already exists': 'La réservation mensuelle %location% existe déjà' 'More than one hour delay': 'Retard de plus d''une heure' -'Morning': 'Matin' +'Morning': 'Matinée' 'Mostly danceable songs': 'Musique dançable principalement' 'Move': 'Déplacer' 'Mr.': 'M.' @@ -265,8 +279,11 @@ 'Preparation': 'Préparation' 'Prerequisite': 'Prérequis' 'Present qualified majority': 'Majorité qualifiée des présents' +'Private class': 'Cours privé' 'Profile': 'Profil' +'Program': 'Programme' 'Pseudonym': 'Pseudonyme' +'Public class': 'Cours collectif' 'Qualified double majority': 'Double majorité qualifiée' 'Qualified majority': 'Majorité qualifiée' 'Questions asked via the contact form will be added to this page as they arise.': 'Les questions posées via le formulaire de contact seront ajoutées au fur et à mesure sur cette page.' @@ -288,7 +305,7 @@ 'Rope with strings': 'Corde avec ficelles' 'Saint-Honore market': 'Marché Saint-Honoré' 'Saturday': 'Samedi' -'Schedule': 'Programme' +'Schedule': 'Horaire' 'Score': 'Score' 'Second time': 'Seconde fois' 'Send a message to %pseudonym%': 'Envoyer un message à %pseudonym%' @@ -350,8 +367,8 @@ 'To create your account you must follow this link:': 'Pour créer votre compte vous devez suivre ce lien :' 'To recover your account follow this link: %recover_url%': 'Pour récupérer votre compte suivez ce lien : %recover_url%' 'To recover your account follow this link:': 'Pour récupérer votre compte suivez ce lien :' -'To the hat, ideally %rate% €, to cover the costs: talc, electricity, bicycle, server': 'Au chapeau, idéalement %rate% €, pour couvrir les frais : talc, électricité, vélo, server' -'To the hat, to cover the costs: talc, electricity, bicycle, server': 'Au chapeau, pour couvrir les frais : talc, électricité, vélo, server' +'To the hat, ideally %rate% €, to cover: talc, electricity, bicycle, server, ...': 'Au chapeau, idéalement %rate% €, pour couvrir : talc, électricité, vélo, server, ...' +'To the hat, to cover: talc, electricity, bicycle, server, ...': 'Au chapeau, pour couvrir : talc, électricité, vélo, server, ...' 'Tokyo palace': 'Palais de Tokyo' 'Tokyo': 'Tokyo' 'Traffic at prohibited time': 'Circulation à une heure interdite' @@ -410,6 +427,7 @@ 'Your hat': 'Votre chapeau' 'Your hotspot': 'Votre hotspot' 'Your image': 'Votre image' +'Your indoor': 'Votre à l''intérieur' 'Your latitude': 'Votre latitude' 'Your length': 'Votre durée' 'Your link': 'Votre lien' @@ -470,6 +488,7 @@ 'dispute': 'contestation' 'faq': 'faq' 'frequently asked questions': 'foire aux questions' +'in Paris': 'à Paris' 'listing': 'liste' 'location list': 'liste des emplacements' 'locations': 'emplacements' -- 2.41.1 From 6e38233aeddadbac59651e705f9bbb54ba491782 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Sat, 11 Sep 2021 12:22:46 +0200 Subject: [PATCH 12/16] Swith to new session structure Switch to rapsys_pack intldate twig filters --- Resources/views/default/index.html.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/views/default/index.html.twig b/Resources/views/default/index.html.twig index e04f1b3..beb1508 100644 --- a/Resources/views/default/index.html.twig +++ b/Resources/views/default/index.html.twig @@ -15,8 +15,8 @@