Merge pull request #7 from uclouvain/fix-merge

Fix merge

auth/constants.py

@@ -27,25 +27,25 @@
 # Association between a read-only tab name (path name) and a permission
 READ_ACTIONS_BY_TAB = {
     # Personal data
-    'coordonnees': 'parcours_doctoral.view_parcours_doctoral_coordinates',
-    'cotutelle': 'parcours_doctoral.view_parcours_doctoral_cotutelle',
-    'person': 'parcours_doctoral.view_parcours_doctoral_person',
+    'coordonnees': 'parcours_doctoral.view_coordinates',
+    'cotutelle': 'parcours_doctoral.view_cotutelle',
+    'person': 'parcours_doctoral.view_person',
     # Training choice
-    'training-choice': 'parcours_doctoral.view_parcours_doctoral_training_choice',
+    'training-choice': 'parcours_doctoral.view_training_choice',
     # Previous experience
-    'curriculum': 'parcours_doctoral.view_parcours_doctoral_curriculum',
+    'curriculum': 'parcours_doctoral.view_curriculum',
     'educational': '',
     'educational_create': '',
     'non_educational': '',
     'non_educational_create': '',
-    'education': 'parcours_doctoral.view_parcours_doctoral_secondary_studies',
-    'languages': 'parcours_doctoral.view_parcours_doctoral_languages',
+    'education': 'parcours_doctoral.view_secondary_studies',
+    'languages': 'parcours_doctoral.view_languages',
     # Project
-    'project': 'parcours_doctoral.view_parcours_doctoral_project',
-    'supervision': 'parcours_doctoral.view_parcours_doctoral_supervision',
+    'project': 'parcours_doctoral.view_project',
+    'supervision': 'parcours_doctoral.view_supervision',
     # Confirmation exam
-    'confirmation': 'parcours_doctoral.view_parcours_doctoral_confirmation',
-    'extension-request': 'parcours_doctoral.view_parcours_doctoral_confirmation',
+    'confirmation': 'parcours_doctoral.view_confirmation',
+    'extension-request': 'parcours_doctoral.view_confirmation',
     # History
     'history': 'parcours_doctoral.view_historyentry',
     'history-all': 'parcours_doctoral.view_historyentry',
@@ -57,8 +57,8 @@
     'complementary-training': 'parcours_doctoral.view_complementary_training',
     'course-enrollment': 'parcours_doctoral.view_course_enrollment',
     # Jury
-    'jury-preparation': 'parcours_doctoral.view_parcours_doctoral_jury',
-    'jury': 'parcours_doctoral.view_parcours_doctoral_jury',
+    'jury-preparation': 'parcours_doctoral.view_jury',
+    'jury': 'parcours_doctoral.view_jury',
     # Management
     'internal-note': 'parcours_doctoral.view_internalnote',
     'debug': 'parcours_doctoral.view_debug_info',
@@ -71,25 +71,25 @@
 # Association between a write-only tab name (path name) and a permission
 UPDATE_ACTIONS_BY_TAB = {
     # Personal data
-    'coordonnees': 'parcours_doctoral.change_parcours_doctoral_coordinates',
-    'cotutelle': 'parcours_doctoral.change_parcours_doctoral_cotutelle',
-    'person': 'parcours_doctoral.change_parcours_doctoral_person',
+    'coordonnees': 'parcours_doctoral.change_coordinates',
+    'cotutelle': 'parcours_doctoral.change_cotutelle',
+    'person': 'parcours_doctoral.change_person',
     # Training choice
-    'training-choice': 'parcours_doctoral.change_parcours_doctoral_training_choice',
+    'training-choice': 'parcours_doctoral.change_training_choice',
     # Previous experience
-    'curriculum': 'parcours_doctoral.change_parcours_doctoral_curriculum',
+    'curriculum': 'parcours_doctoral.change_curriculum',
     'educational': '',
     'educational_create': '',
     'non_educational': '',
     'non_educational_create': '',
-    'education': 'parcours_doctoral.change_parcours_doctoral_secondary_studies',
-    'languages': 'parcours_doctoral.change_parcours_doctoral_languages',
+    'education': 'parcours_doctoral.change_secondary_studies',
+    'languages': 'parcours_doctoral.change_languages',
     # Project
-    'project': 'parcours_doctoral.change_parcours_doctoral_project',
-    'supervision': 'parcours_doctoral.change_parcours_doctoral_supervision',
+    'project': 'parcours_doctoral.change_project',
+    'supervision': 'parcours_doctoral.change_supervision',
     # Confirmation exam
-    'confirmation': 'parcours_doctoral.change_parcours_doctoral_confirmation',
-    'extension-request': 'parcours_doctoral.change_parcours_doctoral_confirmation_extension',
+    'confirmation': 'parcours_doctoral.change_confirmation',
+    'extension-request': 'parcours_doctoral.change_confirmation_extension',
     # Mails
     'send-mail': 'parcours_doctoral.send_message',
     # Training
@@ -101,6 +101,6 @@
     'documents': 'parcours_doctoral.view_documents_management',
     'checklist': 'parcours_doctoral.view_checklist',
     # Jury
-    'jury-preparation': 'parcours_doctoral.change_parcours_doctoral_jury',
-    'jury': 'parcours_doctoral.change_parcours_doctoral_jury',
+    'jury-preparation': 'parcours_doctoral.change_jury',
+    'jury': 'parcours_doctoral.change_jury',
 }

ddd/domain/validator/exceptions.py

@@ -25,14 +25,15 @@
 ##############################################################################
 
 from django.utils.translation import gettext_lazy as _
+from django.utils.translation import pgettext_lazy
 from osis_common.ddd.interface import BusinessException
 
 
 class ParcoursDoctoralNonTrouveException(BusinessException):
     status_code = "PARCOURS-DOCTORAL-1"
 
     def __init__(self, **kwargs):
-        message = _("No doctorate found.")
+        message = pgettext_lazy("parcours_doctoral", "No doctorate found.")
         super().__init__(message, **kwargs)
 
 
@@ -144,7 +145,9 @@ class PropositionNonEnAttenteDeSignatureException(BusinessException):
     status_code = "PARCOURS-DOCTORAL-15"
 
     def __init__(self, **kwargs):
-        message = _("The proposition must be in the 'waiting for signature' status.")
+        message = pgettext_lazy(
+            "parcours_doctoral", "The doctoral training must be in the 'waiting for signature' status."
+        )
         super().__init__(message, **kwargs)
 
 

locale/en/LC_MESSAGES/django.po

@@ -168,9 +168,6 @@ msgstr ""
 msgid "Activity type"
 msgstr ""
 
-msgid "Actor"
-msgstr ""
-
 msgid "Actors as list items"
 msgstr ""
 
@@ -277,9 +274,6 @@ msgstr ""
 msgid "An external member must have an institute."
 msgstr ""
 
-msgid "Application numero"
-msgstr ""
-
 msgid "Application status"
 msgstr ""
 
@@ -367,7 +361,8 @@ msgid "COMMUNICATION"
 msgstr "Oral communication (excluding conference)"
 
 msgid "COMMUNICATION types"
-msgstr "Activity types for the oral communication category (excluding conference)"
+msgstr ""
+"Activity types for the oral communication category (excluding conference)"
 
 msgid "COMPLEMENTARY_TRAINING"
 msgstr "Further training"
@@ -511,7 +506,7 @@ msgstr ""
 msgid "Configuration saved."
 msgstr ""
 
-msgctxt "admission"
+msgctxt "parcours_doctoral"
 msgid "Configure"
 msgstr ""
 
@@ -560,9 +555,6 @@ msgstr ""
 msgid "Context"
 msgstr ""
 
-msgid "Cotutelle"
-msgstr ""
-
 msgid "Cotutelle request document"
 msgstr ""
 
@@ -674,14 +666,14 @@ msgctxt "parcours_doctoral"
 msgid "Defense method"
 msgstr ""
 
-msgid "Definitive admission date to doctorate"
+msgctxt "parcours_doctoral tab"
+msgid "Defense method"
 msgstr ""
 
-msgid "Definitive admission date:"
+msgid "Definitive doctoral training date to doctorate"
 msgstr ""
 
-msgctxt "admission"
-msgid "Delete"
+msgid "Definitive doctoral training date:"
 msgstr ""
 
 msgctxt "parcours_doctoral"
@@ -735,13 +727,6 @@ msgstr ""
 msgid "Done in"
 msgstr ""
 
-msgctxt "doctorate-header-list"
-msgid "Dossier status"
-msgstr ""
-
-msgid "Dossier submission date"
-msgstr ""
-
 msgid "Dr"
 msgstr ""
 
@@ -831,9 +816,6 @@ msgstr ""
 msgid "FREE_COURSE"
 msgstr "Open course"
 
-msgid "Fac decision"
-msgstr ""
-
 msgid "Failure of the confirmation paper"
 msgstr ""
 
@@ -897,9 +879,6 @@ msgstr ""
 msgid "Has your PhD project already started?"
 msgstr ""
 
-msgid "Hide the states of the checklist"
-msgstr ""
-
 msgid "INVITED"
 msgstr "Invited to sign"
 
@@ -1011,12 +990,6 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-msgid "Last modification"
-msgstr ""
-
-msgid "Last name / First name"
-msgstr ""
-
 msgid "Last name / First name / Email"
 msgstr ""
 
@@ -1285,9 +1258,6 @@ msgstr ""
 msgid "Name in the language of the manifestation"
 msgstr ""
 
-msgid "Nationality"
-msgstr ""
-
 msgid "Negative assessment by lead supervisor"
 msgstr ""
 
@@ -1309,6 +1279,7 @@ msgstr ""
 msgid "No doctoral training"
 msgstr ""
 
+msgctxt "parcours_doctoral"
 msgid "No doctorate found."
 msgstr ""
 
@@ -1470,9 +1441,6 @@ msgstr ""
 msgid "Poster"
 msgstr ""
 
-msgid "Pre-admission"
-msgstr ""
-
 msgid "Presentation date"
 msgstr ""
 
@@ -1503,9 +1471,6 @@ msgstr ""
 msgid "Previous doctorate"
 msgstr ""
 
-msgid "Produce xls"
-msgstr ""
-
 msgid "Professor"
 msgstr ""
 
@@ -1742,9 +1707,6 @@ msgstr "Services"
 msgid "SERVICE types"
 msgstr "Activity types for the service category"
 
-msgid "SIC decision"
-msgstr ""
-
 msgid "SIGNING_IN_PROGRESS"
 msgstr "Signing in progress"
 
@@ -1757,21 +1719,13 @@ msgstr "Statistics"
 msgid "SUBMITTED_CONFIRMATION"
 msgstr "Submitted confirmation"
 
-msgctxt "admission"
-msgid "Save"
-msgstr ""
-
 msgctxt "parcours_doctoral"
 msgid "Save"
 msgstr ""
 
 msgid "Save and view result"
 msgstr ""
 
-msgctxt "doctorate-header-list"
-msgid "Scholarship"
-msgstr ""
-
 msgid "Scholarship end date"
 msgstr ""
 
@@ -1839,9 +1793,6 @@ msgstr ""
 msgid "Show details"
 msgstr ""
 
-msgid "Show the states of the checklist"
-msgstr ""
-
 msgid "Signatures"
 msgstr ""
 
@@ -1879,10 +1830,6 @@ msgstr ""
 msgid "Subject"
 msgstr ""
 
-msgctxt "doctorate-header-list"
-msgid "Submission date"
-msgstr ""
-
 msgid "Submit"
 msgstr ""
 
@@ -1892,7 +1839,7 @@ msgstr ""
 msgid "Submit selected courses"
 msgstr ""
 
-msgctxt "admission"
+msgctxt "parcours_doctoral"
 msgid "Submitted"
 msgstr ""
 
@@ -2010,6 +1957,10 @@ msgctxt "male gender"
 msgid "The doctoral student"
 msgstr ""
 
+msgctxt "parcours_doctoral"
+msgid "The doctoral training must be in the 'waiting for signature' status."
+msgstr ""
+
 msgid "The first name of the recipient"
 msgstr ""
 
@@ -2049,9 +2000,6 @@ msgstr ""
 msgid "The opinion about the extension request is not completed."
 msgstr ""
 
-msgid "The proposition must be in the 'waiting for signature' status."
-msgstr ""
-
 msgid "The public comment about the approval/refusal"
 msgstr ""
 
@@ -2184,7 +2132,7 @@ msgstr ""
 msgid "Token"
 msgstr ""
 
-msgctxt "admission"
+msgctxt "parcours_doctoral"
 msgid "Tokens that can be used for replacement"
 msgstr ""