#274 [Trad] fix: change trad

Evarisk · Mar 22, 2023 · 5bed196 · 5bed196
1 parent 5726d76
commit 5bed196
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/core/modules/modDoliMeet.class.php b/core/modules/modDoliMeet.class.php
@@ -228,7 +228,7 @@ public function __construct($db)
 		$this->tabs[] = ['data' => 'user:+sessionList:' . $picto . ucfirst($langs->trans('SessionsMin')) . ':dolimeet@dolimeet:$user->rights->dolimeet->session->read:/custom/dolimeet/view/session/session_list.php?fromtype=user&fromid=__ID__']; // To add a new tab identified by code tabname1
 		$this->tabs[] = ['data' => 'contact:+sessionList:' . $picto . ucfirst($langs->trans('SessionsMin')) . ':dolimeet@dolimeet:$user->rights->dolimeet->session->read:/custom/dolimeet/view/session/session_list.php?fromtype=socpeople&fromid=__ID__']; // To add a new tab identified by code tabname1
 		$this->tabs[] = ['data' => 'project:+sessionList:' . $picto . ucfirst($langs->trans('SessionsMin')) . ':dolimeet@dolimeet:$user->rights->dolimeet->session->read:/custom/dolimeet/view/session/session_list.php?fromtype=project&fromid=__ID__']; // To add a new tab identified by code tabname1
-		$this->tabs[] = ['data' => 'contract:+sessionList:' . $picto . ucfirst($langs->trans('SessionsMin')) . ':dolimeet@dolimeet:$user->rights->dolimeet->session->read:/custom/dolimeet/view/session/session_list.php?fromtype=contrat&fromid=__ID__']; // To add a new tab identified by code tabname1
+		$this->tabs[] = ['data' => 'contract:+sessionList:' . $picto . ucfirst($langs->trans('SessionsMin')) . ':dolimeet@dolimeet:$user->rights->dolimeet->session->read:/custom/dolimeet/view/session/session_list.php?fromtype=contrat&fromid=__ID__&object_type=trainingsession']; // To add a new tab identified by code tabname1
 		$this->tabs[] = ['data' => 'contract:+schedules:'. $picto . $langs->trans('Schedules') . ':dolimeet@dolimeet:$user->rights->contrat->lire:/custom/saturne/view/saturne_schedules.php?module_name=DoliMeet&element_type=contrat&id=__ID__']; // To add a new tab identified by code tabname1
         // Example:
         // $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@dolimeet:$user->rights->othermodule->read:/dolimeet/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.

diff --git a/langs/en_US/dolimeet.lang b/langs/en_US/dolimeet.lang
@@ -41,7 +41,7 @@ ContratSchedules        = Training schedule
 SessionListOnProject    = List of sessions related to the project
 EnableObjectDescription = Activate object %s
 Content                 = Content
-SelectObjectTypeFirst   = Select a session type first
+SelectSessionType       = Select a session type
 
 
 
@@ -99,6 +99,7 @@ TypeContact_contrat_internal_TRAINEE        = Trainee
 TypeContact_contrat_external_TRAINEE        = Trainee
 
 
+
 #
 # Training Session Document
 #
@@ -134,6 +135,7 @@ AuditsCategoriesArea = Audit tags/categories area
 Auditor = Auditor
 
 
+
 #
 # Other
 #

diff --git a/langs/fr_FR/dolimeet.lang b/langs/fr_FR/dolimeet.lang
@@ -49,7 +49,7 @@ ContratSchedules        = Horaires de la formation
 SessionListOnProject    = Liste des sessions liées au projet
 EnableObjectDescription = Activer l'objet %s
 Content                 = Contenu
-SelectObjectTypeFirst   = Sélectionner un type de session d'abord
+SelectSessionType       = Sélectionner un type de session
 
 
 
@@ -106,6 +106,8 @@ TypeContact_contrat_external_SESSIONTRAINER = Formateur
 TypeContact_contrat_internal_TRAINEE        = Stagiaire
 TypeContact_contrat_external_TRAINEE        = Stagiaire
 
+
+
 #
 # Training Session Document - Document lié au session de formation
 #
@@ -141,6 +143,7 @@ AuditsCategoriesArea = Espace des tags/catégories des audits
 Auditor = Auditeur
 
 
+
 #
 # Other
 #

diff --git a/view/session/session_list.php b/view/session/session_list.php
@@ -532,12 +532,12 @@
     } else {
         $objectTypes = ['meeting' => $langs->trans('Meeting'), 'trainingsession' => $langs->trans('Trainingsession'), 'audit' => $langs->trans('Audit')];
     }
-    $newcardbutton .= $form->selectarray('object_type_select', $objectTypes, $objectType, $langs->trans('SelectObjectTypeFirst'));
+    $newcardbutton .= $form->selectarray('object_type_select', $objectTypes, $objectType, ($fromtype != 'contrat' ? $langs->trans('SelectSessionType') : ''));
 }
 $newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER['PHP_SELF'] . '?mode=common' . preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), ['morecss'=>'reposition']);
 $newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER['PHP_SELF'] . '?mode=kanban' . preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), ['morecss'=>'reposition']);
 $newcardbutton .= dolGetButtonTitleSeparator();
-$newcardbutton .= dolGetButtonTitle($langs->trans('New'), ($objectType != 'session' ? '' : $langs->trans('SelectObjectTypeFirst')), 'fa fa-plus-circle', dol_buildpath('/dolimeet/view/session/session_card.php', 1) . '?action=create' . $fromurl . '&object_type=' . $objectType, '', ($objectType != 'session' ? $permissiontoadd : -2));
+$newcardbutton .= dolGetButtonTitle($langs->trans('New'), ($objectType != 'session' ? '' : $langs->trans('SelectSessionType')), 'fa fa-plus-circle', dol_buildpath('/dolimeet/view/session/session_card.php', 1) . '?action=create' . $fromurl . '&object_type=' . $objectType, '', ($objectType != 'session' ? $permissiontoadd : -2));
 
 print_barre_liste($title, $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_' . $object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);