Using Intl extension to anglicisation (#22870)

* Using Intl extension to anglicisation This should fix bug #22321 * Update Php.php * Update plugins/GeoIp2/LocationProvider/GeoIp2/Php.php Co-authored-by: Michal Kleiner <[email protected]> * Update plugins/GeoIp2/LocationProvider/GeoIp2/Php.php Co-authored-by: Stefan Giehl <[email protected]> --------- Co-authored-by: Michal Kleiner <[email protected]> Co-authored-by: Stefan Giehl <[email protected]>
matomo-org · Jan 17, 2025 · b64e4ca · b64e4ca
1 parent ff9070a
commit b64e4ca
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/plugins/GeoIp2/LocationProvider/GeoIp2/Php.php b/plugins/GeoIp2/LocationProvider/GeoIp2/Php.php
@@ -314,8 +314,11 @@ private function fuzzyMatch(string $str1, string $str2): bool
             return true;
         }
 
-        // try converting umlauts to closted ascii char if iconv is available
-        if (function_exists('iconv')) {
+        // try converting umlauts to the closest ascii char if intl or iconv is available
+        if (function_exists('transliterator_transliterate')) {
+            $str1 = transliterator_transliterate('Any-Latin; Latin-ASCII', $str1);
+            $str2 = transliterator_transliterate('Any-Latin; Latin-ASCII', $str2);
+        } elseif (function_exists('iconv')) {
             $str1 = iconv('UTF-8', 'ASCII//TRANSLIT', $str1);
             $str2 = iconv('UTF-8', 'ASCII//TRANSLIT', $str2);
         }