diff --git a/CHANGELOG.md b/CHANGELOG.md index e6f52b1fe..b4bcb8a45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,13 +8,17 @@ and this project adheres to ## [Unreleased] +## [2.9.0] - 2024-10-22 + ### Added +- Add index on `template` field of the `CertificateDefinition` model - Add `appendix` field on `ContractDefinition` model - Allow to edit `appendix` `ContractDefinition` field through the back office ### Changed +- Improve performance of the certificate client API endpoint - Make payment backend request timeout configurable ## [2.8.0] - 2024-10-16 @@ -31,7 +35,6 @@ and this project adheres to paid - Support of payment_schedule for certificate products - Display payment schedule in contract template -- Add index on `template` field of the `CertificateDefinition` model ### Changed @@ -46,8 +49,7 @@ and this project adheres to payments of installments that are in the past - Deprecated field `has_consent_to_terms` for `Order` model - Move signature fields before appendices in contract definition template -- Update `handle_notification` signature backend to confirm signature -- Improve performance of the certificate client API endpoint +- Update `handle_notification` signature backend to confirm signature ### Fixed @@ -463,7 +465,8 @@ and this project adheres to - First working version serving sellable micro-credentials for multiple organizations synchronized to a remote catalog -[unreleased]: https://github.com/openfun/joanie/compare/v2.8.0...main +[unreleased]: https://github.com/openfun/joanie/compare/v2.9.0...main +[2.9.0]: https://github.com/openfun/joanie/compare/v2.8.0...v2.9.0 [2.8.0]: https://github.com/openfun/joanie/compare/v2.7.1...v2.8.0 [2.7.1]: https://github.com/openfun/joanie/compare/v2.7.0...v2.7.1 [2.7.0]: https://github.com/openfun/joanie/compare/v2.6.1...v2.7.0 diff --git a/arnold.yml b/arnold.yml index c83ffe053..4f026c8ac 100644 --- a/arnold.yml +++ b/arnold.yml @@ -1,6 +1,6 @@ # arnold.yml metadata: name: joanie - version: 2.8.0 + version: 2.9.0 source: path: src/tray diff --git a/src/backend/locale/es_ES/LC_MESSAGES/django.mo b/src/backend/locale/es_ES/LC_MESSAGES/django.mo index 853ad5e99..1fef410fe 100755 Binary files a/src/backend/locale/es_ES/LC_MESSAGES/django.mo and b/src/backend/locale/es_ES/LC_MESSAGES/django.mo differ diff --git a/src/backend/locale/es_ES/LC_MESSAGES/django.po b/src/backend/locale/es_ES/LC_MESSAGES/django.po index 690e4f567..d56c05787 100644 --- a/src/backend/locale/es_ES/LC_MESSAGES/django.po +++ b/src/backend/locale/es_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: joanie\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-10-16 09:22+0000\n" -"PO-Revision-Date: 2024-10-16 09:46\n" +"POT-Creation-Date: 2024-10-22 13:22+0000\n" +"PO-Revision-Date: 2024-10-22 13:29\n" "Last-Translator: \n" "Language-Team: Spanish\n" "Language: es_ES\n" @@ -204,7 +204,7 @@ msgid "Enrollment" msgstr "" #: joanie/core/enums.py:37 joanie/core/enums.py:150 -#: joanie/core/models/certifications.py:116 +#: joanie/core/models/certifications.py:117 #: joanie/core/templates/issuers/degree.html:27 msgid "Certificate" msgstr "" @@ -328,15 +328,15 @@ msgstr "" msgid "Refused" msgstr "" -#: joanie/core/factories.py:1141 joanie/core/utils/contract_definition.py:101 +#: joanie/core/factories.py:1142 joanie/core/utils/contract_definition.py:101 msgid "" msgstr "" -#: joanie/core/factories.py:1146 joanie/core/utils/contract_definition.py:102 +#: joanie/core/factories.py:1147 joanie/core/utils/contract_definition.py:102 msgid "" msgstr "" -#: joanie/core/factories.py:1153 +#: joanie/core/factories.py:1154 msgid "" msgstr "" @@ -392,7 +392,7 @@ msgid_plural "%d products to synchronize." msgstr[0] "" msgstr[1] "" -#: joanie/core/models/accounts.py:34 joanie/core/models/contracts.py:35 +#: joanie/core/models/accounts.py:34 joanie/core/models/contracts.py:36 msgid "language" msgstr "" @@ -453,7 +453,7 @@ msgstr "" msgid "owner" msgstr "" -#: joanie/core/models/accounts.py:171 joanie/core/models/certifications.py:97 +#: joanie/core/models/accounts.py:171 joanie/core/models/certifications.py:98 #: joanie/core/models/products.py:409 msgid "organization" msgstr "" @@ -495,7 +495,7 @@ msgid "level" msgstr "" #: joanie/core/models/activity_logs.py:74 -#: joanie/core/models/certifications.py:108 joanie/core/models/contracts.py:96 +#: joanie/core/models/certifications.py:109 joanie/core/models/contracts.py:103 #: joanie/payment/models.py:74 msgid "context" msgstr "" @@ -565,37 +565,37 @@ msgstr "" msgid "template to generate pdf" msgstr "" -#: joanie/core/models/certifications.py:46 -#: joanie/core/models/certifications.py:70 +#: joanie/core/models/certifications.py:47 +#: joanie/core/models/certifications.py:71 msgid "Certificate definition" msgstr "" -#: joanie/core/models/certifications.py:47 +#: joanie/core/models/certifications.py:48 msgid "Certificate definitions" msgstr "" -#: joanie/core/models/certifications.py:65 +#: joanie/core/models/certifications.py:66 msgid "Date of issuance" msgstr "" -#: joanie/core/models/certifications.py:82 joanie/core/models/contracts.py:86 +#: joanie/core/models/certifications.py:83 joanie/core/models/contracts.py:93 #: joanie/core/models/products.py:1276 joanie/payment/models.py:54 msgid "order" msgstr "" -#: joanie/core/models/certifications.py:91 joanie/core/models/products.py:431 +#: joanie/core/models/certifications.py:92 joanie/core/models/products.py:431 msgid "enrollment" msgstr "" -#: joanie/core/models/certifications.py:102 joanie/core/models/contracts.py:46 +#: joanie/core/models/certifications.py:103 joanie/core/models/contracts.py:47 msgid "images" msgstr "" -#: joanie/core/models/certifications.py:109 +#: joanie/core/models/certifications.py:110 msgid "Localized data that needs to be frozen on certificate creation" msgstr "" -#: joanie/core/models/certifications.py:117 +#: joanie/core/models/certifications.py:118 msgid "Certificates" msgstr "" @@ -603,52 +603,56 @@ msgstr "" msgid "body" msgstr "" -#: joanie/core/models/contracts.py:36 +#: joanie/core/models/contracts.py:32 +msgid "appendix" +msgstr "" + +#: joanie/core/models/contracts.py:37 msgid "Language of the contract definition" msgstr "" -#: joanie/core/models/contracts.py:39 +#: joanie/core/models/contracts.py:40 msgid "template name" msgstr "" -#: joanie/core/models/contracts.py:54 joanie/core/models/contracts.py:79 +#: joanie/core/models/contracts.py:55 joanie/core/models/contracts.py:86 #: joanie/core/models/products.py:105 msgid "Contract definition" msgstr "" -#: joanie/core/models/contracts.py:55 +#: joanie/core/models/contracts.py:56 msgid "Contract definitions" msgstr "" -#: joanie/core/models/contracts.py:98 +#: joanie/core/models/contracts.py:105 msgid "Localized data snapshot on contract signature" msgstr "" -#: joanie/core/models/contracts.py:108 +#: joanie/core/models/contracts.py:115 msgid "Reference in the external signature backend" msgstr "" -#: joanie/core/models/contracts.py:113 +#: joanie/core/models/contracts.py:120 msgid "Date and time we send the contract to signature provider" msgstr "" -#: joanie/core/models/contracts.py:121 +#: joanie/core/models/contracts.py:128 msgid "Date and time of issuance" msgstr "" -#: joanie/core/models/contracts.py:127 +#: joanie/core/models/contracts.py:134 msgid "organization signatory" msgstr "" -#: joanie/core/models/contracts.py:135 +#: joanie/core/models/contracts.py:142 msgid "Date and time the organization signed the contract" msgstr "" -#: joanie/core/models/contracts.py:143 +#: joanie/core/models/contracts.py:150 msgid "Contract" msgstr "" -#: joanie/core/models/contracts.py:144 +#: joanie/core/models/contracts.py:151 msgid "Contracts" msgstr "" @@ -1343,7 +1347,7 @@ msgstr "" msgid "Appendices" msgstr "" -#: joanie/core/templates/issuers/contract_definition.html:144 +#: joanie/core/templates/issuers/contract_definition.html:147 #: joanie/core/templates/mail/html/installment_paid.html:259 #: joanie/core/templates/mail/html/installment_refused.html:235 #: joanie/core/templates/mail/html/installment_reminder.html:235 @@ -1355,19 +1359,19 @@ msgstr "" msgid "Payment schedule" msgstr "" -#: joanie/core/templates/issuers/contract_definition.html:148 +#: joanie/core/templates/issuers/contract_definition.html:151 msgid "Due date" msgstr "" -#: joanie/core/templates/issuers/contract_definition.html:149 +#: joanie/core/templates/issuers/contract_definition.html:152 msgid "Amount" msgstr "" -#: joanie/core/templates/issuers/contract_definition.html:155 +#: joanie/core/templates/issuers/contract_definition.html:158 msgid "Total :" msgstr "" -#: joanie/core/templates/issuers/contract_definition.html:173 +#: joanie/core/templates/issuers/contract_definition.html:176 msgid "Catalog syllabus" msgstr "" @@ -1789,14 +1793,18 @@ msgid "" msgstr "" #: joanie/core/utils/contract_definition.py:112 -msgid "" +msgid "<CONTRACT_BODY>" msgstr "" #: joanie/core/utils/contract_definition.py:113 -msgid "" +msgid "<CONTRACT_APPENDIX>" msgstr "" #: joanie/core/utils/contract_definition.py:114 +msgid "" +msgstr "" + +#: joanie/core/utils/contract_definition.py:115 msgid "" msgstr "" diff --git a/src/backend/locale/fr_CA/LC_MESSAGES/django.mo b/src/backend/locale/fr_CA/LC_MESSAGES/django.mo index 4fea18224..216aae43a 100755 Binary files a/src/backend/locale/fr_CA/LC_MESSAGES/django.mo and b/src/backend/locale/fr_CA/LC_MESSAGES/django.mo differ diff --git a/src/backend/locale/fr_CA/LC_MESSAGES/django.po b/src/backend/locale/fr_CA/LC_MESSAGES/django.po index 0a64cb0a6..9493c9960 100644 --- a/src/backend/locale/fr_CA/LC_MESSAGES/django.po +++ b/src/backend/locale/fr_CA/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: joanie\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-10-16 09:22+0000\n" -"PO-Revision-Date: 2024-10-16 09:46\n" +"POT-Creation-Date: 2024-10-22 13:22+0000\n" +"PO-Revision-Date: 2024-10-22 13:29\n" "Last-Translator: \n" "Language-Team: French, Canada\n" "Language: fr_CA\n" @@ -204,7 +204,7 @@ msgid "Enrollment" msgstr "" #: joanie/core/enums.py:37 joanie/core/enums.py:150 -#: joanie/core/models/certifications.py:116 +#: joanie/core/models/certifications.py:117 #: joanie/core/templates/issuers/degree.html:27 msgid "Certificate" msgstr "" @@ -328,15 +328,15 @@ msgstr "" msgid "Refused" msgstr "" -#: joanie/core/factories.py:1141 joanie/core/utils/contract_definition.py:101 +#: joanie/core/factories.py:1142 joanie/core/utils/contract_definition.py:101 msgid "" msgstr "" -#: joanie/core/factories.py:1146 joanie/core/utils/contract_definition.py:102 +#: joanie/core/factories.py:1147 joanie/core/utils/contract_definition.py:102 msgid "" msgstr "" -#: joanie/core/factories.py:1153 +#: joanie/core/factories.py:1154 msgid "" msgstr "" @@ -392,7 +392,7 @@ msgid_plural "%d products to synchronize." msgstr[0] "" msgstr[1] "" -#: joanie/core/models/accounts.py:34 joanie/core/models/contracts.py:35 +#: joanie/core/models/accounts.py:34 joanie/core/models/contracts.py:36 msgid "language" msgstr "" @@ -453,7 +453,7 @@ msgstr "" msgid "owner" msgstr "" -#: joanie/core/models/accounts.py:171 joanie/core/models/certifications.py:97 +#: joanie/core/models/accounts.py:171 joanie/core/models/certifications.py:98 #: joanie/core/models/products.py:409 msgid "organization" msgstr "" @@ -495,7 +495,7 @@ msgid "level" msgstr "" #: joanie/core/models/activity_logs.py:74 -#: joanie/core/models/certifications.py:108 joanie/core/models/contracts.py:96 +#: joanie/core/models/certifications.py:109 joanie/core/models/contracts.py:103 #: joanie/payment/models.py:74 msgid "context" msgstr "" @@ -565,37 +565,37 @@ msgstr "" msgid "template to generate pdf" msgstr "" -#: joanie/core/models/certifications.py:46 -#: joanie/core/models/certifications.py:70 +#: joanie/core/models/certifications.py:47 +#: joanie/core/models/certifications.py:71 msgid "Certificate definition" msgstr "" -#: joanie/core/models/certifications.py:47 +#: joanie/core/models/certifications.py:48 msgid "Certificate definitions" msgstr "" -#: joanie/core/models/certifications.py:65 +#: joanie/core/models/certifications.py:66 msgid "Date of issuance" msgstr "" -#: joanie/core/models/certifications.py:82 joanie/core/models/contracts.py:86 +#: joanie/core/models/certifications.py:83 joanie/core/models/contracts.py:93 #: joanie/core/models/products.py:1276 joanie/payment/models.py:54 msgid "order" msgstr "" -#: joanie/core/models/certifications.py:91 joanie/core/models/products.py:431 +#: joanie/core/models/certifications.py:92 joanie/core/models/products.py:431 msgid "enrollment" msgstr "" -#: joanie/core/models/certifications.py:102 joanie/core/models/contracts.py:46 +#: joanie/core/models/certifications.py:103 joanie/core/models/contracts.py:47 msgid "images" msgstr "" -#: joanie/core/models/certifications.py:109 +#: joanie/core/models/certifications.py:110 msgid "Localized data that needs to be frozen on certificate creation" msgstr "" -#: joanie/core/models/certifications.py:117 +#: joanie/core/models/certifications.py:118 msgid "Certificates" msgstr "" @@ -603,52 +603,56 @@ msgstr "" msgid "body" msgstr "" -#: joanie/core/models/contracts.py:36 +#: joanie/core/models/contracts.py:32 +msgid "appendix" +msgstr "" + +#: joanie/core/models/contracts.py:37 msgid "Language of the contract definition" msgstr "" -#: joanie/core/models/contracts.py:39 +#: joanie/core/models/contracts.py:40 msgid "template name" msgstr "" -#: joanie/core/models/contracts.py:54 joanie/core/models/contracts.py:79 +#: joanie/core/models/contracts.py:55 joanie/core/models/contracts.py:86 #: joanie/core/models/products.py:105 msgid "Contract definition" msgstr "" -#: joanie/core/models/contracts.py:55 +#: joanie/core/models/contracts.py:56 msgid "Contract definitions" msgstr "" -#: joanie/core/models/contracts.py:98 +#: joanie/core/models/contracts.py:105 msgid "Localized data snapshot on contract signature" msgstr "" -#: joanie/core/models/contracts.py:108 +#: joanie/core/models/contracts.py:115 msgid "Reference in the external signature backend" msgstr "" -#: joanie/core/models/contracts.py:113 +#: joanie/core/models/contracts.py:120 msgid "Date and time we send the contract to signature provider" msgstr "" -#: joanie/core/models/contracts.py:121 +#: joanie/core/models/contracts.py:128 msgid "Date and time of issuance" msgstr "" -#: joanie/core/models/contracts.py:127 +#: joanie/core/models/contracts.py:134 msgid "organization signatory" msgstr "" -#: joanie/core/models/contracts.py:135 +#: joanie/core/models/contracts.py:142 msgid "Date and time the organization signed the contract" msgstr "" -#: joanie/core/models/contracts.py:143 +#: joanie/core/models/contracts.py:150 msgid "Contract" msgstr "" -#: joanie/core/models/contracts.py:144 +#: joanie/core/models/contracts.py:151 msgid "Contracts" msgstr "" @@ -1343,7 +1347,7 @@ msgstr "" msgid "Appendices" msgstr "" -#: joanie/core/templates/issuers/contract_definition.html:144 +#: joanie/core/templates/issuers/contract_definition.html:147 #: joanie/core/templates/mail/html/installment_paid.html:259 #: joanie/core/templates/mail/html/installment_refused.html:235 #: joanie/core/templates/mail/html/installment_reminder.html:235 @@ -1355,19 +1359,19 @@ msgstr "" msgid "Payment schedule" msgstr "" -#: joanie/core/templates/issuers/contract_definition.html:148 +#: joanie/core/templates/issuers/contract_definition.html:151 msgid "Due date" msgstr "" -#: joanie/core/templates/issuers/contract_definition.html:149 +#: joanie/core/templates/issuers/contract_definition.html:152 msgid "Amount" msgstr "" -#: joanie/core/templates/issuers/contract_definition.html:155 +#: joanie/core/templates/issuers/contract_definition.html:158 msgid "Total :" msgstr "" -#: joanie/core/templates/issuers/contract_definition.html:173 +#: joanie/core/templates/issuers/contract_definition.html:176 msgid "Catalog syllabus" msgstr "" @@ -1789,14 +1793,18 @@ msgid "" msgstr "" #: joanie/core/utils/contract_definition.py:112 -msgid "" +msgid "<CONTRACT_BODY>" msgstr "" #: joanie/core/utils/contract_definition.py:113 -msgid "" +msgid "<CONTRACT_APPENDIX>" msgstr "" #: joanie/core/utils/contract_definition.py:114 +msgid "" +msgstr "" + +#: joanie/core/utils/contract_definition.py:115 msgid "" msgstr "" diff --git a/src/backend/locale/fr_FR/LC_MESSAGES/django.mo b/src/backend/locale/fr_FR/LC_MESSAGES/django.mo index 21447a848..ff42a8377 100755 Binary files a/src/backend/locale/fr_FR/LC_MESSAGES/django.mo and b/src/backend/locale/fr_FR/LC_MESSAGES/django.mo differ diff --git a/src/backend/locale/fr_FR/LC_MESSAGES/django.po b/src/backend/locale/fr_FR/LC_MESSAGES/django.po index a15b42b02..4bc17230a 100644 --- a/src/backend/locale/fr_FR/LC_MESSAGES/django.po +++ b/src/backend/locale/fr_FR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: joanie\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-10-16 09:22+0000\n" -"PO-Revision-Date: 2024-10-16 09:46\n" +"POT-Creation-Date: 2024-10-22 13:22+0000\n" +"PO-Revision-Date: 2024-10-22 13:29\n" "Last-Translator: \n" "Language-Team: French\n" "Language: fr_FR\n" @@ -204,7 +204,7 @@ msgid "Enrollment" msgstr "Inscription" #: joanie/core/enums.py:37 joanie/core/enums.py:150 -#: joanie/core/models/certifications.py:116 +#: joanie/core/models/certifications.py:117 #: joanie/core/templates/issuers/degree.html:27 msgid "Certificate" msgstr "Certificat" @@ -328,15 +328,15 @@ msgstr "Payée" msgid "Refused" msgstr "Refusé" -#: joanie/core/factories.py:1141 joanie/core/utils/contract_definition.py:101 +#: joanie/core/factories.py:1142 joanie/core/utils/contract_definition.py:101 msgid "" msgstr "" -#: joanie/core/factories.py:1146 joanie/core/utils/contract_definition.py:102 +#: joanie/core/factories.py:1147 joanie/core/utils/contract_definition.py:102 msgid "" msgstr "" -#: joanie/core/factories.py:1153 +#: joanie/core/factories.py:1154 msgid "" msgstr "" @@ -392,7 +392,7 @@ msgid_plural "%d products to synchronize." msgstr[0] "%d produit à synchroniser." msgstr[1] "%d produits à synchroniser." -#: joanie/core/models/accounts.py:34 joanie/core/models/contracts.py:35 +#: joanie/core/models/accounts.py:34 joanie/core/models/contracts.py:36 msgid "language" msgstr "langue" @@ -453,7 +453,7 @@ msgstr "nom de famille" msgid "owner" msgstr "propriétaire" -#: joanie/core/models/accounts.py:171 joanie/core/models/certifications.py:97 +#: joanie/core/models/accounts.py:171 joanie/core/models/certifications.py:98 #: joanie/core/models/products.py:409 msgid "organization" msgstr "établissement" @@ -495,7 +495,7 @@ msgid "level" msgstr "niveau" #: joanie/core/models/activity_logs.py:74 -#: joanie/core/models/certifications.py:108 joanie/core/models/contracts.py:96 +#: joanie/core/models/certifications.py:109 joanie/core/models/contracts.py:103 #: joanie/payment/models.py:74 msgid "context" msgstr "contexte" @@ -565,37 +565,37 @@ msgstr "description" msgid "template to generate pdf" msgstr "modèle pour générer le PDF" -#: joanie/core/models/certifications.py:46 -#: joanie/core/models/certifications.py:70 +#: joanie/core/models/certifications.py:47 +#: joanie/core/models/certifications.py:71 msgid "Certificate definition" msgstr "Définition de certificat" -#: joanie/core/models/certifications.py:47 +#: joanie/core/models/certifications.py:48 msgid "Certificate definitions" msgstr "Définitions de certificat" -#: joanie/core/models/certifications.py:65 +#: joanie/core/models/certifications.py:66 msgid "Date of issuance" msgstr "Date de délivrance" -#: joanie/core/models/certifications.py:82 joanie/core/models/contracts.py:86 +#: joanie/core/models/certifications.py:83 joanie/core/models/contracts.py:93 #: joanie/core/models/products.py:1276 joanie/payment/models.py:54 msgid "order" msgstr "commande" -#: joanie/core/models/certifications.py:91 joanie/core/models/products.py:431 +#: joanie/core/models/certifications.py:92 joanie/core/models/products.py:431 msgid "enrollment" msgstr "inscription" -#: joanie/core/models/certifications.py:102 joanie/core/models/contracts.py:46 +#: joanie/core/models/certifications.py:103 joanie/core/models/contracts.py:47 msgid "images" msgstr "images" -#: joanie/core/models/certifications.py:109 +#: joanie/core/models/certifications.py:110 msgid "Localized data that needs to be frozen on certificate creation" msgstr "Données traduites qui doivent être gelées lors de la création d'un certificat" -#: joanie/core/models/certifications.py:117 +#: joanie/core/models/certifications.py:118 msgid "Certificates" msgstr "Certificats" @@ -603,52 +603,56 @@ msgstr "Certificats" msgid "body" msgstr "contenu" -#: joanie/core/models/contracts.py:36 +#: joanie/core/models/contracts.py:32 +msgid "appendix" +msgstr "annexe" + +#: joanie/core/models/contracts.py:37 msgid "Language of the contract definition" msgstr "Langue de la définition de contrat" -#: joanie/core/models/contracts.py:39 +#: joanie/core/models/contracts.py:40 msgid "template name" msgstr "nom du modèle" -#: joanie/core/models/contracts.py:54 joanie/core/models/contracts.py:79 +#: joanie/core/models/contracts.py:55 joanie/core/models/contracts.py:86 #: joanie/core/models/products.py:105 msgid "Contract definition" msgstr "Définition de contrat" -#: joanie/core/models/contracts.py:55 +#: joanie/core/models/contracts.py:56 msgid "Contract definitions" msgstr "Définitions de contrat" -#: joanie/core/models/contracts.py:98 +#: joanie/core/models/contracts.py:105 msgid "Localized data snapshot on contract signature" msgstr "Instantané des données internationalisées à la signature du contrat" -#: joanie/core/models/contracts.py:108 +#: joanie/core/models/contracts.py:115 msgid "Reference in the external signature backend" msgstr "Référence sur la plateforme de signature externe" -#: joanie/core/models/contracts.py:113 +#: joanie/core/models/contracts.py:120 msgid "Date and time we send the contract to signature provider" msgstr "Date et heure d'envoi du contrat sur la plateforme de signature" -#: joanie/core/models/contracts.py:121 +#: joanie/core/models/contracts.py:128 msgid "Date and time of issuance" msgstr "Date et heure de signature du contrat par l'établissement" -#: joanie/core/models/contracts.py:127 +#: joanie/core/models/contracts.py:134 msgid "organization signatory" msgstr "signataire de l'établissement" -#: joanie/core/models/contracts.py:135 +#: joanie/core/models/contracts.py:142 msgid "Date and time the organization signed the contract" msgstr "Date et heure de signature du contrat par l'établissement" -#: joanie/core/models/contracts.py:143 +#: joanie/core/models/contracts.py:150 msgid "Contract" msgstr "Contrat" -#: joanie/core/models/contracts.py:144 +#: joanie/core/models/contracts.py:151 msgid "Contracts" msgstr "Contrats" @@ -1343,7 +1347,7 @@ msgstr "Signature du représentant de l'université :" msgid "Appendices" msgstr "Annexes" -#: joanie/core/templates/issuers/contract_definition.html:144 +#: joanie/core/templates/issuers/contract_definition.html:147 #: joanie/core/templates/mail/html/installment_paid.html:259 #: joanie/core/templates/mail/html/installment_refused.html:235 #: joanie/core/templates/mail/html/installment_reminder.html:235 @@ -1355,19 +1359,19 @@ msgstr "Annexes" msgid "Payment schedule" msgstr "Échéancier" -#: joanie/core/templates/issuers/contract_definition.html:148 +#: joanie/core/templates/issuers/contract_definition.html:151 msgid "Due date" msgstr "Date d’échéance" -#: joanie/core/templates/issuers/contract_definition.html:149 +#: joanie/core/templates/issuers/contract_definition.html:152 msgid "Amount" msgstr "Montant" -#: joanie/core/templates/issuers/contract_definition.html:155 +#: joanie/core/templates/issuers/contract_definition.html:158 msgid "Total :" msgstr "Total :" -#: joanie/core/templates/issuers/contract_definition.html:173 +#: joanie/core/templates/issuers/contract_definition.html:176 msgid "Catalog syllabus" msgstr "Syllabus de la formation" @@ -1793,14 +1797,18 @@ msgid "" msgstr "" #: joanie/core/utils/contract_definition.py:112 -msgid "" -msgstr "" +msgid "<CONTRACT_BODY>" +msgstr "<CORPS_DU_CONTRAT>" #: joanie/core/utils/contract_definition.py:113 +msgid "<CONTRACT_APPENDIX>" +msgstr "<ANNEXE_DU_CONTRAT>" + +#: joanie/core/utils/contract_definition.py:114 msgid "" msgstr "" -#: joanie/core/utils/contract_definition.py:114 +#: joanie/core/utils/contract_definition.py:115 msgid "" msgstr "" diff --git a/src/backend/pyproject.toml b/src/backend/pyproject.toml index 14438d107..5cc0ea510 100644 --- a/src/backend/pyproject.toml +++ b/src/backend/pyproject.toml @@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta" [project] name = "joanie" -version = "2.8.0" +version = "2.9.0" authors = [{ "name" = "Open FUN (France Université Numérique)", "email" = "fun.dev@fun-mooc.fr" }] classifiers = [ "Development Status :: 5 - Production/Stable", diff --git a/src/frontend/admin/i18n/locales/es-ES.json b/src/frontend/admin/i18n/locales/es-ES.json index 878e44743..795120638 100644 --- a/src/frontend/admin/i18n/locales/es-ES.json +++ b/src/frontend/admin/i18n/locales/es-ES.json @@ -155,6 +155,10 @@ "description": "Label for the language input", "message": "Language" }, + "components.templates.contractDefinitions.form.appendixLabel": { + "description": "Label for the appendix input", + "message": "Appendix" + }, "components.templates.contractDefinitions.form.bodyLabel": { "description": "Label for the body input", "message": "Body" diff --git a/src/frontend/admin/i18n/locales/fr-CA.json b/src/frontend/admin/i18n/locales/fr-CA.json index 878e44743..795120638 100644 --- a/src/frontend/admin/i18n/locales/fr-CA.json +++ b/src/frontend/admin/i18n/locales/fr-CA.json @@ -155,6 +155,10 @@ "description": "Label for the language input", "message": "Language" }, + "components.templates.contractDefinitions.form.appendixLabel": { + "description": "Label for the appendix input", + "message": "Appendix" + }, "components.templates.contractDefinitions.form.bodyLabel": { "description": "Label for the body input", "message": "Body" diff --git a/src/frontend/admin/i18n/locales/fr-FR.json b/src/frontend/admin/i18n/locales/fr-FR.json index 42bcc6f53..b75e1e22f 100644 --- a/src/frontend/admin/i18n/locales/fr-FR.json +++ b/src/frontend/admin/i18n/locales/fr-FR.json @@ -155,6 +155,10 @@ "description": "Label for the language input", "message": "Langue" }, + "components.templates.contractDefinitions.form.appendixLabel": { + "description": "Label for the appendix input", + "message": "Annexe" + }, "components.templates.contractDefinitions.form.bodyLabel": { "description": "Label for the body input", "message": "Contenu" diff --git a/src/frontend/admin/package.json b/src/frontend/admin/package.json index b9b4e5e5e..6dfda37a1 100644 --- a/src/frontend/admin/package.json +++ b/src/frontend/admin/package.json @@ -1,6 +1,6 @@ { "name": "admin", - "version": "2.8.0", + "version": "2.9.0", "private": true, "scripts": { "dev": "next dev -p 8072", diff --git a/src/frontend/admin/src/translations/es-ES.json b/src/frontend/admin/src/translations/es-ES.json index eb68b159f..439ee5a8a 100644 --- a/src/frontend/admin/src/translations/es-ES.json +++ b/src/frontend/admin/src/translations/es-ES.json @@ -38,6 +38,7 @@ "components.templates.certificatesDefinitions.modals.CreateOrEditCertificationModal.edit": "Edit the \"{name}\" course", "components.templates.contractDefinition.filters.ContractDefinitionFilters.searchPlaceholder": "Search by title", "components.templates.contractDefinitions.form.RhfContractDefinitionLanguage.languageLabel": "Language", + "components.templates.contractDefinitions.form.appendixLabel": "Appendix", "components.templates.contractDefinitions.form.bodyLabel": "Body", "components.templates.contractDefinitions.form.descriptionLabel": "Description", "components.templates.contractDefinitions.form.informationText": "This is a contract template that will be used to issue contracts.", diff --git a/src/frontend/admin/src/translations/fr-CA.json b/src/frontend/admin/src/translations/fr-CA.json index eb68b159f..439ee5a8a 100644 --- a/src/frontend/admin/src/translations/fr-CA.json +++ b/src/frontend/admin/src/translations/fr-CA.json @@ -38,6 +38,7 @@ "components.templates.certificatesDefinitions.modals.CreateOrEditCertificationModal.edit": "Edit the \"{name}\" course", "components.templates.contractDefinition.filters.ContractDefinitionFilters.searchPlaceholder": "Search by title", "components.templates.contractDefinitions.form.RhfContractDefinitionLanguage.languageLabel": "Language", + "components.templates.contractDefinitions.form.appendixLabel": "Appendix", "components.templates.contractDefinitions.form.bodyLabel": "Body", "components.templates.contractDefinitions.form.descriptionLabel": "Description", "components.templates.contractDefinitions.form.informationText": "This is a contract template that will be used to issue contracts.", diff --git a/src/frontend/admin/src/translations/fr-FR.json b/src/frontend/admin/src/translations/fr-FR.json index c98f25874..3ba9e82c6 100644 --- a/src/frontend/admin/src/translations/fr-FR.json +++ b/src/frontend/admin/src/translations/fr-FR.json @@ -38,6 +38,7 @@ "components.templates.certificatesDefinitions.modals.CreateOrEditCertificationModal.edit": "Modifier le cours \"{name}\"", "components.templates.contractDefinition.filters.ContractDefinitionFilters.searchPlaceholder": "Rechercher par titre", "components.templates.contractDefinitions.form.RhfContractDefinitionLanguage.languageLabel": "Langue", + "components.templates.contractDefinitions.form.appendixLabel": "Annexe", "components.templates.contractDefinitions.form.bodyLabel": "Contenu", "components.templates.contractDefinitions.form.descriptionLabel": "Description", "components.templates.contractDefinitions.form.informationText": "Il s'agit d'un modèle de contrat qui sera utilisé pour émettre des contrats.", diff --git a/src/mail/package.json b/src/mail/package.json index c339273b3..bdd90a16f 100644 --- a/src/mail/package.json +++ b/src/mail/package.json @@ -1,6 +1,6 @@ { "name": "mail_mjml", - "version": "2.8.0", + "version": "2.9.0", "description": "An util to generate html and text django's templates from mjml templates", "type": "module", "dependencies": { diff --git a/src/openApiClientJs/package.json b/src/openApiClientJs/package.json index e504bff01..f8d3b74f1 100644 --- a/src/openApiClientJs/package.json +++ b/src/openApiClientJs/package.json @@ -1,6 +1,6 @@ { "name": "joanie-openapi-client-ts", - "version": "2.8.0", + "version": "2.9.0", "private": true, "description": "Tool to generate Typescript api client for joanie", "scripts": { diff --git a/src/tray/tray.yml b/src/tray/tray.yml index 07153af83..5c95c750a 100644 --- a/src/tray/tray.yml +++ b/src/tray/tray.yml @@ -1,3 +1,3 @@ metadata: name: joanie - version: 2.8.0 + version: 2.9.0 diff --git a/src/tray/vars/all/main.yml b/src/tray/vars/all/main.yml index c8d4dc261..1f21a9483 100644 --- a/src/tray/vars/all/main.yml +++ b/src/tray/vars/all/main.yml @@ -21,7 +21,7 @@ joanie_nginx_static_cache_expires: "1M" # -- admin nginx joanie_admin_nginx_image_name: "fundocker/joanie-admin" -joanie_admin_nginx_image_tag: "2.8.0" +joanie_admin_nginx_image_tag: "2.9.0" joanie_admin_nginx_port: 8061 joanie_admin_nginx_replicas: 1 joanie_admin_nginx_healthcheck_port: 5000 @@ -41,7 +41,7 @@ joanie_database_secret_name: "joanie-postgresql-{{ joanie_vault_checksum | defau # -- joanie joanie_image_name: "fundocker/joanie" -joanie_image_tag: "2.8.0" +joanie_image_tag: "2.9.0" # The image pull secret name should match the name of your secret created to # login to your private docker registry joanie_image_pull_secret_name: ""