🔖(chore) bump release to 2.31.0

Added - Grid options for the Section plugin - Make user waive its right of withdrawal when purchasing a course product relation with `is_withdrawable` set to `false` Changed - Changed `multiple-columns` CSS component so its columns include a padding - Changed `CKEditorPlugin` for new field `variant` to choose a variant style; - Customize withdrawal waiver checkbox messages according to the product type
openfun · Nov 20, 2024 · ea23fe7 · ea23fe7
1 parent d069a60
commit ea23fe7
Show file tree

Hide file tree

Showing 69 changed files with 3,605 additions and 649 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unrealeased]
 
+## [2.31.0] - 2024-11-20
+
 ### Added
 
 - Grid options for the Section plugin
@@ -2213,7 +2215,8 @@ us:
 - finish integrating the missing pages and improve the sandbox environment;
 - test and polish the use of richie as a django app / node dependency.
 
-[unreleased]: https://github.com/openfun/richie/compare/v2.30.0...master
+[unreleased]: https://github.com/openfun/richie/compare/v2.31.0...master
+[2.31.0]: https://github.com/openfun/richie/compare/v2.30.0...v2.31.0
 [2.30.0]: https://github.com/openfun/richie/compare/v2.29.2...v2.30.0
 [2.29.2]: https://github.com/openfun/richie/compare/v2.29.1...v2.29.2
 [2.29.1]: https://github.com/openfun/richie/compare/v2.29.0...v2.29.1

diff --git a/UPGRADE.md b/UPGRADE.md
@@ -16,6 +16,8 @@ $ make migrate
 
 ## Unreleased
 
+## 2.30.0 to 2.31.0
+
 - There is a new Sass settings that can be used to define 'simple-text' box properties:
   ```scss
   $r-simpletext-margin-bottom: 0.5rem;

diff --git a/...r.organization}}-richie-site-factory/template/{{cookiecutter.site}}/requirements/base.txt b/...r.organization}}-richie-site-factory/template/{{cookiecutter.site}}/requirements/base.txt
@@ -5,6 +5,6 @@ django-storages==1.13.2
 dockerflow==2022.8.0
 gunicorn==22.0.0
 psycopg2-binary==2.9.9
-richie==2.30.0
+richie==2.31.0
 unidecode==1.3.6 # required by django-check-seo
 sentry-sdk==2.11.0
diff --git a/...ganization}}-richie-site-factory/template/{{cookiecutter.site}}/src/frontend/package.json b/...ganization}}-richie-site-factory/template/{{cookiecutter.site}}/src/frontend/package.json
@@ -21,7 +21,7 @@
     "CMS"
   ],
   "dependencies": {
-    "richie-education": "2.30.0"
+    "richie-education": "2.31.0"
   },
   "devDependencies": {
     "@formatjs/cli": "6.2.4",

diff --git a/docs/cookiecutter.md b/docs/cookiecutter.md
@@ -25,15 +25,15 @@ If you chose to install Cookiecutter, you can now run it against our
 [template][2] as follows:
 
 ```bash
-cookiecutter gh:openfun/richie --directory cookiecutter  --checkout v2.30.0
+cookiecutter gh:openfun/richie --directory cookiecutter  --checkout v2.31.0
 ```
 
 If you didn't want to install it on your machine, we provide a Docker image
 built with our [own repository][4] that you can use as follows:
 
 ```bash
 docker run --rm -it -u $(id -u):$(id -g) -v $PWD:/app \
