diff --git a/VERSIONS_WIP/138010 b/VERSIONS_WIP/138010 new file mode 100644 index 0000000000000000000000000000000000000000..5ece34871203a30ee64438d6dd4f7dcd60574a03 --- /dev/null +++ b/VERSIONS_WIP/138010 @@ -0,0 +1 @@ + - ticket #138010 : Auto-complétion : correction de la prise en compte des accents \ No newline at end of file diff --git a/bokeh_eco.php b/bokeh_eco.php index 7ee199336f797136fa44cc7b3c710f18b67420f1..0119c282dd29db600ba7f20460aba250285322ac 100644 --- a/bokeh_eco.php +++ b/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'; diff --git a/library/Class/Autocomplete/IndexSearcher.php b/library/Class/Autocomplete/IndexSearcher.php index a5eb628bd8527d4a71c2dd31c566e9e146a4aebc..4bdb0e1ea7c9cfcaa52f07bf6c3ea899ea257d2f 100644 --- a/library/Class/Autocomplete/IndexSearcher.php +++ b/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);