Merge pull request #595 from c2corg/serac-modifications

Some minor changes on xreports edition forms #566

src/translations/dist/fr.json

@@ -123,7 +123,7 @@
     "amateur": {
       "user_categories": "amateur"
     },
-    "Anonimity and confidentiality": "Anonymat et confidentialité",
+    "Anonymity and confidentiality": "Anonymat et confidentialité",
     "anonymous": "Contribution anonyme",
     "Application": "Application",
     "apr": {
@@ -159,7 +159,6 @@
     "at least one user required": {
       "API message": "Sélectionnez au moins un itinéraire"
     },
-    "At the time of the incident, describe your technical level, your physical condition, how tired you had become just prior to the incident, and, if at altitude, how well you were acclimatized, etc.": "Décrivez votre niveau technique à la date de l'évènement, votre condition physique, la fatigue accumulée avant l'évènement, l'acclimatation pour une sortie en haute altitude, etc.",
     "Attribution — You must give appropriate credit, provide a link to the license, and indicate if changes were made.": "Attribution — Vous devez créditer l'Œuvre, intégrer un lien vers la licence et indiquer si des modifications ont été effectuées à l'Oeuvre. ",
     "aug": {
       "months": "août"
@@ -638,6 +637,7 @@
     "has created a new route": "a ajouté un nouvel itinéraire",
     "has created a new waypoint": "a ajouté un nouveau point de passage",
     "has created a new xreport": "a crée un nouveau rapport d'incident/accident",
+    "Has this experience changed your habits? Describe the lessons you have learned from this experience": "Cet évènement a-t-il modifié vos habitudes ? Quels enseignements en avez-vous tiré ?",
     "has updated the area": "a mis à jour cette région",
     "has updated the article": "a mis à jour un article",
     "has updated the book": "a mis à jour ce livre",
@@ -849,8 +849,8 @@
     },
     "map": "carte",
     "Map only": "Uniquement la carte",
+    "Map, guidebook, known route, planning for a plan B, (re) evaluation of route during trip?": "Carte, topos, connaissance de l’itinéraire, anticipation d’un plan B, réévaluation de l’itinéraire en cours de sortie ?",
     "maps": "cartes",
-    "Maps, guidebooks and outings reports consulted. Evaluation of the route during the outing.": "Cartes, topos, compte rendus de sorties consultés. Réévaluation de l'itinéraire au cours de la sortie.",
     "maps_info": "Cartes",
     "maps_references": "Références cartographiques",
     "mar": {
@@ -1120,6 +1120,7 @@
     "please consult the server logs": {
       "API message": "Erreur inattendue, merci de contacter dev@camptocamp.org"
     },
+    "Please describe your technical and experience level related to the chosen goal, your level of fitness, prior tiredness accumulated, acclimatization if in altitude, etc.": "Décrivez votre niveau technique et expérience par rapport à l’objectif choisi, votre condition physique, la fatigue accumulée avant la sortie, l’acclimatation pour une sortie en altitude, etc.",
     "poor": {
       "condition_ratings": "mauvaises",
       "snow_quality_ratings": "mauvaise",
@@ -1497,7 +1498,7 @@
     "train": {
       "public_transportation_types": "train"
     },
-    "training": "Préparation physique et entraînement par rapport à l’objectif",
+    "training": "Préparation physique et et niveau technique",
     "Translate into an other lang": "Traduire dans une autre langue",
     "Transport & road or PT access": "Accès routier/TC",
     "traverse": {

src/translations/dist/it.json

@@ -123,7 +123,7 @@
     "amateur": {
       "user_categories": "amatore"
     },
-    "Anonimity and confidentiality": "Anonima e confidenzialità ",
+    "Anonymity and confidentiality": "Anonima e confidenzialità",
     "anonymous": "Contributo anonimo ",
     "Application": "Applicazione ",
     "apr": {
@@ -159,7 +159,6 @@
     "at least one user required": {
       "API message": "Selezionare al meno un itinerario"
     },
-    "At the time of the incident, describe your technical level, your physical condition, how tired you had become just prior to the incident, and, if at altitude, how well you were acclimatized, etc.": "Descrivi il tuo livello tecnico alla data del evento, la tua condizione fisica, la stanchezza, l'acclimatazione per una gita in alta quota, etc. ",
     "Attribution — You must give appropriate credit, provide a link to the license, and indicate if changes were made.": "Attribuzione — Devi riconoscere una menzione di paternità adeguata, fornire un link alla licenza e indicare se sono state effettuate delle modifiche. ",
     "aug": {
       "months": "agosto "

src/translations/po/c2corg_ui-client.pot

@@ -271,7 +271,8 @@ msgid "amateur"
 msgstr ""
 
 #: src/views/static-views/SeracView.vue:51
-msgid "Anonimity and confidentiality"
+#: src/views/wiki/edition/XreportEditionView.vue:23
+msgid "Anonymity and confidentiality"
 msgstr ""
 
 #: src/translations/fixed_strings_common_js.vue:13
@@ -389,10 +390,6 @@ msgctxt "API message"
 msgid "at least one user required"
 msgstr ""
 
-#: src/views/wiki/edition/XreportEditionView.vue:69
-msgid "At the time of the incident, describe your technical level, your physical condition, how tired you had become just prior to the incident, and, if at altitude, how well you were acclimatized, etc."
-msgstr ""
-
 #: src/views/document/utils/boxes/LicenseBox.vue:10
 #: src/views/document/utils/boxes/LicenseBox.vue:29
 msgid "Attribution — You must give appropriate credit, provide a link to the license, and indicate if changes were made."
@@ -604,7 +601,7 @@ msgstr ""
 msgid "Both results and map"
 msgstr ""
 
-#: src/views/wiki/edition/XreportEditionView.vue:78
+#: src/views/wiki/edition/XreportEditionView.vue:84
 msgid "Briefly describe any injuries. Comments that do not fit into any other fields can be entered here."
 msgstr ""
 
@@ -829,7 +826,7 @@ msgstr ""
 msgid "Comments are disabled."
 msgstr ""
 
-#: src/views/wiki/edition/XreportEditionView.vue:71
+#: src/views/wiki/edition/XreportEditionView.vue:77
 msgid "Communication of the individual objectives and expectations, the thoughts and observations during the outing, discussions on new strategies, the way the group conducted itself and divided responsibilities, was the group used to working together, core aspirations, etc."
 msgstr ""
 
@@ -885,6 +882,7 @@ msgstr ""
 msgid "Contributions"
 msgstr ""
 
+#: src/views/document/ArticleView.vue:10
 #: src/views/document/ImageView.vue:17
 #: src/views/document/XreportView.vue:9
 #: src/views/wiki/HistoryView.vue:45
@@ -1079,7 +1077,7 @@ msgstr ""
 msgid "Describe the conditions you encountered during your outing"
 msgstr ""
 
-#: src/views/wiki/edition/XreportEditionView.vue:68
+#: src/views/wiki/edition/XreportEditionView.vue:74
 msgid "Describe the information gathered before the outing and how these evolved once on route: weather forecast, avalanche risk reports, amount of refreezing, condition of the snow/ice/rock, reports from the previous days, etc."
 msgstr ""
 
@@ -1118,11 +1116,11 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
-#: src/views/wiki/edition/XreportEditionView.vue:64
+#: src/views/wiki/edition/XreportEditionView.vue:71
 msgid "Details of the actual outing and the incident. If you have already written up your outing, you only need to describe the incident, then link it to your outing report (after first uploading it)"
 msgstr ""
 
-#: src/views/wiki/edition/XreportEditionView.vue:36
+#: src/views/wiki/edition/XreportEditionView.vue:43
 msgid "Details on participants and event context"
 msgstr ""
 
@@ -1552,7 +1550,7 @@ msgstr ""
 msgid "general informations"
 msgstr ""
 
-#: src/views/wiki/edition/XreportEditionView.vue:24
+#: src/views/wiki/edition/XreportEditionView.vue:31
 msgid "Geolocation"
 msgstr ""
 
@@ -1664,7 +1662,7 @@ msgstr ""
 msgid "group_management"
 msgstr ""
 
-#: src/views/wiki/edition/XreportEditionView.vue:73
+#: src/views/wiki/edition/XreportEditionView.vue:79
 msgid "Had a timetable for the route been foreseen? Did you maintain the schedule? Was time a factor in causing the incident?"
 msgstr ""
 
@@ -1724,6 +1722,10 @@ msgstr ""
 msgid "has created a new xreport"
 msgstr ""
 
+#: src/views/wiki/edition/XreportEditionView.vue:83
+msgid "Has this experience changed your habits? Describe the lessons you have learned from this experience"
+msgstr ""
+
 #: src/components/cards/FeedCard.vue:146
 msgid "has updated the area"
 msgstr ""
@@ -1760,7 +1762,7 @@ msgstr ""
 msgid "Have an account?"
 msgstr ""
 
-#: src/views/wiki/edition/XreportEditionView.vue:72
+#: src/views/wiki/edition/XreportEditionView.vue:78
 msgid "Have you (re)evaluated the risks at each change in the situation? What factors might have affected your awareness, such as tiredness, stress, relaxing having passed the main difficulties or on the descent, on a section reputed to be easy, presence of footprints or other people, complete confidence in the leader of the group, etc."
 msgstr ""
 
@@ -1997,7 +1999,7 @@ msgstr ""
 msgid "Information about the terrain, like elevations, lengths..."
 msgstr ""
 
-#: src/views/wiki/edition/XreportEditionView.vue:66
+#: src/views/wiki/edition/XreportEditionView.vue:72
 msgid "Information on the location of the incident. Mark the location on the map above, even if you cannot do very accurately, (in which case give more details here). After completing the report, you can associate it to a route, a climbing site or an outing."
 msgstr ""
 
@@ -2322,15 +2324,15 @@ msgstr ""
 msgid "Map only"
 msgstr ""
 
+#: src/views/wiki/edition/XreportEditionView.vue:73
+msgid "Map, guidebook, known route, planning for a plan B, (re) evaluation of route during trip?"
+msgstr ""
+
 #: src/translations/fixed_strings_manual.vue:10
 #: src/views/document/utils/boxes/AssociatedDocuments.vue:84
 msgid "maps"
 msgstr ""
 
-#: src/views/wiki/edition/XreportEditionView.vue:67
-msgid "Maps, guidebooks and outings reports consulted. Evaluation of the route during the outing."
-msgstr ""
-
 #: src/translations/fixed_strings_common_js.vue:113
 msgid "maps_info"
 msgstr ""
@@ -2535,7 +2537,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: src/views/wiki/edition/XreportEditionView.vue:60
+#: src/views/wiki/edition/XreportEditionView.vue:67
 msgid "Narration"
 msgstr ""
 
@@ -2757,7 +2759,7 @@ msgctxt "lift_status"
 msgid "open"
 msgstr ""
 
-#: src/views/wiki/edition/XreportEditionView.vue:61
+#: src/views/wiki/edition/XreportEditionView.vue:68
 msgid "Open fields to deeply explain the event circumstances."
 msgstr ""
 
@@ -2895,7 +2897,7 @@ msgstr ""
 msgid "participants"
 msgstr ""
 
-#: src/views/wiki/edition/XreportEditionView.vue:35
+#: src/views/wiki/edition/XreportEditionView.vue:42
 msgid "Participants and context"
 msgstr ""
 
@@ -3024,6 +3026,10 @@ msgctxt "API message"
 msgid "please consult the server logs"
 msgstr ""
 
+#: src/views/wiki/edition/XreportEditionView.vue:75
+msgid "Please describe your technical and experience level related to the chosen goal, your level of fitness, prior tiredness accumulated, acclimatization if in altitude, etc."
+msgstr ""
+
 #: src/translations/fixed_strings_common_js.vue:317
 msgctxt "condition_ratings"
 msgid "poor"
@@ -3078,7 +3084,7 @@ msgstr ""
 msgid "Precise localisation of the shooting"
 msgstr ""
 
-#: src/views/wiki/edition/XreportEditionView.vue:25
+#: src/views/wiki/edition/XreportEditionView.vue:32
 msgid "Precise location of the event."
 msgstr ""
 
@@ -4063,7 +4069,7 @@ msgstr ""
 msgid "Types and styles"
 msgstr ""
 
-#: src/views/wiki/edition/XreportEditionView.vue:74
+#: src/views/wiki/edition/XreportEditionView.vue:80
 msgid "Types of belay and protection used, verifications between climbers, snowpack stability tests, testing of avalanche transceivers, etc."
 msgstr ""
 
@@ -4235,7 +4241,7 @@ msgctxt "waypoint_types"
 msgid "webcam"
 msgstr ""
 
-#: src/views/wiki/edition/XreportEditionView.vue:70
+#: src/views/wiki/edition/XreportEditionView.vue:76
 msgid "Why did you choose this outing? When did you decide to engage. What influenced your decision (holiday time, long journey, hotel/hut bookings, time spent already in preparation, limited possibilities, etc.)?"
 msgstr ""
 

src/views/static-views/SeracView.vue

@@ -48,7 +48,7 @@
         </div>
         <div class="column is-4">
           <div class="serac-block has-text-light content">
-            <h3 class="title is-3 has-text-light" v-translate>Anonimity and confidentiality</h3>
+            <h3 class="title is-3 has-text-light" v-translate>Anonymity and confidentiality</h3>
             <ul>
               <li v-translate>
                 You can choose to remain anonymous

src/views/wiki/edition/XreportEditionView.vue

@@ -20,6 +20,13 @@
 
     </form-section>
 
+    <form-section :title="$gettext('Anonymity and confidentiality')">
+      <div class="columns is-multiline">
+        <form-field class="is-6" :document="document" :field="fields.anonymous" />
+        <form-field class="is-6" :document="document" :field="fields.disable_comments" />
+      </div>
+    </form-section>
+
     <form-section
       :title="$gettext('Geolocation')"
       :sub-title="$gettext('Precise location of the event.')">
@@ -62,21 +69,19 @@
       <div class="columns is-multiline">
         <form-field class="is-12" :document="document" :field="fields.summary" />
         <form-field class="is-12" :document="document" :field="fields.description" :placeholder="$gettext('Details of the actual outing and the incident. If you have already written up your outing, you only need to describe the incident, then link it to your outing report (after first uploading it)')" />
-        <form-field class="is-12" :document="document" :field="fields.anonymous" />
         <form-field class="is-12" :document="document" :field="fields.place" :placeholder="$gettext('Information on the location of the incident. Mark the location on the map above, even if you cannot do very accurately, (in which case give more details here). After completing the report, you can associate it to a route, a climbing site or an outing.')" />
-        <form-field class="is-12" :document="document" :field="fields.route_study" :placeholder="$gettext('Maps, guidebooks and outings reports consulted. Evaluation of the route during the outing.')" />
+        <form-field class="is-12" :document="document" :field="fields.route_study" :placeholder="$gettext('Map, guidebook, known route, planning for a plan B, (re) evaluation of route during trip?')" />
         <form-field class="is-12" :document="document" :field="fields.conditions" :placeholder="$gettext('Describe the information gathered before the outing and how these evolved once on route: weather forecast, avalanche risk reports, amount of refreezing, condition of the snow/ice/rock, reports from the previous days, etc.')" />
-        <form-field class="is-12" :document="document" :field="fields.training" :placeholder="$gettext('At the time of the incident, describe your technical level, your physical condition, how tired you had become just prior to the incident, and, if at altitude, how well you were acclimatized, etc.')" />
+        <form-field class="is-12" :document="document" :field="fields.training" :placeholder="$gettext('Please describe your technical and experience level related to the chosen goal, your level of fitness, prior tiredness accumulated, acclimatization if in altitude, etc.')" />
         <form-field class="is-12" :document="document" :field="fields.motivations" :placeholder="$gettext('Why did you choose this outing? When did you decide to engage. What influenced your decision (holiday time, long journey, hotel/hut bookings, time spent already in preparation, limited possibilities, etc.)?')" />
         <form-field class="is-12" :document="document" :field="fields.group_management" :placeholder="$gettext('Communication of the individual objectives and expectations, the thoughts and observations during the outing, discussions on new strategies, the way the group conducted itself and divided responsibilities, was the group used to working together, core aspirations, etc.')" />
         <form-field class="is-12" :document="document" :field="fields.risk" :placeholder="$gettext('Have you (re)evaluated the risks at each change in the situation? What factors might have affected your awareness, such as tiredness, stress, relaxing having passed the main difficulties or on the descent, on a section reputed to be easy, presence of footprints or other people, complete confidence in the leader of the group, etc.')" />
         <form-field class="is-12" :document="document" :field="fields.time_management" :placeholder="$gettext('Had a timetable for the route been foreseen? Did you maintain the schedule? Was time a factor in causing the incident?')" />
         <form-field class="is-12" :document="document" :field="fields.safety" :placeholder="$gettext('Types of belay and protection used, verifications between climbers, snowpack stability tests, testing of avalanche transceivers, etc.')" />
         <form-field class="is-6" :document="document" :field="fields.reduce_impact" />
         <form-field class="is-6" :document="document" :field="fields.increase_impact" />
-        <form-field class="is-6" :document="document" :field="fields.modifications" />
+        <form-field class="is-6" :document="document" :field="fields.modifications" :placeholder="$gettext('Has this experience changed your habits? Describe the lessons you have learned from this experience')" />
         <form-field class="is-6" :document="document" :field="fields.other_comments" :placeholder="$gettext('Briefly describe any injuries. Comments that do not fit into any other fields can be entered here.')" />
-        <form-field class="is-12" :document="document" :field="fields.disable_comments" />
       </div>
     </form-section>