Merge branch...

Merge branch 'dev#138010_recherche_autocompletion_les_accents_ne_sont_pas_pris_en_compte' into 'hotline'

hotline #138010 Search auto-complete : force locale fr_FR.UTF-8

See merge request !4116

VERSIONS_WIP/138010

+ - ticket #138010 : Auto-complétion : correction de la prise en compte des accents
\ No newline at end of file

bokeh_eco.php

@@ -78,12 +78,7 @@ class Bokeh_EngineEco_AutocompleteRequest {
       return '[]';
     }
 
-    if (isset($params['language'])
-        && $params['language'] == 'fr')
-      putenv('LANG=fr_FR.UTF8');
-
     $this->_loadEnvironment();
-
     $results = Class_Autocomplete_Index::searchAll($startsWith);
     $terms = Class_Autocomplete_IndexSearcher::extractTerms($startsWith);
     $term_regex =  '/('.implode('|', $terms).')/iu';

library/Class/Autocomplete/IndexSearcher.php

@@ -75,6 +75,8 @@ class Class_Autocomplete_IndexSearcher {
   public function search($file_path, $search_expression) {
     $out=[];
     $grep = $this->buildGrepCommand($search_expression);
+
+    putenv('LANG=fr_FR.UTF8');
     exec($grep, $out);
 
     return array_slice($out, 0, 10);