lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better select language component

Browse Source
This commit is contained in:
Laurent Destailleur 2018-10-03 20:58:45 +02:00
parent 83be1759b1
commit 378013b863
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/website.lib.php
View File

@ -305,7 +305,7 @@ function redirectToContainer($containerref, $containeraliasalt='',$containerid=0
*/ */
function includeContainer($containerref) function includeContainer($containerref)
{ {
global $conf, $db, $langs, $mysoc, $user, $website; global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $weblangs; // Very important. Required to have var available when running inluded containers.
global $includehtmlcontentopened; global $includehtmlcontentopened;
global $websitekey; global $websitekey;

11
htdocs/core/website.inc.php
View File

@ -22,11 +22,18 @@
* The global variable $websitekey must be defined. * The global variable $websitekey must be defined.
*/ */
// Load website class
include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php'; include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
// Define $website and $weblangs
if (! is_object($website))
{
$website=new Website($db); $website=new Website($db);
$website->fetch(0,$websitekey); $website->fetch(0,$websitekey);
}
if (! is_object($weblangs))
{
$weblangs = dol_clone($langs); $weblangs = dol_clone($langs);
}
if (GETPOST('l','aZ09')) $weblangs->setDefaultLang(GETPOST('l','aZ09')); if (GETPOST('l','aZ09')) $weblangs->setDefaultLang(GETPOST('l','aZ09'));
// Load websitepage class
include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php'; include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';

10
htdocs/website/class/website.class.php
View File

@ -1089,7 +1089,7 @@ class Website extends CommonObject
*/ */
public function componentSelectLang($languagecodes=array('en_US','fr_FR','de_DE','es_ES'), $weblangs, $morecss='', $htmlname='') public function componentSelectLang($languagecodes=array('en_US','fr_FR','de_DE','es_ES'), $weblangs, $morecss='', $htmlname='')
{ {
$out = ''; if (! is_object($weblangs)) return 'ERROR componentSelectLang called with parameter $weblangs not defined';
$languagecodeselected = $weblangs->defaultlang; $languagecodeselected = $weblangs->defaultlang;
$weblangs->load('languages'); $weblangs->load('languages');
@ -1128,7 +1128,9 @@ class Website extends CommonObject
if ($languagecodeselected) if ($languagecodeselected)
{ {
$shortcode = strtolower(substr($languagecodeselected, -2)); $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;"/>'.$weblangs->trans("Language_".$languagecodeselected); $label = $weblangs->trans("Language_".$languagecodeselected);
if ($shortcode == 'us') $label = preg_replace('/\s*\(.*\)/', '', $label);
$out.= '<a href="'.$url.$languagecodeselected.'"><li><img height="12px" src="medias/image/common/flags/'.$shortcode.'.png" style="margin-right: 5px;"/>'.$label;
$out.= '<span class="fa fa-caret-down" style="padding-left: 5px;" />'; $out.= '<span class="fa fa-caret-down" style="padding-left: 5px;" />';
$out.= '</li></a>'; $out.= '</li></a>';
} }
@ -1137,7 +1139,9 @@ class Website extends CommonObject
{ {
if ($languagecode == $languagecodeselected) continue; // Already output if ($languagecode == $languagecodeselected) continue; // Already output
$shortcode = strtolower(substr($languagecode, -2)); $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;"/>'.$weblangs->trans("Language_".$languagecode); $label = $weblangs->trans("Language_".$languagecode);
if ($shortcode == 'us') $label = preg_replace('/\s*\(.*\)/', '', $label);
$out.= '<a href="'.$url.$languagecode.'"><li><img height="12px" src="medias/image/common/flags/'.$shortcode.'.png" style="margin-right: 5px;"/>'.$label;
if (empty($i) && empty($languagecodeselected)) $out.= '<span class="fa fa-caret-down" style="padding-left: 5px;" />'; if (empty($i) && empty($languagecodeselected)) $out.= '<span class="fa fa-caret-down" style="padding-left: 5px;" />';
$out.= '</li></a>'; $out.= '</li></a>';
$i++; $i++;