| '.$langs->trans("DefaultLanguage").' | ';
- print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'MAIN_LANG_DEFAULT', 1, 0, 0, 0, 0, 'minwidth300');
+ print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'MAIN_LANG_DEFAULT', 1, 0, 0, 0, 0, 'minwidth300', 2);
print ' | ';
print ' | ';
print '
';
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index 8d8e65e5130..510b34c8f47 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -55,7 +55,7 @@ class FormAdmin
* @param int $showwarning Show a warning if language is not complete
* @param int $disabled Disable edit of select
* @param string $morecss Add more css styles
- * @param int $showcode Add language code into label
+ * @param int $showcode 1=Add language code into label at begining, 2=Add language code into label at end
* @param int $forcecombo Force to use combo box (so no ajax beautify effect)
* @return string Return HTML select string with list of languages
*/
@@ -89,8 +89,9 @@ class FormAdmin
foreach ($langs_available as $key => $value)
{
- $valuetoshow=$value;
- if ($showcode) $valuetoshow=$key.' - '.$value;
+ $valuetoshow=$value;
+ if ($showcode == 1) $valuetoshow=$key.' - '.$value;
+ if ($showcode == 2) $valuetoshow=$value.' ('.$key.')';
if ($filter && is_array($filter))
{
diff --git a/htdocs/core/modules/modWebsite.class.php b/htdocs/core/modules/modWebsite.class.php
index 7d0b0540ed2..822660e9e08 100644
--- a/htdocs/core/modules/modWebsite.class.php
+++ b/htdocs/core/modules/modWebsite.class.php
@@ -135,4 +135,46 @@ class modWebsite extends DolibarrModules
$this->export_sql_end[$r] .=' AND p.entity IN ('.getEntity('website').')';
$r++;
}
+
+
+ /**
+ * Function called when module is enabled.
+ * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+ * It also creates data directories
+ *
+ * @param string $options Options when enabling module ('', 'noboxes')
+ * @return int 1 if OK, 0 if KO
+ */
+ function init($options='')
+ {
+ global $conf,$langs;
+
+ // Remove permissions and default values
+ $this->remove($options);
+
+ // Copy flags and octicons directoru
+ $dirarray=array('common/flags', 'common/octicons');
+ foreach($dirarray as $dir)
+ {
+ $src=DOL_DOCUMENT_ROOT.'/theme/'.$dir;
+ $dest=DOL_DATA_ROOT.'/medias/image/'.$dir;
+
+ if (is_dir($src))
+ {
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+ dol_mkdir($dest);
+ $result=dolCopyDir($src,$dest,0,0);
+ if ($result < 0)
+ {
+ $langs->load("errors");
+ $this->error=$langs->trans('ErrorFailToCopyDirectory',$src,$dest);
+ return 0;
+ }
+ }
+ }
+
+ $sql = array();
+
+ return $this->_init($sql, $options);
+ }
}
diff --git a/htdocs/theme/common/octicons/build/data.json b/htdocs/theme/common/octicons/build/data.json
index 41fa0740b8a..c70ceda6631 100644
--- a/htdocs/theme/common/octicons/build/data.json
+++ b/htdocs/theme/common/octicons/build/data.json
@@ -1 +1 @@
-{"alert":{"name":"alert","figma":{"id":"0:5","file":"FP7lqd1V00LUaT5zvdklkkZr"},"keywords":["warning","triangle","exclamation","point"],"width":16,"height":16,"path":"
'.$languagecodeselected;
+ $out.= '';
+ $out.= '