multilang

functions/product.php

@@ -56,6 +56,7 @@ function doliRelatedProducts($fk_parent_line, $refresh = false) {
 
 function doliprice($object = null, $mode = "ttc", $currency = null) {
 global $current_user;
+
   if ( is_object($object) ) {
     $total='multicurrency_total_'.$mode;
     if ( isset($object->$mode) ) { 
@@ -76,16 +77,7 @@ function doliprice($object = null, $mode = "ttc", $currency = null) {
     if ( is_null($currency) ) { 
       $currency = strtoupper(doliconst("MAIN_MONNAIE"));
     }
-    if ( function_exists('pll_the_languages') ) { 
-      $locale = pll_current_language('locale');
-    } else {
-      if ( $current_user->locale == null ) { 
-        $locale = get_locale(); 
-      } else { 
-        $locale = $current_user->locale; 
-      } 
-    }
-    $fmt = numfmt_create( $locale, NumberFormatter::CURRENCY );
+    $fmt = numfmt_create( doliUserLang($current_user, 'locale'), NumberFormatter::CURRENCY );
     return numfmt_format_currency($fmt, $montant, $currency);//.$decimal
   }
 }

functions/tools.php

@@ -500,9 +500,9 @@ function doliopeninghours($constante){
   }
 }
 
-function doliUserLang($user, $short = false) {
+function doliUserLang($user, $type = 'locale', $short = false) {
   if ( function_exists('pll_current_language') ) { 
-      $lang = pll_current_language('locale');
+      $lang = pll_current_language($type);
     } elseif ( function_exists('wpml_object_id') ) {
       return get_locale(); // to do
     } elseif (isset($user->locale) && !empty($user->locale)) {

readme.txt

@@ -77,6 +77,7 @@ We would like to thank this contributors and plugins:
 * better shop
 * better transient
 * better captcha
+* better multilang with polylang & wpml
 * fix php bugs & error
 
    = 8.9.x =