Fix: Restore feature to have code inside language list
This commit is contained in:
parent
e0b6d5a954
commit
d72a41895d
@ -23,7 +23,7 @@
|
|||||||
* \brief File for Tanslate class
|
* \brief File for Tanslate class
|
||||||
* \author Eric Seigne
|
* \author Eric Seigne
|
||||||
* \author Laurent Destailleur
|
* \author Laurent Destailleur
|
||||||
* \version $Id: translate.class.php,v 1.48 2011/07/31 23:45:14 eldy Exp $
|
* \version $Id: translate.class.php,v 1.49 2011/08/01 22:03:50 eldy Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
@ -512,9 +512,10 @@ class Translate {
|
|||||||
* Return list of all available languages
|
* Return list of all available languages
|
||||||
* @param langdir Directory to scan
|
* @param langdir Directory to scan
|
||||||
* @param maxlength Max length for each value in combo box (will be truncated)
|
* @param maxlength Max length for each value in combo box (will be truncated)
|
||||||
|
* @param usecode Show code instead of country name for language variant
|
||||||
* @return array List of languages
|
* @return array List of languages
|
||||||
*/
|
*/
|
||||||
function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0)
|
function get_available_languages($langdir=DOL_DOCUMENT_ROOT,$maxlength=0,$usecode=0)
|
||||||
{
|
{
|
||||||
global $conf;
|
global $conf;
|
||||||
|
|
||||||
@ -527,7 +528,7 @@ class Translate {
|
|||||||
{
|
{
|
||||||
$this->load("languages");
|
$this->load("languages");
|
||||||
|
|
||||||
if (isset($conf->global->MAIN_SHOW_LANGUAGE_CODE) && $conf->global->MAIN_SHOW_LANGUAGE_CODE)
|
if ($usecode || ! empty($conf->global->MAIN_SHOW_LANGUAGE_CODE))
|
||||||
{
|
{
|
||||||
$langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir),$maxlength);
|
$langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir),$maxlength);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user