-fundocker/cookiecutter gh:openfun/richie --directory cookiecutter --checkout v2.30.0
+fundocker/cookiecutter gh:openfun/richie --directory cookiecutter --checkout v2.31.0
 ```
 
 The `--directory` option is to indicate that our Cookiecutter template is in

diff --git a/src/frontend/i18n/locales/ar-SA.json b/src/frontend/i18n/locales/ar-SA.json
@@ -1355,6 +1355,34 @@
     "description": "Message explaining the subscription process with a training agreement to sign and a payment method to set.",
     "message": "To enroll in the training, you will first be invited to sign the training agreement and then to define a payment method."
   },
+  "components.SaleTunnel.WithdrawRightCheckbox.certificate.waiveCheckboxHelperClause1": {
+    "description": "First clause item for the waiver checkbox.",
+    "message": "I acknowledge that I have expressly requested my registration for the examination before the expiration date of the withdrawal period."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.certificate.waiveCheckboxHelperClause2": {
+    "description": "Second clause item for the waiver checkbox.",
+    "message": "I expressly waive my right of withdrawal in order to register for the examination before the expiration of the withdrawal period."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.certificate.waiverLabel": {
+    "description": "Text to explain why the user has to waive to its withdrawal right.",
+    "message": "If the examination period begins before the end of the 14-day withdrawal period mentioned in Article L221-18 of the French Consumer Code, you must check the box below to proceed with your registration."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.credential.waiveCheckboxHelperClause1": {
+    "description": "First clause item for the waiver checkbox.",
+    "message": "I acknowledge that I have expressly requested to begin the training before the expiration date of the withdrawal period."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.credential.waiveCheckboxHelperClause2": {
+    "description": "Second clause item for the waiver checkbox.",
+    "message": "I expressly waive my right of withdrawal in order to begin the training before the expiration of the withdrawal period."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.credential.waiverLabel": {
+    "description": "Text to explain why the user has to waive to its withdrawal right.",
+    "message": "The training program you wish to enroll in begins before the end of the 14-day withdrawal period mentioned in Article L221-18 of the French Consumer Code. You must check the box below to proceed with your registration."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.waiveCheckboxLabel": {
+    "description": "Label of the checkbox to waive the withdrawal right.",
+    "message": "By checking this box:"
+  },
   "components.SaleTunnel.callToActionDescription": {
     "description": "Additional description announced by screen readers when focusing the call to action buying button",
     "message": "Purchase {product}"
@@ -1535,6 +1563,10 @@
     "description": "Error message shown when order creation request failed because there is no remaining available seat for the product.",
     "message": "There are no more places available for this product."
   },
+  "components.SubscriptionButton.errorWithdrawalRight": {
+    "description": "Error message shown when the user must waive its withdrawal right but doesn't.",
+    "message": "You must waive your withdrawal right."
+  },
   "components.SubscriptionButton.orderCreationInProgress": {
     "description": "Label for screen reader when an order creation is in progress.",
     "message": "Order creation in progress"

diff --git a/src/frontend/i18n/locales/es-ES.json b/src/frontend/i18n/locales/es-ES.json
@@ -1355,6 +1355,34 @@
     "description": "Message explaining the subscription process with a training agreement to sign and a payment method to set.",
     "message": "To enroll in the training, you will first be invited to sign the training agreement and then to define a payment method."
   },
+  "components.SaleTunnel.WithdrawRightCheckbox.certificate.waiveCheckboxHelperClause1": {
+    "description": "First clause item for the waiver checkbox.",
+    "message": "I acknowledge that I have expressly requested my registration for the examination before the expiration date of the withdrawal period."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.certificate.waiveCheckboxHelperClause2": {
+    "description": "Second clause item for the waiver checkbox.",
+    "message": "I expressly waive my right of withdrawal in order to register for the examination before the expiration of the withdrawal period."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.certificate.waiverLabel": {
+    "description": "Text to explain why the user has to waive to its withdrawal right.",
+    "message": "If the examination period begins before the end of the 14-day withdrawal period mentioned in Article L221-18 of the French Consumer Code, you must check the box below to proceed with your registration."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.credential.waiveCheckboxHelperClause1": {
+    "description": "First clause item for the waiver checkbox.",
+    "message": "I acknowledge that I have expressly requested to begin the training before the expiration date of the withdrawal period."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.credential.waiveCheckboxHelperClause2": {
+    "description": "Second clause item for the waiver checkbox.",
+    "message": "I expressly waive my right of withdrawal in order to begin the training before the expiration of the withdrawal period."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.credential.waiverLabel": {
+    "description": "Text to explain why the user has to waive to its withdrawal right.",
+    "message": "The training program you wish to enroll in begins before the end of the 14-day withdrawal period mentioned in Article L221-18 of the French Consumer Code. You must check the box below to proceed with your registration."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.waiveCheckboxLabel": {
+    "description": "Label of the checkbox to waive the withdrawal right.",
+    "message": "By checking this box:"
+  },
   "components.SaleTunnel.callToActionDescription": {
     "description": "Additional description announced by screen readers when focusing the call to action buying button",
     "message": "Purchase {product}"
@@ -1535,6 +1563,10 @@
     "description": "Error message shown when order creation request failed because there is no remaining available seat for the product.",
     "message": "There are no more places available for this product."
   },
+  "components.SubscriptionButton.errorWithdrawalRight": {
+    "description": "Error message shown when the user must waive its withdrawal right but doesn't.",
+    "message": "You must waive your withdrawal right."
+  },
   "components.SubscriptionButton.orderCreationInProgress": {
     "description": "Label for screen reader when an order creation is in progress.",
     "message": "Order creation in progress"

diff --git a/src/frontend/i18n/locales/fa-IR.json b/src/frontend/i18n/locales/fa-IR.json
@@ -1355,6 +1355,34 @@
     "description": "Message explaining the subscription process with a training agreement to sign and a payment method to set.",
     "message": "To enroll in the training, you will first be invited to sign the training agreement and then to define a payment method."
   },
+  "components.SaleTunnel.WithdrawRightCheckbox.certificate.waiveCheckboxHelperClause1": {
+    "description": "First clause item for the waiver checkbox.",
+    "message": "I acknowledge that I have expressly requested my registration for the examination before the expiration date of the withdrawal period."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.certificate.waiveCheckboxHelperClause2": {
+    "description": "Second clause item for the waiver checkbox.",
+    "message": "I expressly waive my right of withdrawal in order to register for the examination before the expiration of the withdrawal period."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.certificate.waiverLabel": {
+    "description": "Text to explain why the user has to waive to its withdrawal right.",
+    "message": "If the examination period begins before the end of the 14-day withdrawal period mentioned in Article L221-18 of the French Consumer Code, you must check the box below to proceed with your registration."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.credential.waiveCheckboxHelperClause1": {
+    "description": "First clause item for the waiver checkbox.",
+    "message": "I acknowledge that I have expressly requested to begin the training before the expiration date of the withdrawal period."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.credential.waiveCheckboxHelperClause2": {
+    "description": "Second clause item for the waiver checkbox.",
+    "message": "I expressly waive my right of withdrawal in order to begin the training before the expiration of the withdrawal period."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.credential.waiverLabel": {
+    "description": "Text to explain why the user has to waive to its withdrawal right.",
+    "message": "The training program you wish to enroll in begins before the end of the 14-day withdrawal period mentioned in Article L221-18 of the French Consumer Code. You must check the box below to proceed with your registration."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.waiveCheckboxLabel": {
+    "description": "Label of the checkbox to waive the withdrawal right.",
+    "message": "By checking this box:"
+  },
   "components.SaleTunnel.callToActionDescription": {
     "description": "Additional description announced by screen readers when focusing the call to action buying button",
     "message": "Purchase {product}"
@@ -1535,6 +1563,10 @@
     "description": "Error message shown when order creation request failed because there is no remaining available seat for the product.",
     "message": "There are no more places available for this product."
   },
+  "components.SubscriptionButton.errorWithdrawalRight": {
+    "description": "Error message shown when the user must waive its withdrawal right but doesn't.",
+    "message": "You must waive your withdrawal right."
+  },
   "components.SubscriptionButton.orderCreationInProgress": {
     "description": "Label for screen reader when an order creation is in progress.",
     "message": "Order creation in progress"

diff --git a/src/frontend/i18n/locales/fr-CA.json b/src/frontend/i18n/locales/fr-CA.json
@@ -1355,6 +1355,34 @@
     "description": "Message explaining the subscription process with a training agreement to sign and a payment method to set.",
     "message": "To enroll in the training, you will first be invited to sign the training agreement and then to define a payment method."
   },
+  "components.SaleTunnel.WithdrawRightCheckbox.certificate.waiveCheckboxHelperClause1": {
+    "description": "First clause item for the waiver checkbox.",
+    "message": "I acknowledge that I have expressly requested my registration for the examination before the expiration date of the withdrawal period."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.certificate.waiveCheckboxHelperClause2": {
+    "description": "Second clause item for the waiver checkbox.",
+    "message": "I expressly waive my right of withdrawal in order to register for the examination before the expiration of the withdrawal period."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.certificate.waiverLabel": {
+    "description": "Text to explain why the user has to waive to its withdrawal right.",
+    "message": "If the examination period begins before the end of the 14-day withdrawal period mentioned in Article L221-18 of the French Consumer Code, you must check the box below to proceed with your registration."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.credential.waiveCheckboxHelperClause1": {
+    "description": "First clause item for the waiver checkbox.",
+    "message": "I acknowledge that I have expressly requested to begin the training before the expiration date of the withdrawal period."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.credential.waiveCheckboxHelperClause2": {
+    "description": "Second clause item for the waiver checkbox.",
+    "message": "I expressly waive my right of withdrawal in order to begin the training before the expiration of the withdrawal period."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.credential.waiverLabel": {
+    "description": "Text to explain why the user has to waive to its withdrawal right.",
+    "message": "The training program you wish to enroll in begins before the end of the 14-day withdrawal period mentioned in Article L221-18 of the French Consumer Code. You must check the box below to proceed with your registration."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.waiveCheckboxLabel": {
+    "description": "Label of the checkbox to waive the withdrawal right.",
+    "message": "By checking this box:"
+  },
   "components.SaleTunnel.callToActionDescription": {
     "description": "Additional description announced by screen readers when focusing the call to action buying button",
     "message": "Acheter {product}"
@@ -1535,6 +1563,10 @@
     "description": "Error message shown when order creation request failed because there is no remaining available seat for the product.",
     "message": "There are no more places available for this product."
   },
+  "components.SubscriptionButton.errorWithdrawalRight": {
+    "description": "Error message shown when the user must waive its withdrawal right but doesn't.",
+    "message": "You must waive your withdrawal right."
+  },
   "components.SubscriptionButton.orderCreationInProgress": {
     "description": "Label for screen reader when an order creation is in progress.",
     "message": "Order creation in progress"

diff --git a/src/frontend/i18n/locales/fr-FR.json b/src/frontend/i18n/locales/fr-FR.json
@@ -1355,6 +1355,34 @@
     "description": "Message explaining the subscription process with a training agreement to sign and a payment method to set.",
     "message": "Pour vous inscrire, vous serez d'abord invité à signer le contrat de formation, puis à définir un moyen de paiement."
   },
+  "components.SaleTunnel.WithdrawRightCheckbox.certificate.waiveCheckboxHelperClause1": {
+    "description": "First clause item for the waiver checkbox.",
+    "message": "Je reconnais avoir expressément demandé mon inscription à l’examen avant la date d’expiration du délai de rétractation."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.certificate.waiveCheckboxHelperClause2": {
+    "description": "Second clause item for the waiver checkbox.",
+    "message": "Je renonce expressément à l’exercice de mon droit de rétractation afin de pouvoir m'inscrire à l’examen avant l’expiration du délai de rétractation."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.certificate.waiverLabel": {
+    "description": "Text to explain why the user has to waive to its withdrawal right.",
+    "message": "Si la période d’examen commence avant la fin du délai de rétractation de 14 jours mentionné à l’article L221-18 du code de la consommation, vous devez cocher la case ci-dessous pour poursuivre votre inscription."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.credential.waiveCheckboxHelperClause1": {
+    "description": "First clause item for the waiver checkbox.",
+    "message": "Je reconnais avoir expressément demandé vouloir commencer la formation avant la date d’expiration du délai de rétractation."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.credential.waiveCheckboxHelperClause2": {
+    "description": "Second clause item for the waiver checkbox.",
+    "message": "Je renonce expressément à l’exercice de mon droit de rétractation afin de pouvoir commencer la formation avant l’expiration du délai de rétractation."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.credential.waiverLabel": {
+    "description": "Text to explain why the user has to waive to its withdrawal right.",
+    "message": "La formation à laquelle vous voulez vous inscrire commence avant la fin du délai de rétractation de 14 jours mentionné à l’article L221-18 du code de la consommation. Vous devez cocher la case ci-dessous pour poursuivre votre inscription."
+  },
+  "components.SaleTunnel.WithdrawRightCheckbox.waiveCheckboxLabel": {
+    "description": "Label of the checkbox to waive the withdrawal right.",
+    "message": "En cochant cette case : "
+  },
   "components.SaleTunnel.callToActionDescription": {
     "description": "Additional description announced by screen readers when focusing the call to action buying button",
     "message": "Acheter {product}"
@@ -1535,6 +1563,10 @@
     "description": "Error message shown when order creation request failed because there is no remaining available seat for the product.",
     "message": "Il n'y a pas plus de places disponibles."
   },
+  "components.SubscriptionButton.errorWithdrawalRight": {
+    "description": "Error message shown when the user must waive its withdrawal right but doesn't.",
+    "message": "Vous devez renoncer à votre droit de rétraction."
+  },
   "components.SubscriptionButton.orderCreationInProgress": {
     "description": "Label for screen reader when an order creation is in progress.",
     "message": "Création de la commande en cours"