From 7478542970606670c294af6d810be344941411e3 Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Thu, 5 Sep 2024 22:44:25 +0200 Subject: [PATCH] =?UTF-8?q?On=20affiche=20un=20message=20en=20cas=20de=20m?= =?UTF-8?q?odification=20d'un=20=C3=A9v=C3=A9nement=20encore=20synchronis?= =?UTF-8?q?=C3=A9=20avec=20l'import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../locale/fr/LC_MESSAGES/django.po | 323 +++++++++--------- src/agenda_culturel/models.py | 2 +- src/agenda_culturel/views.py | 4 + 3 files changed, 174 insertions(+), 155 deletions(-) diff --git a/src/agenda_culturel/locale/fr/LC_MESSAGES/django.po b/src/agenda_culturel/locale/fr/LC_MESSAGES/django.po index 7c72ac5..5b78164 100644 --- a/src/agenda_culturel/locale/fr/LC_MESSAGES/django.po +++ b/src/agenda_culturel/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: agenda_culturel\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-29 22:00+0200\n" +"POT-Creation-Date: 2024-09-05 22:42+0200\n" "PO-Revision-Date: 2023-10-29 14:16+0000\n" "Last-Translator: Jean-Marie Favreau \n" "Language-Team: Jean-Marie Favreau \n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: agenda_culturel/forms.py:44 agenda_culturel/models.py:150 -#: agenda_culturel/models.py:317 agenda_culturel/models.py:1312 -#: agenda_culturel/models.py:1409 +#: agenda_culturel/models.py:317 agenda_culturel/models.py:1315 +#: agenda_culturel/models.py:1412 msgid "Category" msgstr "Catégorie" @@ -49,7 +49,7 @@ msgid "Apply category {} to the event {}" msgstr "Appliquer la catégorie {} à l'événement {}" #: agenda_culturel/forms.py:419 agenda_culturel/models.py:241 -#: agenda_culturel/models.py:1461 +#: agenda_culturel/models.py:1464 msgid "Place" msgstr "Lieu" @@ -68,8 +68,8 @@ msgstr "" "événements correspondants dont la place est manquante." #: agenda_culturel/models.py:44 agenda_culturel/models.py:89 -#: agenda_culturel/models.py:220 agenda_culturel/models.py:1192 -#: agenda_culturel/models.py:1258 +#: agenda_culturel/models.py:220 agenda_culturel/models.py:1194 +#: agenda_culturel/models.py:1261 msgid "Name" msgstr "Nom" @@ -169,7 +169,7 @@ msgstr "" msgid "Places" msgstr "Lieux" -#: agenda_culturel/models.py:295 agenda_culturel/models.py:1299 +#: agenda_culturel/models.py:295 agenda_culturel/models.py:1302 msgid "Published" msgstr "Publié" @@ -189,7 +189,7 @@ msgstr "Titre" msgid "Short title" msgstr "Titre court" -#: agenda_culturel/models.py:312 agenda_culturel/models.py:1377 +#: agenda_culturel/models.py:312 agenda_culturel/models.py:1380 msgid "Status" msgstr "Status" @@ -223,7 +223,7 @@ msgstr "Heure de fin" msgid "Recurrence" msgstr "Récurrence" -#: agenda_culturel/models.py:352 agenda_culturel/models.py:1304 +#: agenda_culturel/models.py:352 agenda_culturel/models.py:1307 msgid "Location" msgstr "Localisation" @@ -243,201 +243,205 @@ msgstr "" "Addresse d'un événement si elle n'est pas déjà présente dans la liste des " "lieux disponible (forme libre)" -#: agenda_culturel/models.py:368 +#: agenda_culturel/models.py:370 msgid "Description" msgstr "Description" -#: agenda_culturel/models.py:369 +#: agenda_culturel/models.py:371 msgid "General description of the event" msgstr "Description générale de l'événement" -#: agenda_culturel/models.py:375 +#: agenda_culturel/models.py:377 msgid "Illustration (local image)" msgstr "Illustration (image locale)" -#: agenda_culturel/models.py:376 +#: agenda_culturel/models.py:378 msgid "Illustration image stored in the agenda server" msgstr "Image d'illustration stockée sur le serveur de l'agenda" -#: agenda_culturel/models.py:383 +#: agenda_culturel/models.py:385 msgid "Illustration" msgstr "Illustration" -#: agenda_culturel/models.py:384 +#: agenda_culturel/models.py:386 msgid "URL of the illustration image" msgstr "URL de l'image illustrative" -#: agenda_culturel/models.py:390 +#: agenda_culturel/models.py:392 msgid "Illustration description" msgstr "Description de l'illustration" -#: agenda_culturel/models.py:391 +#: agenda_culturel/models.py:393 msgid "Alternative text used by screen readers for the image" msgstr "Texte alternatif utiliser par les lecteurs d'écrans pour l'image" -#: agenda_culturel/models.py:399 +#: agenda_culturel/models.py:401 msgid "Importation source" msgstr "Source d'importation" -#: agenda_culturel/models.py:400 +#: agenda_culturel/models.py:402 msgid "Importation source used to detect removed entries." msgstr "Source d'importation utilisée pour détecter les éléments supprimés/" -#: agenda_culturel/models.py:406 +#: agenda_culturel/models.py:408 msgid "UUIDs" msgstr "UUIDs" -#: agenda_culturel/models.py:407 +#: agenda_culturel/models.py:409 msgid "UUIDs from import to detect duplicated entries." msgstr "UUIDs utilisés pendant l'import pour détecter les entrées dupliquées" -#: agenda_culturel/models.py:413 +#: agenda_culturel/models.py:415 msgid "URLs" msgstr "URLs" -#: agenda_culturel/models.py:414 +#: agenda_culturel/models.py:416 msgid "List of all the urls where this event can be found." msgstr "Liste de toutes les urls où l'événement peut être trouvé." -#: agenda_culturel/models.py:421 +#: agenda_culturel/models.py:423 msgid "Tags" msgstr "Étiquettes" -#: agenda_culturel/models.py:422 +#: agenda_culturel/models.py:424 msgid "A list of tags that describe the event." msgstr "Une liste d'étiquettes décrivant l'événement" -#: agenda_culturel/models.py:429 +#: agenda_culturel/models.py:431 msgid "Possibly duplicated" msgstr "Possibles doublons" -#: agenda_culturel/models.py:478 +#: agenda_culturel/models.py:480 msgid "Event" msgstr "Événement" -#: agenda_culturel/models.py:479 +#: agenda_culturel/models.py:481 msgid "Events" msgstr "Événements" -#: agenda_culturel/models.py:1183 +#: agenda_culturel/models.py:1185 msgid "Contact message" msgstr "Message de contact" -#: agenda_culturel/models.py:1184 +#: agenda_culturel/models.py:1186 msgid "Contact messages" msgstr "Messages de contact" -#: agenda_culturel/models.py:1187 +#: agenda_culturel/models.py:1189 msgid "Subject" msgstr "Sujet" -#: agenda_culturel/models.py:1188 +#: agenda_culturel/models.py:1190 msgid "The subject of your message" msgstr "Sujet de votre message" -#: agenda_culturel/models.py:1193 +#: agenda_culturel/models.py:1195 msgid "Your name" msgstr "Votre nom" -#: agenda_culturel/models.py:1199 +#: agenda_culturel/models.py:1201 msgid "Email address" msgstr "Adresse email" -#: agenda_culturel/models.py:1200 +#: agenda_culturel/models.py:1202 msgid "Your email address" msgstr "Votre adresse email" -#: agenda_culturel/models.py:1205 +#: agenda_culturel/models.py:1207 msgid "Message" msgstr "Message" -#: agenda_culturel/models.py:1205 +#: agenda_culturel/models.py:1207 msgid "Your message" msgstr "Votre message" -#: agenda_culturel/models.py:1210 agenda_culturel/views.py:808 +#: agenda_culturel/models.py:1212 agenda_culturel/views.py:812 msgid "Closed" msgstr "Fermé" -#: agenda_culturel/models.py:1212 +#: agenda_culturel/models.py:1214 msgid "this message has been processed and no longer needs to be handled" msgstr "Ce message a été traité et ne nécessite plus d'être pris en charge" -#: agenda_culturel/models.py:1217 +#: agenda_culturel/models.py:1219 msgid "Comments" msgstr "Commentaires" -#: agenda_culturel/models.py:1218 +#: agenda_culturel/models.py:1220 msgid "Comments on the message from the moderation team" msgstr "Commentaires sur ce message par l'équipe de modération" -#: agenda_culturel/models.py:1230 agenda_culturel/models.py:1357 +#: agenda_culturel/models.py:1232 agenda_culturel/models.py:1360 msgid "Recurrent import" msgstr "Import récurrent" -#: agenda_culturel/models.py:1231 +#: agenda_culturel/models.py:1233 msgid "Recurrent imports" msgstr "Imports récurrents" -#: agenda_culturel/models.py:1235 +#: agenda_culturel/models.py:1237 msgid "ical" msgstr "ical" -#: agenda_culturel/models.py:1236 +#: agenda_culturel/models.py:1238 msgid "ical no busy" msgstr "ical sans busy" -#: agenda_culturel/models.py:1237 +#: agenda_culturel/models.py:1239 msgid "ical no VC" msgstr "ical sans VC" -#: agenda_culturel/models.py:1238 +#: agenda_culturel/models.py:1240 msgid "lacoope.org" msgstr "lacoope.org" -#: agenda_culturel/models.py:1239 +#: agenda_culturel/models.py:1241 msgid "la comédie" msgstr "la comédie" -#: agenda_culturel/models.py:1240 +#: agenda_culturel/models.py:1242 msgid "le fotomat" msgstr "le fotomat" -#: agenda_culturel/models.py:1241 +#: agenda_culturel/models.py:1243 #, fuzzy #| msgid "la puce à loreille" msgid "la puce à l'oreille" msgstr "la puce à loreille" -#: agenda_culturel/models.py:1242 +#: agenda_culturel/models.py:1244 msgid "Plugin wordpress MEC" msgstr "Plugin wordpress MEC" -#: agenda_culturel/models.py:1243 +#: agenda_culturel/models.py:1245 msgid "Événements d'une page" msgstr "Événements d'une page" #: agenda_culturel/models.py:1246 +msgid "la cour des 3 coquins" +msgstr "la cour des 3 coquins" + +#: agenda_culturel/models.py:1249 msgid "simple" msgstr "simple" -#: agenda_culturel/models.py:1247 +#: agenda_culturel/models.py:1250 msgid "Headless Chromium" msgstr "chromium sans interface" -#: agenda_culturel/models.py:1248 +#: agenda_culturel/models.py:1251 msgid "Headless Chromium (pause)" msgstr "chromium sans interface (pause)" -#: agenda_culturel/models.py:1253 +#: agenda_culturel/models.py:1256 msgid "daily" msgstr "chaque jour" -#: agenda_culturel/models.py:1255 +#: agenda_culturel/models.py:1258 msgid "weekly" msgstr "chaque semaine" -#: agenda_culturel/models.py:1260 +#: agenda_culturel/models.py:1263 msgid "" "Recurrent import name. Be careful to choose a name that is easy to " "understand, as it will be public and displayed on the sites About page." @@ -445,135 +449,135 @@ msgstr "" "Nom de l'import récurrent. Attention à choisir un nom compréhensible, car il " "sera public, et affiché sur la page à propos du site." -#: agenda_culturel/models.py:1267 +#: agenda_culturel/models.py:1270 msgid "Processor" msgstr "Processeur" -#: agenda_culturel/models.py:1270 +#: agenda_culturel/models.py:1273 msgid "Downloader" msgstr "Téléchargeur" -#: agenda_culturel/models.py:1277 +#: agenda_culturel/models.py:1280 msgid "Import recurrence" msgstr "Récurrence d'import" -#: agenda_culturel/models.py:1284 +#: agenda_culturel/models.py:1287 msgid "Source" msgstr "Source" -#: agenda_culturel/models.py:1285 +#: agenda_culturel/models.py:1288 msgid "URL of the source document" msgstr "URL du document source" -#: agenda_culturel/models.py:1289 +#: agenda_culturel/models.py:1292 msgid "Browsable url" msgstr "URL navigable" -#: agenda_culturel/models.py:1291 +#: agenda_culturel/models.py:1294 msgid "URL of the corresponding document that will be shown to visitors." msgstr "URL correspondant au document et qui sera montrée aux visiteurs" -#: agenda_culturel/models.py:1300 +#: agenda_culturel/models.py:1303 msgid "Status of each imported event (published or draft)" msgstr "Status de chaque événement importé (publié ou brouillon)" -#: agenda_culturel/models.py:1305 +#: agenda_culturel/models.py:1308 msgid "Address for each imported event" msgstr "Adresse de chaque événement importé" -#: agenda_culturel/models.py:1313 +#: agenda_culturel/models.py:1316 msgid "Category of each imported event" msgstr "Catégorie de chaque événement importé" -#: agenda_culturel/models.py:1319 +#: agenda_culturel/models.py:1322 msgid "Tags for each imported event" msgstr "Étiquettes de chaque événement importé" -#: agenda_culturel/models.py:1320 +#: agenda_culturel/models.py:1323 msgid "A list of tags that describe each imported event." msgstr "Une liste d'étiquettes décrivant chaque événement importé" -#: agenda_culturel/models.py:1343 +#: agenda_culturel/models.py:1346 msgid "Running" msgstr "En cours" -#: agenda_culturel/models.py:1344 +#: agenda_culturel/models.py:1347 msgid "Canceled" msgstr "Annulé" -#: agenda_culturel/models.py:1345 +#: agenda_culturel/models.py:1348 msgid "Success" msgstr "Succès" -#: agenda_culturel/models.py:1346 +#: agenda_culturel/models.py:1349 msgid "Failed" msgstr "Erreur" -#: agenda_culturel/models.py:1349 +#: agenda_culturel/models.py:1352 msgid "Batch importation" msgstr "Importation par lot" -#: agenda_culturel/models.py:1350 +#: agenda_culturel/models.py:1353 msgid "Batch importations" msgstr "Importations par lot" -#: agenda_culturel/models.py:1358 +#: agenda_culturel/models.py:1361 msgid "Reference to the recurrent import processing" msgstr "Référence du processus d'import récurrent" -#: agenda_culturel/models.py:1366 +#: agenda_culturel/models.py:1369 msgid "URL (if not recurrent import)" msgstr "URL (si pas d'import récurrent)" -#: agenda_culturel/models.py:1368 +#: agenda_culturel/models.py:1371 msgid "Source URL if no RecurrentImport is associated." msgstr "URL source si aucun import récurrent n'est associé" -#: agenda_culturel/models.py:1381 +#: agenda_culturel/models.py:1384 msgid "Error message" msgstr "Votre message" -#: agenda_culturel/models.py:1385 +#: agenda_culturel/models.py:1388 msgid "Number of collected events" msgstr "Nombre d'événements collectés" -#: agenda_culturel/models.py:1388 +#: agenda_culturel/models.py:1391 msgid "Number of imported events" msgstr "Nombre d'événements importés" -#: agenda_culturel/models.py:1391 +#: agenda_culturel/models.py:1394 msgid "Number of updated events" msgstr "Nombre d'événements mis à jour" -#: agenda_culturel/models.py:1394 +#: agenda_culturel/models.py:1397 msgid "Number of removed events" msgstr "Nombre d'événements supprimés" -#: agenda_culturel/models.py:1402 +#: agenda_culturel/models.py:1405 msgid "Weight" msgstr "Poids" -#: agenda_culturel/models.py:1403 +#: agenda_culturel/models.py:1406 msgid "The lower is the weight, the earlier the filter is applied" msgstr "Plus le poids est léger, plus le filtre sera appliqué tôt" -#: agenda_culturel/models.py:1410 +#: agenda_culturel/models.py:1413 msgid "Category applied to the event" msgstr "Catégorie appliquée à l'événement" -#: agenda_culturel/models.py:1415 +#: agenda_culturel/models.py:1418 msgid "Contained in the title" msgstr "Contenu dans le titre" -#: agenda_culturel/models.py:1416 +#: agenda_culturel/models.py:1419 msgid "Text contained in the event title" msgstr "Texte contenu dans le titre de l'événement" -#: agenda_culturel/models.py:1422 +#: agenda_culturel/models.py:1425 msgid "Exact title extract" msgstr "Extrait exact du titre" -#: agenda_culturel/models.py:1424 +#: agenda_culturel/models.py:1427 msgid "" "If checked, the extract will be searched for in the title using the exact " "form (capitals, accents)." @@ -581,19 +585,19 @@ msgstr "" "Si coché, l'extrait sera recherché dans le titre en utilisant la forme " "exacte (majuscules, accents)" -#: agenda_culturel/models.py:1430 +#: agenda_culturel/models.py:1433 msgid "Contained in the description" msgstr "Contenu dans la description" -#: agenda_culturel/models.py:1431 +#: agenda_culturel/models.py:1434 msgid "Text contained in the description" msgstr "Texte contenu dans la description" -#: agenda_culturel/models.py:1437 +#: agenda_culturel/models.py:1440 msgid "Exact description extract" msgstr "Extrait exact de description" -#: agenda_culturel/models.py:1439 +#: agenda_culturel/models.py:1442 msgid "" "If checked, the extract will be searched for in the description using the " "exact form (capitals, accents)." @@ -601,19 +605,19 @@ msgstr "" "Si coché, l'extrait sera recherché dans la description en utilisant la forme " "exacte (majuscules, accents)" -#: agenda_culturel/models.py:1445 +#: agenda_culturel/models.py:1448 msgid "Contained in the location" msgstr "Contenu dans la localisation" -#: agenda_culturel/models.py:1446 +#: agenda_culturel/models.py:1449 msgid "Text contained in the event location" msgstr "Texte contenu dans la localisation de l'événement" -#: agenda_culturel/models.py:1452 +#: agenda_culturel/models.py:1455 msgid "Exact location extract" msgstr "Extrait exact de localisation" -#: agenda_culturel/models.py:1454 +#: agenda_culturel/models.py:1457 msgid "" "If checked, the extract will be searched for in the location using the exact " "form (capitals, accents)." @@ -621,56 +625,56 @@ msgstr "" "Si coché, l'extrait sera recherché dans la localisation en utilisant la " "forme exacte (majuscules, accents)" -#: agenda_culturel/models.py:1462 +#: agenda_culturel/models.py:1465 msgid "Location from place" msgstr "Localisation depuis le lieu" -#: agenda_culturel/models.py:1469 +#: agenda_culturel/models.py:1472 msgid "Categorisation rule" msgstr "Règle de catégorisation" -#: agenda_culturel/models.py:1470 +#: agenda_culturel/models.py:1473 msgid "Categorisation rules" msgstr "Règles de catégorisation" -#: agenda_culturel/models.py:1537 agenda_culturel/models.py:1569 +#: agenda_culturel/models.py:1540 agenda_culturel/models.py:1572 msgid "Question" msgstr "Question" -#: agenda_culturel/models.py:1538 agenda_culturel/models.py:1576 +#: agenda_culturel/models.py:1541 agenda_culturel/models.py:1579 msgid "Text that will be shown to moderators" msgstr "Text tel que présenté aux modérateurices" -#: agenda_culturel/models.py:1544 +#: agenda_culturel/models.py:1547 msgid "Moderation question" msgstr "Question de modération" -#: agenda_culturel/models.py:1545 +#: agenda_culturel/models.py:1548 msgid "Moderation questions" msgstr "Questions de modération" -#: agenda_culturel/models.py:1570 +#: agenda_culturel/models.py:1573 msgid "Associated question from moderation" msgstr "Question associée pour la modération" -#: agenda_culturel/models.py:1575 +#: agenda_culturel/models.py:1578 msgid "Answer" msgstr "Réponse" -#: agenda_culturel/models.py:1582 +#: agenda_culturel/models.py:1585 msgid "Adds tags" msgstr "Ajoute les étiquettes" -#: agenda_culturel/models.py:1583 +#: agenda_culturel/models.py:1586 msgid "A list of tags that will be added if you choose this answer." msgstr "" "Une liste d'étiquettes qui seront ajoutées si vous choisissez cette réponse." -#: agenda_culturel/models.py:1589 +#: agenda_culturel/models.py:1592 msgid "Removes tags" msgstr "Retire les étiquettes" -#: agenda_culturel/models.py:1590 +#: agenda_culturel/models.py:1593 msgid "A list of tags that will be removed if you choose this answer." msgstr "" "Une liste d'étiquettes qui seront retirées si vous choisissez cette réponse." @@ -703,19 +707,30 @@ msgstr "Pas de fichier sélectionné." msgid "The static content has been successfully updated." msgstr "Le contenu statique a été modifié avec succès." -#: agenda_culturel/views.py:451 agenda_culturel/views.py:496 +#: agenda_culturel/views.py:451 agenda_culturel/views.py:500 msgid "The event has been successfully modified." msgstr "L'événement a été modifié avec succès." -#: agenda_culturel/views.py:465 +#: agenda_culturel/views.py:457 +msgid "" +"Please note that this event has not been modified since it was last updated " +"by import. If you modify any information from this import, the event will be " +"desynchronized with the source, and will need to be merged with each future " +"automatic import." +msgstr "Attention, cet événement n'a pas été modifié depuis sa dernière mise " +"à jour par importation. Si vous modifiez une information issue de cet import, " +"l'événement sera désynchronisé d'avec la source, et nécessitera une fusion à " +"chaque import automatique futurs." + +#: agenda_culturel/views.py:469 msgid "The event has been successfully deleted." msgstr "L'événement a été supprimé avec succès" -#: agenda_culturel/views.py:521 +#: agenda_culturel/views.py:525 msgid "The status has been successfully modified." msgstr "Le status a été modifié avec succès." -#: agenda_culturel/views.py:543 agenda_culturel/views.py:558 +#: agenda_culturel/views.py:547 agenda_culturel/views.py:562 msgid "" "The event has been submitted and will be published as soon as it has been " "validated by the moderation team." @@ -723,77 +738,77 @@ msgstr "" "L'événement a été soumis et sera publié dès qu'il aura été validé par " "l'équipe de modération." -#: agenda_culturel/views.py:552 +#: agenda_culturel/views.py:556 msgid "The event is saved." msgstr "L'événement est enregistré." -#: agenda_culturel/views.py:646 agenda_culturel/views.py:699 +#: agenda_culturel/views.py:650 agenda_culturel/views.py:703 msgid "{} has not been submitted since its already known: {}." msgstr "{} n'a pas été soumis car il est déjà connu: {}." -#: agenda_culturel/views.py:651 agenda_culturel/views.py:705 +#: agenda_culturel/views.py:655 agenda_culturel/views.py:709 msgid "" "{} has not been submitted since its already known and currently into " "moderation process." msgstr "{} n'a pas été soumis car il est déjà connu et en cours de modération" -#: agenda_culturel/views.py:662 +#: agenda_culturel/views.py:666 msgid "Integrating {} url(s) into our import process." msgstr "Intégration de {} url(s) dans notre processus d'import." -#: agenda_culturel/views.py:712 +#: agenda_culturel/views.py:716 msgid "Integrating {} into our import process." msgstr "Intégration de {} dans notre processus d'import." -#: agenda_culturel/views.py:775 +#: agenda_culturel/views.py:779 msgid "Your message has been sent successfully." msgstr "Votre message a été envoyé avec succès." -#: agenda_culturel/views.py:792 +#: agenda_culturel/views.py:796 msgid "The contact message properties has been successfully modified." msgstr "Les propriétés du message de contact ont été modifié avec succès." -#: agenda_culturel/views.py:808 +#: agenda_culturel/views.py:812 msgid "Open" msgstr "Ouvert" -#: agenda_culturel/views.py:865 +#: agenda_culturel/views.py:869 msgid "Search" msgstr "Rechercher" -#: agenda_culturel/views.py:1051 +#: agenda_culturel/views.py:1055 msgid "The import has been run successfully." msgstr "L'import a été lancé avec succès" -#: agenda_culturel/views.py:1070 +#: agenda_culturel/views.py:1074 msgid "The import has been canceled." msgstr "L'import a été annulé" -#: agenda_culturel/views.py:1119 +#: agenda_culturel/views.py:1123 msgid "The recurrent import has been successfully modified." msgstr "L'import récurrent a été modifié avec succès." -#: agenda_culturel/views.py:1128 +#: agenda_culturel/views.py:1132 msgid "The recurrent import has been successfully deleted." msgstr "L'import récurrent a été supprimé avec succès" -#: agenda_culturel/views.py:1168 +#: agenda_culturel/views.py:1172 msgid "The import has been launched." msgstr "L'import a été lancé" -#: agenda_culturel/views.py:1185 +#: agenda_culturel/views.py:1189 msgid "Imports has been launched." msgstr "Les imports ont été lancés" -#: agenda_culturel/views.py:1262 +#: agenda_culturel/views.py:1269 msgid "The merge has been successfully completed." msgstr "La fusion a été réalisée avec succès." -#: agenda_culturel/views.py:1296 +#: agenda_culturel/views.py:1303 msgid "Events have been marked as unduplicated." msgstr "Les événements ont été marqués comme non dupliqués." -#: agenda_culturel/views.py:1318 +#: agenda_culturel/views.py:1325 msgid "" "The selected event has been retained, while the other has been moved to the " "recycle bin." @@ -801,7 +816,7 @@ msgstr "" "L'événement sélectionné a été conservé, l'autre a été déplacé dans la " "corbeille." -#: agenda_culturel/views.py:1325 +#: agenda_culturel/views.py:1332 msgid "" "The selected event has been retained, while the others have been moved to " "the recycle bin." @@ -809,19 +824,19 @@ msgstr "" "L'événement sélectionné a été conservé, les autres ont été déplacés dans la " "corbeille." -#: agenda_culturel/views.py:1336 +#: agenda_culturel/views.py:1343 msgid "The event has been withdrawn from the group and made independent." msgstr "L'événement a été retiré du groupe et rendu indépendant." -#: agenda_culturel/views.py:1369 +#: agenda_culturel/views.py:1376 msgid "Cleaning up duplicates: {} item(s) removed." msgstr "Nettoyage des dupliqués: {} élément(s) supprimés." -#: agenda_culturel/views.py:1413 +#: agenda_culturel/views.py:1420 msgid "The event was successfully duplicated." msgstr "L'événement a été marqué dupliqué avec succès." -#: agenda_culturel/views.py:1421 +#: agenda_culturel/views.py:1428 msgid "" "The event has been successfully flagged as a duplicate. The moderation team " "will deal with your suggestion shortly." @@ -829,62 +844,62 @@ msgstr "" "L'événement a été signalé comme dupliqué avec succès. Votre suggestion sera " "prochainement prise en charge par l'équipe de modération." -#: agenda_culturel/views.py:1474 +#: agenda_culturel/views.py:1481 msgid "The categorisation rule has been successfully modified." msgstr "La règle de catégorisation a été modifiée avec succès." -#: agenda_culturel/views.py:1483 +#: agenda_culturel/views.py:1490 msgid "The categorisation rule has been successfully deleted." msgstr "La règle de catégorisation a été supprimée avec succès" -#: agenda_culturel/views.py:1506 agenda_culturel/views.py:1553 +#: agenda_culturel/views.py:1513 agenda_culturel/views.py:1560 msgid "The rules were successfully applied and 1 event was categorised." msgstr "" "Les règles ont été appliquées avec succès et 1 événement a été catégorisé" -#: agenda_culturel/views.py:1513 agenda_culturel/views.py:1560 +#: agenda_culturel/views.py:1520 agenda_culturel/views.py:1567 msgid "The rules were successfully applied and {} events were categorised." msgstr "" "Les règles ont été appliquées avec succès et {} événements ont été " "catégorisés" -#: agenda_culturel/views.py:1520 agenda_culturel/views.py:1567 +#: agenda_culturel/views.py:1527 agenda_culturel/views.py:1574 msgid "The rules were successfully applied and no events were categorised." msgstr "" "Les règles ont été appliquées avec succès et aucun événement n'a été " "catégorisé" -#: agenda_culturel/views.py:1607 +#: agenda_culturel/views.py:1614 msgid "The moderation question has been created with success." msgstr "La question de modération a été créée avec succès." -#: agenda_culturel/views.py:1719 agenda_culturel/views.py:1781 -#: agenda_culturel/views.py:1819 +#: agenda_culturel/views.py:1726 agenda_culturel/views.py:1788 +#: agenda_culturel/views.py:1826 msgid "{} events have been updated." msgstr "{} événements ont été mis à jour." -#: agenda_culturel/views.py:1722 agenda_culturel/views.py:1783 -#: agenda_culturel/views.py:1822 +#: agenda_culturel/views.py:1729 agenda_culturel/views.py:1790 +#: agenda_culturel/views.py:1829 msgid "1 event has been updated." msgstr "1 événement a été mis à jour" -#: agenda_culturel/views.py:1724 agenda_culturel/views.py:1785 -#: agenda_culturel/views.py:1824 +#: agenda_culturel/views.py:1731 agenda_culturel/views.py:1792 +#: agenda_culturel/views.py:1831 msgid "No events have been modified." msgstr "Aucun événement n'a été modifié." -#: agenda_culturel/views.py:1733 +#: agenda_culturel/views.py:1740 msgid "The place has been successfully updated." msgstr "Le lieu a été modifié avec succès." -#: agenda_culturel/views.py:1742 +#: agenda_culturel/views.py:1749 msgid "The place has been successfully created." msgstr "Le lieu a été créé avec succès." -#: agenda_culturel/views.py:1807 +#: agenda_culturel/views.py:1814 msgid "The selected place has been assigned to the event." msgstr "Le lieu sélectionné a été assigné à l'événement." -#: agenda_culturel/views.py:1811 +#: agenda_culturel/views.py:1818 msgid "A new alias has been added to the selected place." msgstr "Un nouvel alias a été créé pour le lieu sélectionné." diff --git a/src/agenda_culturel/models.py b/src/agenda_culturel/models.py index c282ce6..3b8339b 100644 --- a/src/agenda_culturel/models.py +++ b/src/agenda_culturel/models.py @@ -504,7 +504,7 @@ class Event(models.Model): def modified(self): return ( self.modified_date is None - or abs((self.modified_date - self.created_date).total_seconds()) > 1 + or (self.modified_date - self.created_date).total_seconds() > 1 ) def nb_draft_events(): diff --git a/src/agenda_culturel/views.py b/src/agenda_culturel/views.py index 52c780b..5664e4e 100644 --- a/src/agenda_culturel/views.py +++ b/src/agenda_culturel/views.py @@ -452,6 +452,10 @@ class EventUpdateView( def get_form_kwargs(self): kwargs = super().get_form_kwargs() + logger.warning("les daaates " + str(self.get_object().modified_date) + " " + str(self.get_object().imported_date) + " " + str((self.get_object().modified_date - self.get_object().created_date).total_seconds())) + if not self.get_object().modified(): + messages.warning(self.request, _("Please note that this event has not been modified since it was last updated by import. If you modify any information from this import, the event will be desynchronized with the source, and will need to be merged with each future automatic import.")) + kwargs["is_authenticated"] = self.request.user.is_authenticated return kwargs