Merge branch 'master' into 'WIP'

dev #70388 : fix labels

See merge request !2602

application/modules/admin/views/scripts/search-form/index.phtml

 <?php
 echo $this->Button_New((new Class_Entity())
-                       ->setText($this->_('Ajouter un formulaire de recherche avancé'))
+                       ->setText($this->_('Ajouter un formulaire de recherche'))
                        ->setUrl($this->url(['action' => 'add', 'id' => null])));
 
 

library/ZendAfi/Controller/Plugin/ResourceDefinition/SearchForm.php

@@ -33,9 +33,9 @@ class ZendAfi_Controller_Plugin_ResourceDefinition_SearchForm
                            'successful_add' => $this->_('Le formulaire "%s" a été sauvegardé'),
                            'successful_delete' => $this->_('Formulaire "%s" supprimé')],
 
-            'actions' => ['add' => ['title' => $this->_("Ajouter un formulaire de recherche avancée")],
-                          'edit' => ['title' => $this->_("Modifier un formulaire de recherche avancée")],
-                          'index' => ['title' => $this->_("Formulaires de recherche avancée")]],
+            'actions' => ['add' => ['title' => $this->_("Ajouter un formulaire de recherche")],
+                          'edit' => ['title' => $this->_("Modifier un formulaire de recherche")],
+                          'index' => ['title' => $this->_("Formulaires de recherche")]],
 
             'form_class_name' => 'ZendAfi_Form_Admin_SearchForm',
     ];

library/ZendAfi/View/Helper/Admin/ContentNav.php

@@ -151,7 +151,7 @@ class ZendAfi_View_Helper_Admin_ContentNav extends ZendAfi_View_Helper_BaseHelpe
                      [], function($user) { return defined('DEVELOPMENT') && $user->isAdmin();}],
 
                     ['filebrowser', $this->_('Explorateur de fichiers'), '/admin/file-manager'],
-                    ['search_form', $this->_('Formulaires de recherche configurables'), '/admin/search-form'],
+                    ['search_form', $this->_('Formulaires de recherche'), '/admin/search-form'],
 
                     ['customfields', $this->_('Champs personnalisés'), '/admin/custom-fields/index', [], $is_admin],
                     ['customreports', $this->_('Rapports statistiques'), '/admin/custom-fields-report', [], $is_admin]