From 83be1759b167d86b9729dfc5f6824caea3f18cd5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 3 Oct 2018 20:00:52 +0200
Subject: [PATCH] Work on multilang website

---
 htdocs/website/class/website.class.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 1adb2a6257f..4d9c2424913 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -1081,16 +1081,19 @@ class Website extends CommonObject
 	/**
 	 * Component to select language (Full CSS Only)
 	 *
-	 * @param	array	$languagecodes				Language codes
-	 * @param	string	$languagecodeselected		Language code selected
-	 * @param	string	$morecss					More CSS class on component
-	 * @param	string	$htmlname					Suffix for HTML name
+	 * @param	array		$languagecodes			Language codes
+	 * @param	Translate	$weblangs				Language Object
+	 * @param	string		$morecss				More CSS class on component
+	 * @param	string		$htmlname				Suffix for HTML name
 	 * @return 	string								HTML select component
 	 */
-	public function componentSelectLang($languagecodes=array('en_US','fr_FR','de_DE','es_ES'), $languagecodeselected='', $morecss='', $htmlname='')
+	public function componentSelectLang($languagecodes=array('en_US','fr_FR','de_DE','es_ES'), $weblangs, $morecss='', $htmlname='')
 	{
 		$out = '';
 
+		$languagecodeselected = $weblangs->defaultlang;
+		$weblangs->load('languages');
+
 		$url = $_SERVER["REQUEST_URI"];
 		$url = preg_replace('/(\?|&)l=([a-zA-Z_]*)/', '', $url);	// We remove param l from url
 		//$url = preg_replace('/(\?|&)lang=([a-zA-Z_]*)/', '', $url);	// We remove param lang from url
@@ -1125,7 +1128,7 @@ class Website extends CommonObject
 		if ($languagecodeselected)
 		{
 			$shortcode = strtolower(substr($languagecodeselected, -2));
-			$out.= '<a href="'.$url.$languagecodeselected.'"><li><img height="12px" src="medias/image/common/flags/'.$shortcode.'.png" style="margin-right: 5px;"/>'.$languagecodeselected;
+			$out.= '<a href="'.$url.$languagecodeselected.'"><li><img height="12px" src="medias/image/common/flags/'.$shortcode.'.png" style="margin-right: 5px;"/>'.$weblangs->trans("Language_".$languagecodeselected);
 			$out.= '<span class="fa fa-caret-down" style="padding-left: 5px;" />';
 			$out.= '</li></a>';
 		}
@@ -1134,7 +1137,7 @@ class Website extends CommonObject
 		{
 			if ($languagecode == $languagecodeselected) continue;	// Already output
 			$shortcode = strtolower(substr($languagecode, -2));
-			$out.= '<a href="'.$url.$languagecode.'"><li><img height="12px" src="medias/image/common/flags/'.$shortcode.'.png" style="margin-right: 5px;"/>'.$languagecode;
+			$out.= '<a href="'.$url.$languagecode.'"><li><img height="12px" src="medias/image/common/flags/'.$shortcode.'.png" style="margin-right: 5px;"/>'.$weblangs->trans("Language_".$languagecode);
 			if (empty($i) && empty($languagecodeselected)) $out.= '<span class="fa fa-caret-down" style="padding-left: 5px;" />';
 			$out.= '</li></a>';
 			$i++;